11

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.java

@@ -87,7 +87,7 @@ public interface FactIndexGovrnAblityOrgMonthlyDao extends BaseDao<FactIndexGovr
      * @date 2021/3/11 下午5:21
      */
     List<Map<String,Object>> selectCommunityGovernAbilityIsKongCun(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("customerId")String customerId);
-    List<Map<String,Object>> selectCommunityGovernAbilityIsKongCunNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
+    List<Map<String,Object>> selectCommunityGovernAbilityIsKongCunNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId,@Param("customerId")String customerId);
 
     /**
      * 根据组织类型删除数据

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.java

@@ -91,7 +91,7 @@ public interface FactIndexServiceAblityOrgMonthlyDao extends BaseDao<FactIndexSe
     List<Map<String,Object>> selectActivityCountMapExistsSub(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
     List<Map<String,Object>> selectActivityCountMapExistsSubNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
     List<Map<String,Object>> selectActivityCountMapIsKongCun(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("customerId")String customerId);
-    List<Map<String,Object>> selectActivityCountMapIsKongCunNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
+    List<Map<String,Object>> selectActivityCountMapIsKongCunNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId,@Param("customerId")String customerId);
     List<Map<String,Object>> selectActivityCountMapExistsSubNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
     List<Map<String,Object>> selectActivityCountMapExistsSubNotSelfNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
 

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

@@ -923,7 +923,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
         List<Map<String, Object>> result = new ArrayList<>();
         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(), "2fe0065f70ca0e23ce4c26fca5f1d933");
+        List<Map<String, Object>> kongCunGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityIsKongCunNew(formDTO.getMonthId(),formDTO.getCustomerAreaCode(), quarterId,yearId,"2fe0065f70ca0e23ce4c26fca5f1d933");
         if (!CollectionUtils.isEmpty(kongCunGovernAbility)){
             kongCunGovernAbility.forEach(k -> {
                 k.put("AGENCY_ID",k.get("PARENT_ID"));
@@ -944,7 +944,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         String yearId = DateUtils.getYearId(formDTO.getMonthId());
         List<Map<String, Object>> result = new ArrayList<>();
         List<Map<String, Object>> ActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapExistsSub(formDTO.getMonthId(),formDTO.getCustomerAreaCode());
-        List<Map<String, Object>> kongCunActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapIsKongCun(formDTO.getMonthId(),formDTO.getCustomerAreaCode(),"2fe0065f70ca0e23ce4c26fca5f1d933");
+        List<Map<String, Object>> kongCunActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapIsKongCunNew(formDTO.getMonthId(),formDTO.getCustomerAreaCode(),quarterId,yearId,"2fe0065f70ca0e23ce4c26fca5f1d933");
         if (!CollectionUtils.isEmpty(kongCunActivityCountList)){
             kongCunActivityCountList.forEach(k -> {
                 k.put("AGENCY_ID",k.get("PARENT_ID"));

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

@@ -304,7 +304,8 @@
             AND  gm.PARENT_ID != '0'
             )
         WHERE sca.DEL_FLAG = '0'
-          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
+          AND sca.PARENT_AREA_CODE = #{areaCode}
-          AND sca.AREA_CODE != #{areaCode}
+          AND sca.CUSTOMER_ID = #{customerId}
+          AND sca.PID != '0'
     </select>
 </mapper>

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

@@ -235,8 +235,9 @@
             AND sm.PARENT_ID != '0'
             )
         WHERE sca.DEL_FLAG = '0'
-          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
+          AND sca.PARENT_AREA_CODE = #{areaCode}
-          AND sca.AREA_CODE != #{areaCode}
+          AND sca.CUSTOMER_ID = #{customerId}
+          AND sca.PID != '0'
     </select>
 
     <select id="selectActivityCountMapExistsSubNotSelfNew" resultType="java.util.Map">