From 3aaede3e231a84dc8a5c31ffb1adcf844177b297 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 11 Oct 2022 16:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A/communityUserHouseS?=
 =?UTF-8?q?tats=20=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=B0=83=E6=95=B4=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/HouseController.java | 6 +++---
 .../src/main/java/com/epmet/service/HouseService.java       | 2 +-
 .../main/java/com/epmet/service/impl/HouseServiceImpl.java  | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
index dd1d7c37af..79abda28a9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@@ -634,15 +634,15 @@ public class HouseController implements ResultDataResolver {
      * @return
      */
     @PostMapping("communityUserHouseStats")
-    public Result<List<SubUserHouseListResultDTO>> communityUserHouseStats(@RequestBody CommunityUserHouseStatsFormDTO input) {
+    public Result<PageData<SubUserHouseListResultDTO>> communityUserHouseStats(@RequestBody CommunityUserHouseStatsFormDTO input) {
 
         String orgId = input.getOrgId();
         String orgType = input.getOrgType();
         Integer pageNo = input.getPageNo();
         Integer pageSize = input.getPageSize();
 
-        List<SubUserHouseListResultDTO> r = houseService.communityUserHouseStats(orgId, orgType, pageNo, pageSize);
-        return new Result<List<SubUserHouseListResultDTO>>().ok(r);
+        PageData<SubUserHouseListResultDTO> r = houseService.communityUserHouseStats(orgId, orgType, pageNo, pageSize);
+        return new Result<PageData<SubUserHouseListResultDTO>>().ok(r);
     }
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
index 41ffd5709d..2973495dbf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
@@ -198,5 +198,5 @@ public interface HouseService {
 
     PageData<IcHouseListResultDTO> houseStatisListDetail(HouseChartFormDTO formDTO);
 
-    List<SubUserHouseListResultDTO> communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize);
+    PageData<SubUserHouseListResultDTO> communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index d5838a78a7..fa304c53c6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -1394,15 +1394,17 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     }
 
     @Override
-    public List<SubUserHouseListResultDTO> communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) {
+    public PageData<SubUserHouseListResultDTO> communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) {
 
         PageHelper.startPage(pageNo, pageSize);
         List<String> communityIds = customerAgencyDao.getCommunitysByOrgIdPath(orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType));
 
+
         // 填充组织信息
         Map<String, String> communityMap = communityIds.stream().collect(Collectors.toMap(id -> id, id -> concatAgencyNamePath(id)));
         List<SubUserHouseListResultDTO> communityUserHouseStats = houseUserChartList(communityIds, communityMap, "agency");
-        return communityUserHouseStats;
+
+        return new PageData<SubUserHouseListResultDTO>(communityUserHouseStats, new PageInfo<>(communityIds).getTotal());
     }
 
     public String concatAgencyNamePath(String agencyId) {