11

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

@@ -921,7 +921,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
         List<Map<String, Object>> result = new ArrayList<>();
-        List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityExistsSubNotSelf(formDTO.getMonthId(),formDTO.getCustomerAreaCode(), ScreenConstant.STREET);
+        List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityExistsSubNotSelfNew(formDTO.getMonthId(),formDTO.getCustomerAreaCode(), ScreenConstant.STREET,quarterId,yearId);
         List<Map<String, Object>> kongCunGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityIsKongCun(formDTO.getMonthId(),formDTO.getCustomerAreaCode());
         if (!CollectionUtils.isEmpty(kongCunGovernAbility)){
             kongCunGovernAbility.forEach(k -> {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml

@@ -183,8 +183,7 @@
         WHERE
             fics.del_flag = '0'
           AND sca.DEL_FLAG = 0
-          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-          AND sca.AREA_CODE != #{areaCode}
+          AND sca.PARENT_AREA_CODE = #{areaCode}
           AND sca.`LEVEL` = 'community'
           AND fics.month_id = #{monthId}
           AND fics.index_code = #{indexCode}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml

@@ -251,8 +251,7 @@
             AND  gm.PARENT_ID = '0'
             )
         WHERE sca.DEL_FLAG = '0'
-          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-          AND sca.AREA_CODE != #{areaCode}
+          AND sca.PARENT_AREA_CODE =#{areaCode}
     </select>
 
     <!-- 孔村单独查询 -->
@@ -278,8 +277,7 @@
             gm.del_flag = '0'
           AND gm.month_id = #{monthId}
           AND gm.DATA_TYPE = 'street'
-          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-          AND sca.AREA_CODE != #{areaCode}
+          AND sca.PARENT_AREA_CODE = #{areaCode}
           AND  gm.PARENT_ID != '0'
     </select>
     <select id="selectCommunityGovernAbilityIsKongCunNew" resultType="java.util.Map">

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml

@@ -151,8 +151,7 @@
         WHERE
             sm.del_flag = '0'
           AND sm.DATA_TYPE = 'street'
-          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-          AND sca.AREA_CODE != #{areaCode}
+          AND sca.PARENT_AREA_CODE = #{areaCode}
           AND sm.month_id = #{monthId}
           AND sm.PARENT_ID = '0'
     </select>
@@ -190,8 +189,7 @@
         WHERE
             sm.del_flag = '0'
           AND sm.DATA_TYPE = 'street'
-          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
-          AND sca.AREA_CODE != #{areaCode}
+          AND sca.PARENT_AREA_CODE = #{areaCode}
           AND sm.month_id = #{monthId}
           AND sm.PARENT_ID != '0'
     </select>