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> communityUserHouseStats(@RequestBody CommunityUserHouseStatsFormDTO input) { + public Result> communityUserHouseStats(@RequestBody CommunityUserHouseStatsFormDTO input) { String orgId = input.getOrgId(); String orgType = input.getOrgType(); Integer pageNo = input.getPageNo(); Integer pageSize = input.getPageSize(); - List r = houseService.communityUserHouseStats(orgId, orgType, pageNo, pageSize); - return new Result>().ok(r); + PageData r = houseService.communityUserHouseStats(orgId, orgType, pageNo, pageSize); + return new Result>().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 houseStatisListDetail(HouseChartFormDTO formDTO); - List communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); + PageData 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 communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { + public PageData communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { PageHelper.startPage(pageNo, pageSize); List communityIds = customerAgencyDao.getCommunitysByOrgIdPath(orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); + // 填充组织信息 Map communityMap = communityIds.stream().collect(Collectors.toMap(id -> id, id -> concatAgencyNamePath(id))); List communityUserHouseStats = houseUserChartList(communityIds, communityMap, "agency"); - return communityUserHouseStats; + + return new PageData(communityUserHouseStats, new PageInfo<>(communityIds).getTotal()); } public String concatAgencyNamePath(String agencyId) {