Merge branch 'dev_screen_data_2.0' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -285,8 +285,6 @@ public class IndexServiceImpl implements IndexService {
         NumberFormat nf = NumberFormat.getPercentInstance();
         nf.setMaximumFractionDigits(1);
 
-        BigDecimal num = new BigDecimal(resultDTO.getTotal()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros();
-        resultDTO.setTotalScore(num);
         BigDecimal num1 = new BigDecimal(resultDTO.getParty()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros();
         resultDTO.setPartyDevAbility(num1);
         resultDTO.setPartyDevAbilityWeight(nf.format(Double.parseDouble(resultDTO.getPartyDevAbilityWeight())));
@@ -296,6 +294,9 @@ public class IndexServiceImpl implements IndexService {
         BigDecimal num3 = new BigDecimal(resultDTO.getService()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros();
         resultDTO.setServiceAbility(num3);
         resultDTO.setServiceAbilityWeight(nf.format(Double.parseDouble(resultDTO.getServiceAbilityWeight())));
+        Double db = Double.parseDouble(resultDTO.getParty())+Double.parseDouble(resultDTO.getGovern())+Double.parseDouble(resultDTO.getService());
+        BigDecimal num = new BigDecimal(db.toString()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros();
+        resultDTO.setTotalScore(num);
 
         return resultDTO;
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java

@@ -134,7 +134,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
             //获取该能力下的分数
             List<DeptSubScoreEntity> subScore = deptSubScoreDao.selectSubListByPath(formDTO.getCustomerId(), formDTO.getMonthId(), levelIndexPath);
             if (CollectionUtils.isEmpty(subScore)) {
-                log.error("calculateSelfSubScore communitySubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId());
+                log.warn("calculateSelfSubScore communitySubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId());
                 return;
             }
             Map<String, Set<String>> selfSubParentMap = new HashMap<>();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java

@@ -123,7 +123,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
             //获取该能力下的分数
             List<GridSubScoreEntity> subScore = gridSubScoreDao.selectSubListByPath(formDTO.getCustomerId(), formDTO.getMonthId(), levelIndexPath);
             if (CollectionUtils.isEmpty(subScore)) {
-                log.error("calculateSelfSubScore gridSubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId());
+                log.warn("calculateSelfSubScore gridSubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId());
                 return;
             }
             Map<String, Set<String>> selfSubParentMap = new HashMap<>();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java

@@ -132,7 +132,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
             //获取该能力下的分数
             List<FactIndexCommunitySubScoreEntity> subScore = communitySubScoreDao.selectSubListByPath(formDTO.getCustomerId(), formDTO.getMonthId(), levelIndexPath);
             if (CollectionUtils.isEmpty(subScore)) {
-                log.error("calculateSelfSubScore communitySubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId());
+                log.warn("calculateSelfSubScore communitySubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId());
                 return;
             }
             Map<String, Set<String>> selfSubParentMap = new HashMap<>();
@@ -204,7 +204,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
             if (IndexCodeEnum.XIA_SHU_SUO_YOU_WGDDJNLPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubGridAvgResultDTO> subGridPartyAvgScore = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
-                    log.error(IndexCalConstant.GRID_PARTY_AVG_NULL);
+                    log.warn(IndexCalConstant.GRID_PARTY_AVG_NULL);
                 } else {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubGridAvgResultDTO>> subPartyAvgList = ListUtils.partition(subGridPartyAvgScore, IndexCalConstant.PAGE_SIZE);
@@ -298,7 +298,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                 // 治理能力的六个五级指标
                 List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbility(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (CollectionUtils.isEmpty(communityGovernAbility)){
-                    log.error(IndexCalConstant.COMMUNITY_GOVERN_ABILITY_NULL);
+                    log.warn(IndexCalConstant.COMMUNITY_GOVERN_ABILITY_NULL);
                 }else{
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                     if (StringUtils.isEmpty(fieldNameByIndexCode)) {
@@ -370,7 +370,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
             } else {
                 List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMap(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
                 if (CollectionUtils.isEmpty(communityActivityCountList)) {
-                    log.error(IndexCalConstant.COMMUNITY_SERVICE_ABILITY_NULL);
+                    log.warn(IndexCalConstant.COMMUNITY_SERVICE_ABILITY_NULL);
                 }else{
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                     if (StringUtils.isEmpty(fieldNameByIndexCode)) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java

@@ -130,7 +130,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             //获取该能力下的分数
             List<AgencySubScoreEntity> subScore = agencySubScoreDao.selectSubListByPath(formDTO.getCustomerId(), formDTO.getMonthId(), OrgTypeConstant.DISTRICT, levelIndexPath);
             if (CollectionUtils.isEmpty(subScore)) {
-                log.error("calculateSelfSubScore communitySubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId());
+                log.warn("calculateSelfSubScore communitySubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId());
                 return;
             }
             Map<String, Set<String>> selfSubParentMap = new HashMap<>();
@@ -202,7 +202,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
-                    log.error(IndexCalConstant.DISTRICT_PARTY_AVG_NULL);
+                    log.warn(IndexCalConstant.DISTRICT_PARTY_AVG_NULL);
                 } else if (subGridPartyAvgScore.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> subPartyAvgList = ListUtils.partition(subGridPartyAvgScore, IndexCalConstant.PAGE_SIZE);
@@ -283,7 +283,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                     }
                 }
                 if (CollectionUtils.isEmpty(districtGovernAvgList)) {
-                    log.error("查询所有街道治理能力平均值集合为空");
+                    log.warn("查询所有街道治理能力平均值集合为空");
                 } else{
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(districtGovernAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> governAvg = ListUtils.partition(districtGovernAvgList, IndexCalConstant.PAGE_SIZE);
@@ -363,7 +363,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                     }
                 }
                 if (CollectionUtils.isEmpty(subStreetAvgList)) {
-                    log.error("查询区下属街道服务能力汇总平均值集合为空");
+                    log.warn("查询区下属街道服务能力汇总平均值集合为空");
                 } else{
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subStreetAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> serviceAvgList = ListUtils.partition(subStreetAvgList, IndexCalConstant.PAGE_SIZE);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java

@@ -133,7 +133,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             //获取该能力下的分数
             List<AgencySubScoreEntity> subScore = agencySubScoreDao.selectSubListByPath(formDTO.getCustomerId(), formDTO.getMonthId(), OrgTypeConstant.STREET, levelIndexPath);
             if (CollectionUtils.isEmpty(subScore)) {
-                log.error("calculateSelfSubScore communitySubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId());
+                log.warn("calculateSelfSubScore communitySubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId());
                 return;
             }
             Map<String, Set<String>> selfSubParentMap = new HashMap<>();
@@ -205,7 +205,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubCommunityAvgResultDTO> subCommPartyAvgScore = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
                 if (CollectionUtils.isEmpty(subCommPartyAvgScore)) {
-                    log.error(IndexCalConstant.COMMUNITY_PARTY_AVG_NULL);
+                    log.warn(IndexCalConstant.COMMUNITY_PARTY_AVG_NULL);
                 } else if (subCommPartyAvgScore.size() > NumConstant.ZERO) {
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subCommPartyAvgScore.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     Integer indexEnd = NumConstant.TEN;
@@ -371,7 +371,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             } else {
                 List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMap(customerId, monthId,IndexCalConstant.STREET_LEVEL);
                 if (CollectionUtils.isEmpty(communityActivityCountList)) {
-                    log.error(IndexCalConstant.STREET_SERVICE_ABILITY_NULL);
+                    log.warn(IndexCalConstant.STREET_SERVICE_ABILITY_NULL);
                 }else{
                     String fieldNameByIndexCode = indexCodeFieldReService.getFieldNameByIndexCode(detail.getIndexCode());
                     if (StringUtils.isEmpty(fieldNameByIndexCode)) {