|
@ -129,6 +129,34 @@ public class HouseInformationServiceImpl implements HouseInformationService { |
|
|
item.setDifferPersonCount(item.getPersonRealCount() - item.getPersonCount()); |
|
|
item.setDifferPersonCount(item.getPersonRealCount() - item.getPersonCount()); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
return deleteAfetrEmergency(formDTO); |
|
|
|
|
|
} |
|
|
|
|
|
return new PageData<>(list, pageInfo.getTotal()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private PageData<GridCountListResultDTO> deleteAfetrEmergency(HouseInformationFormDTO formDTO) { |
|
|
|
|
|
//获取工作人员所属组织
|
|
|
|
|
|
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); |
|
|
|
|
|
formDTO.setCommunityId(staffInfo.getAgencyId()); |
|
|
|
|
|
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); |
|
|
|
|
|
List<GridCountListResultDTO> list = icNeighborHoodDao.getGridList(formDTO); |
|
|
|
|
|
PageInfo<GridCountListResultDTO> pageInfo = new PageInfo<>(list); |
|
|
|
|
|
if (CollectionUtils.isNotEmpty(list)) { |
|
|
|
|
|
//获取录入人口数
|
|
|
|
|
|
IcUserCountFormDTO countFormDTO = new IcUserCountFormDTO(); |
|
|
|
|
|
countFormDTO.setOrgType(NumConstant.ZERO_STR); |
|
|
|
|
|
countFormDTO.setOrgId(formDTO.getCommunityId()); |
|
|
|
|
|
countFormDTO.setType(NumConstant.ONE_STR); |
|
|
|
|
|
Map<String, Integer> map = getMapResult(countFormDTO); |
|
|
|
|
|
|
|
|
|
|
|
list.forEach(item -> { |
|
|
|
|
|
if (map.containsKey(item.getId())) { |
|
|
|
|
|
item.setPersonCount(map.get(item.getId())); |
|
|
|
|
|
} |
|
|
|
|
|
item.setDifferPersonCount(item.getPersonRealCount() - item.getPersonCount()); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
return new PageData<>(list, pageInfo.getTotal()); |
|
|
return new PageData<>(list, pageInfo.getTotal()); |
|
|
} |
|
|
} |
|
|