特殊人群

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java

@@ -62,7 +62,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                             @Param("agencyId") String agencyId,
                                                             @Param("queryPids") String queryPids,
                                                             @Param("categoryKey") String categoryKey,
-                                                            @Param("search") String search);
+                                                            @Param("search") String search,
+                                                            @Param("gridId")String gridId);
 
     /**
      * 政策查找居民

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java

@@ -40,7 +40,7 @@ public interface IcResiService {
     List<IcResiInfoResultDTO> listSpecialResisBySpecialType(String customerId, String agencyId, String queryPids, String categoryKey, String search,
                                                             Integer pageNo, Integer pageSize, Boolean isPage);
 
-    Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search);
+    Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search,String gridId);
 
     /**
      * Desc: 获取icUser

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java

@@ -137,8 +137,8 @@ public class IcResiServiceImpl implements IcResiService {
     }
 
     @Override
-    public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search) {
-        return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
+    public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search, String gridId) {
+        return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search,gridId);
     }
 
     /**

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -572,7 +572,7 @@ public class CoverageServiceImpl implements CoverageService {
                     staffOrgIds, categoryKey, search,gridId);
         } else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) {
             // 特殊人群
-            return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
+            return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search,gridId);
         } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) {
             // 难点痛点
             return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true,gridId);

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -63,6 +63,9 @@
           <if test="search != null and search != ''">
             and resi.NAME like CONCAT('%', #{search},'%')
           </if>
+          <if test="gridId != null and gridId != ''">
+            and resi.GRID_ID =#{gridId}
+          </if>
           and s.SPECIAL_RQLB like CONCAT('%', #{categoryKey},'%')
           and resi.DEL_FLAG = '0'
           and s.DEL_FLAG = '0'