【五大图层】数据展示：完成分页

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

@@ -53,4 +53,10 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                             @Param("queryPids") String queryPids,
                                                             @Param("categoryKey") String categoryKey,
                                                             @Param("search") String search);
+
+    Integer countSpecialResisBySpecialType(@Param("customerId") String customerId,
+                                                            @Param("agencyId") String agencyId,
+                                                            @Param("queryPids") String queryPids,
+                                                            @Param("categoryKey") String categoryKey,
+                                                            @Param("search") String search);
 }

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

@@ -22,6 +22,8 @@ public interface IcResiService {
     List<IcResiUserEntity> listResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,
                                                                  Integer pageNo, Integer pageSize, Boolean isPage);
 
+    Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search);
+
     /**
      * 使用特殊人群类别查询居民列表
      * @param customerId
@@ -35,4 +37,6 @@ 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);
 }

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

@@ -37,9 +37,38 @@ public class IcResiServiceImpl implements IcResiService {
             PageHelper.startPage(pageNo, pageSize);
         }
 
+        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search);
+        query.orderByAsc(IcResiUserEntity::getCreatedTime);
+        return resiUserDao.selectList(query);
+    }
+
+    /**
+     * 根据条件查询数量
+     * @param customerId
+     * @param agencyId
+     * @param queryPids
+     * @param categoryKey
+     * @param search
+     * @return
+     */
+    @Override
+    public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) {
+        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search);
+        return resiUserDao.selectCount(query);
+    }
+
+    /**
+     * 构造queryWrapper
+     * @param customerId
+     * @param agencyId
+     * @param queryPids
+     * @param categoryKey
+     * @param search
+     * @return
+     */
+    LambdaQueryWrapper<IcResiUserEntity> constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) {
         LambdaQueryWrapper<IcResiUserEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcResiUserEntity::getCustomerId, customerId);
-        //query.likeRight(IcResiUserEntity::getPids, queryPids);
         query.and(q -> q.eq(IcResiUserEntity::getAgencyId, agencyId).or().likeRight(IcResiUserEntity::getPids, queryPids));
         if ("resi_xfry".equals(categoryKey)) {
             // 信访人员
@@ -51,8 +80,8 @@ public class IcResiServiceImpl implements IcResiService {
         if (StringUtils.isNotBlank(search)) {
             query.like(IcResiUserEntity::getName, search);
         }
-        query.orderByAsc(IcResiUserEntity::getCreatedTime);
-        return resiUserDao.selectList(query);
+
+        return query;
     }
 
     @Override
@@ -63,4 +92,9 @@ public class IcResiServiceImpl implements IcResiService {
         }
         return resiUserDao.listSpecialResisBySpecialType(customerId, agencyId, queryPids, categoryKey, search);
     }
+
+    @Override
+    public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search) {
+        return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
+    }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java

@@ -38,6 +38,8 @@ public interface GovOrgCoverageService {
      */
     Map<String, List<CategoryCoverageMapping>> getMappingRelationByCoverageType(List<String> coverageTypes, String customerId);
 
+    Integer countCityResourceEntities(String customerId, String agencyIdPath, String search, String category);
+
     /**
      * 搜索城市资源
      * @param customerId
@@ -51,6 +53,10 @@ public interface GovOrgCoverageService {
     List<IcCityManagementEntity> searchCityResourceEntities(String customerId, String agencyIdPath, String search, String category, Boolean isPage,
                                                             Integer pageNo, Integer pageSize);
 
+    /**
+     * 搜索危化企业列表数量查询
+     */
+    Integer countDangerousChemicalEntities(String customerId, String agencyIdPath, String search, String categoryKey);
     /**
      * 搜索危化企业列表
      * @param customerId
@@ -102,4 +108,8 @@ public interface GovOrgCoverageService {
      */
     List<IcSuperiorResourceEntity> searchSuporiorResourceEntities(String customerId, String staffOrgIds, String search,
                                                                   String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize);
+
+    Integer countPublicServiceEntities(String customerId, String staffOrgIds, String search, String categoryKey);
+
+    Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey);
 }

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

@@ -95,6 +95,31 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
      */
     @Override
     public List<IcCityManagementEntity> searchCityResourceEntities(String customerId, String agencyIdPath, String search, String category, Boolean isPage, Integer pageNo, Integer pageSize) {
+        if (isPage) {
+            PageHelper.startPage(pageNo ,pageSize);
+        }
+
+        LambdaQueryWrapper<IcCityManagementEntity> query = constructQueryWrapper(customerId, agencyIdPath, search, category);
+        query.orderByAsc(IcCityManagementEntity::getCreatedTime);
+        return cityManagementDao.selectList(query);
+    }
+
+    @Override
+    public Integer countCityResourceEntities(String customerId, String agencyIdPath, String search, String category) {
+        LambdaQueryWrapper<IcCityManagementEntity> query = constructQueryWrapper(customerId, agencyIdPath, search, category);
+        query.orderByAsc(IcCityManagementEntity::getCreatedTime);
+        return cityManagementDao.selectCount(query);
+    }
+
+    /**
+     * 构造动态查询
+     * @param customerId
+     * @param agencyIdPath
+     * @param search
+     * @param category
+     * @return
+     */
+    private LambdaQueryWrapper<IcCityManagementEntity> constructQueryWrapper(String customerId, String agencyIdPath, String search, String category) {
         LambdaQueryWrapper<IcCityManagementEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcCityManagementEntity::getCustomerId, customerId);
         query.eq(IcCityManagementEntity::getCategory, category);
@@ -102,12 +127,15 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
         if (StringUtils.isNotBlank(search)) {
             query.like(IcCityManagementEntity::getName, search);
         }
+        return query;
+    }
 
-        if (isPage) {
-            PageHelper.startPage(pageNo ,pageSize);
-        }
-        query.orderByAsc(IcCityManagementEntity::getCreatedTime);
-        return cityManagementDao.selectList(query);
+    @Override
+    public Integer countDangerousChemicalEntities(String customerId, String agencyIdPath, String search, String categoryKey) {
+
+        LambdaQueryWrapper<IcDangerousChemicalsEntity> query = constructDangerousChemicalQueryWrapper(customerId, agencyIdPath, search, categoryKey);
+
+        return dangerousChemicalsDao.selectCount(query);
     }
 
     /**
@@ -123,6 +151,19 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
     @Override
     public List<IcDangerousChemicalsEntity> searchDangerousChemicalEntities(
             String customerId, String agencyIdPath, String search, String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) {
+
+        LambdaQueryWrapper<IcDangerousChemicalsEntity> query = constructDangerousChemicalQueryWrapper(customerId, agencyIdPath, search, categoryKey);
+
+        if (isPage) {
+            PageHelper.startPage(pageNo ,pageSize);
+        }
+        query.orderByAsc(IcDangerousChemicalsEntity::getCreatedTime);
+        return dangerousChemicalsDao.selectList(query);
+    }
+
+    private LambdaQueryWrapper<IcDangerousChemicalsEntity> constructDangerousChemicalQueryWrapper(
+            String customerId, String agencyIdPath, String search, String categoryKey) {
+
         LambdaQueryWrapper<IcDangerousChemicalsEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcDangerousChemicalsEntity::getCustomerId, customerId);
         query.eq(IcDangerousChemicalsEntity::getCategory, categoryKey);
@@ -130,12 +171,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
         if (StringUtils.isNotBlank(search)) {
             query.like(IcDangerousChemicalsEntity::getName, search);
         }
-
-        if (isPage) {
-            PageHelper.startPage(pageNo ,pageSize);
-        }
-        query.orderByAsc(IcDangerousChemicalsEntity::getCreatedTime);
-        return dangerousChemicalsDao.selectList(query);
+        return query;
     }
 
     @Override
@@ -144,6 +180,18 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
         return null;
     }
 
+    /**
+     * 查询公共服务个数
+     * @param customerId
+     * @param staffOrgIds 查询人所属的组织ID路径，包含他本身所在的组织
+     * @param search
+     * @return
+     */
+    @Override
+    public Integer countPublicServiceEntities(String customerId, String staffOrgIds, String search, String categoryKey) {
+        return null;
+    }
+
     /**
      * 搜索公共服务
      * @param customerId
@@ -157,6 +205,25 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
     @Override
     public List<IcPublicServiceEntity> searchPublicServiceEntities(String customerId, String staffOrgIds, String search,
                                                                    String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) {
+
+        LambdaQueryWrapper<IcPublicServiceEntity> query = constructPublicServiceQueryWrapper(customerId, staffOrgIds, search, categoryKey);
+        if (isPage) {
+            PageHelper.startPage(pageNo ,pageSize);
+        }
+        query.orderByAsc(IcPublicServiceEntity::getCreatedTime);
+        return publicServiceDao.selectList(query);
+    }
+
+    /**
+     * 构造LambdaQueryWrapper
+     * @param customerId
+     * @param staffOrgIds
+     * @param search
+     * @param categoryKey
+     * @return
+     */
+    LambdaQueryWrapper<IcPublicServiceEntity> constructPublicServiceQueryWrapper(
+            String customerId, String staffOrgIds, String search, String categoryKey) {
         LambdaQueryWrapper<IcPublicServiceEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcPublicServiceEntity::getCustomerId, customerId);
         query.likeRight(IcPublicServiceEntity::getAgencyIdPath, staffOrgIds);
@@ -164,17 +231,28 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
         if (StringUtils.isNotBlank(search)) {
             query.like(IcPublicServiceEntity::getName, search);
         }
+        return query;
+    }
+
+    @Override
+    public List<IcSuperiorResourceEntity> searchSuporiorResourceEntities(String customerId, String staffOrgIds, String search,
+                                                                         String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) {
+        LambdaQueryWrapper<IcSuperiorResourceEntity> query = constructSuporiorResourceQueryWrapper(customerId, staffOrgIds, search, categoryKey);
 
         if (isPage) {
             PageHelper.startPage(pageNo ,pageSize);
         }
-        query.orderByAsc(IcPublicServiceEntity::getCreatedTime);
-        return publicServiceDao.selectList(query);
+        query.orderByAsc(IcSuperiorResourceEntity::getCreatedTime);
+        return superiorResourceDao.selectList(query);
     }
 
     @Override
-    public List<IcSuperiorResourceEntity> searchSuporiorResourceEntities(String customerId, String staffOrgIds, String search,
-                                                                         String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) {
+    public Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey) {
+        LambdaQueryWrapper<IcSuperiorResourceEntity> query = constructSuporiorResourceQueryWrapper(customerId, staffOrgIds, search, categoryKey);
+        return superiorResourceDao.selectCount(query);
+    }
+
+    LambdaQueryWrapper<IcSuperiorResourceEntity> constructSuporiorResourceQueryWrapper(String customerId, String staffOrgIds, String search, String categoryKey) {
         LambdaQueryWrapper<IcSuperiorResourceEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcSuperiorResourceEntity::getCustomerId, customerId);
         query.eq(IcSuperiorResourceEntity::getCategory, categoryKey);
@@ -183,10 +261,6 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
             query.like(IcSuperiorResourceEntity::getName, search);
         }
 
-        if (isPage) {
-            PageHelper.startPage(pageNo ,pageSize);
-        }
-        query.orderByAsc(IcSuperiorResourceEntity::getCreatedTime);
-        return superiorResourceDao.selectList(query);
+        return query;
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java

@@ -37,4 +37,7 @@ public interface HeartService {
      */
     List<IcPartyUnitEntity> searchPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType,
                                                     String search, Boolean isPage, Integer pageNo, Integer pageSize);
+
+    Integer countPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search);
+    Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey);
 }

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

@@ -39,6 +39,26 @@ public class HeartServiceImpl implements HeartService {
             String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,
             Boolean isPage, Integer pageNo, Integer pageSize) {
 
+        LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> query = constructCommunityOrgQueryWrapper(
+                customerId, agencyId, staffOrgIds, search, categoryKey);
+
+        if (isPage) {
+            PageHelper.startPage(pageNo, pageSize);
+        }
+        query.orderByAsc(IcCommunitySelfOrganizationEntity::getCreatedTime);
+        return communitySelfOrganizationDao.selectList(query);
+    }
+
+    @Override
+    public Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) {
+        LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> query = constructCommunityOrgQueryWrapper(
+                customerId, agencyId, staffOrgIds, search, categoryKey);
+
+        return communitySelfOrganizationDao.selectCount(query);
+    }
+
+    private LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> constructCommunityOrgQueryWrapper(
+            String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) {
         LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcCommunitySelfOrganizationEntity::getCustomerId, customerId);
         query.eq(IcCommunitySelfOrganizationEntity::getCategoryCode, categoryKey);
@@ -46,12 +66,24 @@ public class HeartServiceImpl implements HeartService {
         if (StringUtils.isNotBlank(search)) {
             query.like(IcCommunitySelfOrganizationEntity::getOrganizationName, search);
         }
+        return query;
+    }
 
-        if (isPage) {
-            PageHelper.startPage(pageNo, pageSize);
-        }
-        query.orderByAsc(IcCommunitySelfOrganizationEntity::getCreatedTime);
-        return communitySelfOrganizationDao.selectList(query);
+    /**
+     * 联建单位数量查询
+     * @param customerId
+     * @param agencyId
+     * @param staffOrgIds
+     * @param partyUnitType
+     * @param search
+     * @return
+     */
+    public Integer countPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search) {
+
+        LambdaQueryWrapper<IcPartyUnitEntity> query = constructPartyUnitQueryWrapper(customerId, agencyId, staffOrgIds, partyUnitType, search);
+
+        query.orderByAsc(IcPartyUnitEntity::getCreatedTime);
+        return partyUnitDao.selectCount(query);
     }
 
     /**
@@ -70,6 +102,16 @@ public class HeartServiceImpl implements HeartService {
             String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search,
             Boolean isPage, Integer pageNo, Integer pageSize) {
 
+        LambdaQueryWrapper<IcPartyUnitEntity> query = constructPartyUnitQueryWrapper(customerId, agencyId, staffOrgIds, partyUnitType, search);
+
+        if (isPage) {
+            PageHelper.startPage(pageNo, pageSize);
+        }
+        query.orderByAsc(IcPartyUnitEntity::getCreatedTime);
+        return partyUnitDao.selectList(query);
+    }
+
+    private LambdaQueryWrapper<IcPartyUnitEntity> constructPartyUnitQueryWrapper(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search) {
         LambdaQueryWrapper<IcPartyUnitEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcPartyUnitEntity::getCustomerId, customerId);
         query.eq(IcPartyUnitEntity::getType, partyUnitType);
@@ -77,11 +119,6 @@ public class HeartServiceImpl implements HeartService {
         if (StringUtils.isNotBlank(search)) {
             query.like(IcPartyUnitEntity::getUnitName, search);
         }
-
-        if (isPage) {
-            PageHelper.startPage(pageNo, pageSize);
-        }
-        query.orderByAsc(IcPartyUnitEntity::getCreatedTime);
-        return partyUnitDao.selectList(query);
+        return query;
     }
 }

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

@@ -98,8 +98,14 @@ public class CoverageServiceImpl implements CoverageService {
 
         // 分页不太好分，先查出所有的数据，然后partation()吧
         int start = (pageNo - 1) * pageSize;
-        int end = pageNo * pageSize;
+        int end = pageNo * pageSize; // 不包含
 
+        // 总共查询了多少个了
+        int lastTotalCount = 0;
+        int totalCount = 0;
+        boolean dataAppear = false;
+
+        // 结果集
         List<CoverageAnalisisDataListResultDTO> rls = new ArrayList<>();
         for (String coverageType : coverageTypes) {
             List<GovOrgCoverageService.CategoryCoverageMapping> ccm = mapping.get(coverageType);
@@ -107,21 +113,49 @@ public class CoverageServiceImpl implements CoverageService {
                 continue;
             }
             for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) {
-                // 执行查询
-                List<CoverageAnalisisDataListResultDTO> rl = doDataListSearch(
-                        EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(),
-                        e.getCategoryKey(), search, 1, end, isPage);
-
-                rls.addAll(rl);
+                boolean firstTimeDataAppear = false;
 
                 if (!isPage) {
-                    // 不分页的话，直接下一个category
+                    // 不分页，查询所有
+                    // 检索数据
+                    List<CoverageAnalisisDataListResultDTO> dataSegment = doDataListSearch(
+                            EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(),
+                            e.getCategoryKey(), search, null, null, isPage);
+                    rls.addAll(dataSegment);
                     continue;
                 }
 
-                // 要分页的话就要截取一下
-                if (rls.size() >= end) {
-                    return rls.subList(start, end);
+                // 查询当前category有多少个
+                if (!dataAppear) {
+                    Integer tempCount = doDataListCount(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(),
+                            e.getCategoryKey(), search);
+
+                    lastTotalCount = totalCount;
+                    totalCount += tempCount;
+                    if (totalCount > start) {
+                        dataAppear = true;
+                        firstTimeDataAppear = true;
+                    } else {
+                        continue;
+                    }
+                }
+
+                // 检索数据
+                List<CoverageAnalisisDataListResultDTO> dataSegment = doDataListSearch(
+                        EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(),
+                        e.getCategoryKey(), search, 1, end, isPage);
+
+                if (firstTimeDataAppear) {
+                    rls.addAll(dataSegment.subList(start - lastTotalCount, dataSegment.size()));
+                } else {
+                    rls.addAll(dataSegment);
+                }
+
+                firstTimeDataAppear = false;
+
+                // 最后，将多余的数据裁剪掉
+                if (rls.size() >= pageSize) {
+                    return rls.subList(0, pageSize);
                 }
             }
         }
@@ -143,6 +177,51 @@ public class CoverageServiceImpl implements CoverageService {
         }
     }
 
+    public Integer doDataListCount(String customerId, String agencyId, String staffOrgIds, String placeType,
+                                   String categoryKey, String search) {
+
+        if (PLACE_TYPE_RESI.equals(placeType)) {
+            // 使用分类查询居民信息
+            return icResiService.countResisByCategories4Coverage(customerId, agencyId,
+                    staffOrgIds, categoryKey, search);
+        } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) {
+            // 特殊人群
+            return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
+        } else if (PLACE_TYPE_EVENT.equals(placeType)) {
+            // 难点痛点 todo
+        } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) {
+            // 城市资源管理
+            return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey);
+        } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) {
+            // 社区自组织
+            return heartService.countCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, categoryKey);
+        } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) {
+            // 机关直属部门(联建单位)  楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7
+            if (categoryKey.equals("pu_jgzsbm")) {
+                String partyUnitType = "3";
+                return heartService.countPartyUnitEntities(customerId, agencyId, staffOrgIds, partyUnitType, search);
+            }
+        } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) {
+            // 危化企业
+            return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey);
+        } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) {
+            // 企事业单位巡查 todo
+
+
+        } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) {
+            // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） todo
+
+        } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) {
+            // 公共服务
+            return orgCoverageService.countPublicServiceEntities(customerId, staffOrgIds, search, categoryKey);
+        } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) {
+            // 优势资源
+            return orgCoverageService.countSuporiorResourceEntities(customerId, staffOrgIds, search, categoryKey);
+        }
+
+        return 0;
+    }
+
     /**
      * 执行数据查询
      * @param customerId
@@ -189,7 +268,7 @@ public class CoverageServiceImpl implements CoverageService {
         } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) {
             // 城市资源管理
             List<IcCityManagementEntity> cityResources = orgCoverageService.searchCityResourceEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
-            cityResources.stream()
+            return cityResources.stream()
                     .map(resource -> new CoverageAnalisisDataListResultDTO(resource.getId(), categoryKey, placeType, resource.getName(), resource.getLatitude(), resource.getLongitude()))
                     .collect(Collectors.toList());
 

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

@@ -52,4 +52,19 @@
           order by s.CREATED_TIME asc
     </select>
 
+    <!--根据特殊人群类别查询居民列表-->
+    <select id="countSpecialResisBySpecialType" resultType="int">
+        select count(1)
+        from ic_resi_user resi
+                 inner join ic_special s on (resi.ID = s.IC_RESI_USER)
+        where resi.CUSTOMER_ID = #{customerId}
+          and (resi.AGENCY_ID = #{agencyId} or resi.PIDS like CONCAT(#{queryPids},'%'))
+          <if test="search != null and search != ''">
+            and resi.NAME like CONCAT('%', #{search},'%')
+          </if>
+          and s.SPECIAL_RQLB like CONCAT('%', #{categoryKey},'%')
+          and resi.DEL_FLAG = '0'
+          and s.DEL_FLAG = '0'
+    </select>
+
 </mapper>