Browse Source

修改:/communityUserHouseStats 接口,调整返回数据,增加分页相关数据返回

master
wangxianzhang 3 years ago
parent
commit
3aaede3e23
  1. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
  2. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
  3. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

6
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);
}
}

2
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);
}

6
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) {

Loading…
Cancel
Save