Browse Source

Merge remote-tracking branch 'origin/dev_third_data' into dev_temp

dev_shibei_match
zxc 4 years ago
parent
commit
8e248c7cc4
  1. 6
      epmet-module/data-aggregator/data-aggregator-server/pom.xml
  2. 5
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java
  3. 7
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AblityListResultDTO.java
  4. 2
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java
  5. 15
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java
  6. 4
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexAgencySubScoreDao.java
  7. 12
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCommunitySubScoreDao.java
  8. 36
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexDeptSubScoreDao.java
  9. 2
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java
  10. 12
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java
  11. 116
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java
  12. 25
      epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml
  13. 18
      epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml
  14. 24
      epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml
  15. 22
      epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml
  16. 3
      epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexDictDao.xml

6
epmet-module/data-aggregator/data-aggregator-server/pom.xml

@ -337,8 +337,8 @@
<datasource.druid.opercrm.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.opercrm.url>
<datasource.druid.opercrm.username>epmet_data_statistical_user</datasource.druid.opercrm.username>
<datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
<datasource.druid.opercrm.username>epmet</datasource.druid.opercrm.username>
<datasource.druid.opercrm.password>elink@833066</datasource.druid.opercrm.password>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
@ -452,4 +452,4 @@
</properties>
</profile>
</profiles>
</project>
</project>

5
epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java

@ -36,5 +36,8 @@ public class IndexScoreFormDTO implements Serializable {
* 所有有权重的指标code拼接的字符串 冒号隔开
*/
private String allParentIndexCode;
/**
* pid
*/
private String pid;
}

7
epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AblityListResultDTO.java

@ -36,6 +36,13 @@ public class AblityListResultDTO implements Serializable {
*/
private BigDecimal weight;
/**
* 原始分数
*/
private Double score;
/**
* 加权分数乘以权重后得分
*/
private BigDecimal weightedScore;
}

2
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java

@ -31,6 +31,8 @@ public class IndexConstant {
public static final String TABLE_DESC = "详见下表:";
public static final String INDEX_SCORE_TITLE = "当月指数";
public static final String INDEX_SCORE_DESC = "含义:自然月周期内,当月指数得分=党建指数得分*相关权重+治理指数得分*相关权重+服务指数得分*相关权重";
public static final String INDEX_DISTRINCT_TABLE1_INDEX_CODE = "suoyoujiedaozlnlpjz";
public static final String ZHI_LI_NENG_LI = "zhilinengli";
/**

15
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java

@ -20,7 +20,9 @@ package com.epmet.datareport.controller.index;
import com.epmet.commons.tools.utils.Result;
import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
import com.epmet.evaluationindex.index.result.IndexExplainResult;
import com.epmet.evaluationindex.screen.dto.result.IndexDictResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -58,5 +60,18 @@ public class IndexExplainController {
return ok;
}
/**
* desc: 指标字典项
*
* @param formDTO
* @author LiuJanJun
* @date 2021/5/12 4:12 下午
*/
@PostMapping("indexdict")
public Result<IndexDictResultDTO> getIndexMeaning(@RequestBody IndexScoreFormDTO formDTO){
IndexDictResultDTO result = indexExplainService.getIndexMeaning(formDTO);
return new Result<IndexDictResultDTO>().ok(result);
}
}

4
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexAgencySubScoreDao.java

@ -17,6 +17,8 @@
package com.epmet.datareport.dao.fact;
import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
import com.epmet.evaluationindex.index.result.IndexScoreResult;
import com.epmet.evaluationindex.screen.dto.form.AblityListFormDTO;
import com.epmet.evaluationindex.screen.dto.form.MonthAblityListFormDTO;
import com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO;
@ -48,4 +50,6 @@ public interface FactIndexAgencySubScoreDao {
* @author sun
*/
LinkedList<MonthAblityListResultDTO> selectMonthAblityList(MonthAblityListFormDTO formDTO);
List<IndexScoreResult> selectSubScore(IndexScoreFormDTO ablityListFormDTO);
}

12
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCommunitySubScoreDao.java

@ -17,6 +17,8 @@
package com.epmet.datareport.dao.fact;
import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
import com.epmet.evaluationindex.index.result.IndexScoreResult;
import com.epmet.evaluationindex.screen.dto.form.AblityListFormDTO;
import com.epmet.evaluationindex.screen.dto.form.MonthAblityListFormDTO;
import com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO;
@ -48,4 +50,14 @@ public interface FactIndexCommunitySubScoreDao {
* @author sun
*/
LinkedList<MonthAblityListResultDTO> selectCommunityMonthAblityList(MonthAblityListFormDTO formDTO);
/**
* desc: 查询分数
*
* @param ablityListFormDTO
* @return java.util.List<com.epmet.evaluationindex.index.result.IndexScoreResult>
* @author LiuJanJun
* @date 2021/5/14 2:07 下午
*/
List<IndexScoreResult> selectSubScore(IndexScoreFormDTO ablityListFormDTO);
}

36
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexDeptSubScoreDao.java

@ -0,0 +1,36 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.datareport.dao.fact;
import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
import com.epmet.evaluationindex.index.result.IndexScoreResult;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 部门相关分数表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-02
*/
@Mapper
public interface FactIndexDeptSubScoreDao {
List<IndexScoreResult> selecDeptAvgScore(IndexScoreFormDTO ablityListFormDTO);
}

2
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java

@ -59,5 +59,5 @@ public interface FactIndexGridSubScoreDao {
* @author LiuJanJun
* @date 2021/5/14 2:07 下午
*/
List<IndexScoreResult> selectGridSubScore(IndexScoreFormDTO ablityListFormDTO);
List<IndexScoreResult> selectSubScore(IndexScoreFormDTO ablityListFormDTO);
}

12
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java

@ -18,7 +18,9 @@
package com.epmet.datareport.service.evaluationindex.index;
import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
import com.epmet.evaluationindex.index.result.IndexExplainResult;
import com.epmet.evaluationindex.screen.dto.result.IndexDictResultDTO;
import java.util.List;
@ -39,4 +41,14 @@ public interface IndexExplainService {
* @date 2021/5/12 4:38 下午
*/
List<IndexExplainResult> getScoreDetail(IndexExplainFormDTO formDTO);
/**
* desc: 条件获取指标
*
* @param formDTO
* @return com.epmet.evaluationindex.index.result.IndexDictResultDTO
* @author LiuJanJun
* @date 2021/5/20 10:20 上午
*/
IndexDictResultDTO getIndexMeaning(IndexScoreFormDTO formDTO);
}

116
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java

@ -24,8 +24,7 @@ import com.epmet.constant.DataSourceConstant;
import com.epmet.datareport.constant.IndexConstant;
import com.epmet.datareport.dao.evaluationindex.index.IndexExplainDao;
import com.epmet.datareport.dao.evaluationindex.index.IndexGroupDetailDao;
import com.epmet.datareport.dao.fact.FactIndexCpcSubScoreDao;
import com.epmet.datareport.dao.fact.FactIndexGridSubScoreDao;
import com.epmet.datareport.dao.fact.*;
import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
import com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO;
import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
@ -34,6 +33,8 @@ import com.epmet.evaluationindex.index.result.IndexExplainResult;
import com.epmet.evaluationindex.index.result.IndexGroupDetailResult;
import com.epmet.evaluationindex.index.result.IndexScoreDetailResult;
import com.epmet.evaluationindex.index.result.IndexScoreResult;
import com.epmet.evaluationindex.screen.dto.result.IndexDictResultDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -51,10 +52,12 @@ import java.util.stream.Collectors;
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-05-12
*/
@Slf4j
@Service
@DataSource(DataSourceConstant.EVALUATION_INDEX)
public class IndexExplainServiceImpl implements IndexExplainService {
@Autowired
private IndexDictDao indexDictDao;
@Autowired
private IndexExplainDao indexExplainDao;
@Autowired
@ -63,6 +66,12 @@ public class IndexExplainServiceImpl implements IndexExplainService {
private FactIndexGridSubScoreDao gridSubScoreDao;
@Autowired
private FactIndexCpcSubScoreDao factIndexCpcSubScoreDao;
@Autowired
private FactIndexCommunitySubScoreDao communitySubScoreDao;
@Autowired
private FactIndexAgencySubScoreDao agencySubScoreDao;
@Autowired
private FactIndexDeptSubScoreDao deptSubScoreDao;
@Override
@ -98,44 +107,82 @@ public class IndexExplainServiceImpl implements IndexExplainService {
return results;
}
@Override
public IndexDictResultDTO getIndexMeaning(IndexScoreFormDTO formDTO) {
return indexDictDao.selectIndexDict(formDTO.getIndexCode());
}
private void setTableData(IndexExplainFormDTO formDTO, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainTreeDTO explainDTO, IndexExplainResult result) {
if (NumConstant.ONE == explainDTO.getIsSearch()) {
List<IndexScoreResult> realScoreList = null;
String type = explainDTO.getType();
String orgLevel = formDTO.getOrgLevel();
String allIndexCodePath = explainDTO.getIndexCode();
//设置表头
List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, orgLevel);
result.setTableTileList(tableHeaders);
IndexScoreFormDTO ablityListFormDTO = new IndexScoreFormDTO();
ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
ablityListFormDTO.setOrgId(formDTO.getOrgId());
ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
ablityListFormDTO.setMonthId(StringUtils.isBlank(formDTO.getMonthId()) ? DateUtils.getCurrentTimeBeforeMonthId() : formDTO.getMonthId());
switch (orgLevel) {
case "grid":
String allIndexCodePath = null;
if (IndexConstant.ZI_SHEN.equals(type)) {
allIndexCodePath = explainDTO.getIndexCode();
setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
if (IndexConstant.ZI_SHEN.equals(type)) {
setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
//不下钻
ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
realScoreList = gridSubScoreDao.selectGridSubScore(ablityListFormDTO);
realScoreList = gridSubScoreDao.selectSubScore(ablityListFormDTO);
} else if (IndexConstant.XIA_JI.equals(type)) {
allIndexCodePath = explainDTO.getIndexCode();
setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath);
setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
//下钻到党员
ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
realScoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
}
List<String> tableHeaders = getTableHeaders(type, allIndexCodePath, orgLevel);
result.setTableTileList(tableHeaders);
break;
case "community":
setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
//不下钻
realScoreList = communitySubScoreDao.selectSubScore(ablityListFormDTO);
break;
case "street":
setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
//不下钻
realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
break;
case "district":
System.out.println("========" + allIndexCodePath);
if (allIndexCodePath.contains(IndexConstant.ZHI_LI_NENG_LI)) {
List<IndexGroupDetailResult> detailResults = detailEntityMap.get(allIndexCodePath);
List<IndexGroupDetailResult> indexGroupDetailEntities = new ArrayList<>();
for (IndexGroupDetailResult index : detailResults) {
if (IndexConstant.INDEX_DISTRINCT_TABLE1_INDEX_CODE.equals(index.getIndexCode())) {
indexGroupDetailEntities.add(index);
setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, indexGroupDetailEntities);
//不下钻
realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
break;
} else {
//下钻
setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
ablityListFormDTO.setPid(formDTO.getOrgId());
realScoreList = deptSubScoreDao.selecDeptAvgScore(ablityListFormDTO);
}
}
} else {
setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, null);
//不下钻
realScoreList = agencySubScoreDao.selectSubScore(ablityListFormDTO);
}
break;
default:
@ -166,14 +213,24 @@ public class IndexExplainServiceImpl implements IndexExplainService {
}
tb.setOriginValue(score.getOriginValue());
tb.setScore(String.valueOf(score.getScore()));
tb.setQuantity(score.getQuantity());
if (StringUtils.isNotBlank(score.getQuantity())) {
tb.setQuantity(score.getQuantity());
}
tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
}
}
}
private List<IndexScoreDetailResult> setDefaultTableData(String orgLevel, String type, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainResult result, String allIndexCodePath) {
List<IndexGroupDetailResult> indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
private List<IndexScoreDetailResult> setDefaultTableData(String orgLevel, String type, Map<String, List<IndexGroupDetailResult>> detailEntityMap,
IndexExplainResult result, String allIndexCodePath, List<IndexGroupDetailResult> indexGroupDetailEntities) {
if (indexGroupDetailEntities == null) {
indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
}
if (CollectionUtils.isEmpty(indexGroupDetailEntities)) {
log.warn("setDefaultTableData allINdexCodePath:{} is config error", allIndexCodePath);
return null;
}
List<IndexScoreDetailResult> tableList = new ArrayList<>();
List<String> threlodList = new ArrayList<>();
indexGroupDetailEntities.forEach(index -> {
@ -181,11 +238,15 @@ public class IndexExplainServiceImpl implements IndexExplainService {
if ("grid".equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) {
return;
}
if ((!"grid".equals(orgLevel) && !"district".equals(orgLevel)) && !index.getAllIndexCodePath().contains(type)) {
return;
}
table.setIndexCode(index.getIndexCode());
table.setIndexName(index.getIndexName());
table.setOriginValue(NumConstant.ZERO_STR);
table.setScore(NumConstant.ZERO_STR);
table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
table.setQuantity(NumConstant.ZERO_STR);
tableList.add(table);
if (new BigDecimal(-1).compareTo(index.getThreshold()) != 0) {
threlodList.add(index.getIndexName().concat(String.format(IndexConstant.THRESHOLD_TEXT, index.getThreshold().intValue())));
@ -225,7 +286,7 @@ public class IndexExplainServiceImpl implements IndexExplainService {
headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
} else if ("xiaji".equals(type)) {
headers = IndexConstant.getStandardSubHeaders(allIndexCode);
headers = new ArrayList<>(IndexConstant.QuantityLastHeader);
if (allIndexCode.contains("canyuyishi")) {
headers.add(0, "组织内党员的参与议事指数考评分(平均值)");
} else if (allIndexCode.contains("lianxiqunzhong")) {
@ -233,6 +294,19 @@ public class IndexExplainServiceImpl implements IndexExplainService {
}
break;
}
case "district":
if ("zishen".equals(type)) {
headers = IndexConstant.getStandardSelfHeaders(allIndexCode);
} else if ("xiaji".equals(type)) {
headers = new ArrayList<>(IndexConstant.QuantityLastHeader);
if (allIndexCode.contains("quzhibumen")) {
headers.add(0, "区直部门各项治理指数指标");
} else {
headers.add(0, "所有街道治理指数指标");
}
}
break;
default:
if ("zishen".equals(type)) {
headers = IndexConstant.getStandardSelfHeaders(allIndexCode);

25
epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml

@ -9,7 +9,8 @@
IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
fact.score AS score,
dict.index_name AS "name",
round(fact.WEIGHT,2) AS weight
round(fact.WEIGHT,2) AS weight,
(fact.SCORE * fact.WEIGHT) AS weightedScore
FROM
fact_index_agency_sub_score fact
LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
@ -40,5 +41,27 @@
ORDER BY
fact.month_id ASC
</select>
<select id="selectSubScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
SELECT
fact.index_code,
IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
round(fact.score,2) AS score,
round(fact.WEIGHT,2) AS weight
FROM
fact_index_agency_sub_score fact
WHERE
fact.del_flag = '0'
AND fact.all_parent_index_code = #{allParentIndexCode}
AND customer_id = #{customerId}
<choose>
<when test="pid != null and pid != ''">
AND PARENT_AGENCY_ID = #{pid}
</when>
<otherwise>
AND agency_id = #{orgId}
</otherwise>
</choose>
AND month_id = #{monthId}
</select>
</mapper>

18
epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml

@ -9,7 +9,8 @@
IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
dict.index_name AS "name",
fact.score AS score,
round(fact.WEIGHT,2) AS weight
round(fact.WEIGHT,2) AS weight,
(fact.SCORE * fact.WEIGHT) AS weightedScore
FROM
fact_index_community_sub_score fact
LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
@ -40,5 +41,20 @@
ORDER BY
fact.month_id ASC
</select>
<select id="selectSubScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
SELECT
fact.index_code,
IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
round(fact.score,2) AS score,
round(fact.WEIGHT,2) AS weight
FROM
fact_index_community_sub_score fact
WHERE
fact.del_flag = '0'
AND fact.all_parent_index_code = #{allParentIndexCode}
AND customer_id = #{customerId}
AND AGENCY_ID = #{orgId}
AND month_id = #{monthId}
</select>
</mapper>

24
epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.datareport.dao.fact.FactIndexDeptSubScoreDao">
<select id="selecDeptAvgScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
SELECT
id, customer_id, dept_id, agency_id, month_id,
origin_value,
index_code, all_parent_index_code, weight,
COUNT(*) quantity,
ROUND(AVG(score),2) score
FROM fact_index_dept_sub_score
WHERE
ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
AND CUSTOMER_ID = #{customerId}
and AGENCY_ID= #{orgId}
and MONTH_ID = #{monthId}
GROUP BY INDEX_CODE;
</select>
</mapper>

22
epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml

@ -9,7 +9,8 @@
IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
dict.index_name AS "name",
fact.score AS score,
round(fact.WEIGHT,2) AS weight
round(fact.WEIGHT,2) AS weight,
(fact.SCORE * fact.WEIGHT) AS weightedScore
FROM
fact_index_grid_sub_score fact
LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
@ -40,21 +41,7 @@
ORDER BY
fact.month_id ASC
</select>
<select id="selectGridSubScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
<!-- SELECT
fact.index_code,
IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
round(fact.SCORE,2) AS score,
round(fact.WEIGHT,2) AS weight
FROM
fact_index_grid_sub_score fact
WHERE
fact.del_flag = '0'
AND fact.all_parent_index_code = #{allParentIndexCode}
AND customer_id = #{customerId}
AND grid_id = #{orgId}
AND month_id = #{monthId}-->
<select id="selectSubScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
SELECT
fact.index_code,
IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
@ -68,9 +55,6 @@
AND customer_id = #{customerId}
AND grid_id = #{orgId}
AND month_id = #{monthId}
</select>
</mapper>

3
epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexDictDao.xml

@ -18,7 +18,8 @@
SELECT
index_name AS "indexName",
index_code AS "indexCode",
value_type AS "valueType"
value_type AS "valueType",
INDEX_DESC
FROM
index_dict
WHERE

Loading…
Cancel
Save