Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp

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

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

@@ -325,6 +325,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQZLNLHZ.getCode().equals(detail.getIndexCode())) {
                 List<SubCommunityAvgResultDTO> subGridGovernAvg = communityScoreDao.selectSubCommAvgScoreNew(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),quarterId,yearId);
+                log.info("streetGovernAbilityCalculate: pjz {}",JSON.toJSONString(subGridGovernAvg));
                 subGridGovernAvg.forEach(s -> {
                     gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQZLNLHZ.getCode()), s.getSampleCount());
                 });
@@ -348,6 +349,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             } else {
                 // 治理能力的六个五级指标
                 List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityNew(customerId, monthId,IndexCalConstant.STREET_LEVEL,quarterId,yearId);
+                log.info("streetGovernAbilityCalculate: {}",JSON.toJSONString(communityGovernAbility));
                 if (CollectionUtils.isEmpty(communityGovernAbility)){
                     log.warn(IndexCalConstant.STREET_GOVERN_ABILITY_NULL);
                 }else{
@@ -384,6 +386,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             s.setSampleCount(sampleCount == null ? NumConstant.ZERO : sampleCount);
         });
         insertDetail(result);
+        log.info("streetGovernAbilityCalculate: result{}",JSON.toJSONString(result));
         return true;
     }