|
@ -148,12 +148,11 @@ public class StatsGroupServiceImpl implements StatsGroupService { |
|
|
String agencyId = agency.getId(); |
|
|
String agencyId = agency.getId(); |
|
|
agencyResult.setAgencyId(agencyId); |
|
|
agencyResult.setAgencyId(agencyId); |
|
|
agencyResult.setCustomerId(customerId); |
|
|
agencyResult.setCustomerId(customerId); |
|
|
|
|
|
agencyResult.setPid(agency.getPid()); |
|
|
BeanUtils.copyProperties(timeDim,agencyResult); |
|
|
BeanUtils.copyProperties(timeDim,agencyResult); |
|
|
//机关下的所有网格(包括直属网格)
|
|
|
//机关下的所有网格(包括直属网格)
|
|
|
List<String> allGrid = this.getAllGrid(agencyId,customerId); |
|
|
List<String> allGrid = this.getAllGrid(agencyId,customerId); |
|
|
if (allGrid.size() != NumConstant.ZERO) { |
|
|
if (allGrid.size() != NumConstant.ZERO) { |
|
|
String pidByAgencyId = dimAgencyService.getPidByAgencyId(agencyId); |
|
|
|
|
|
agencyResult.setPid(StringUtils.isBlank(pidByAgencyId) ? "0" : pidByAgencyId); |
|
|
|
|
|
// 1. 机关下有多少网格
|
|
|
// 1. 机关下有多少网格
|
|
|
List<GridIdListByCustomerResultDTO> customerGridIdList = customerGridService.getCustomerGridIdList(customerId, dateId); |
|
|
List<GridIdListByCustomerResultDTO> customerGridIdList = customerGridService.getCustomerGridIdList(customerId, dateId); |
|
|
AtomicReference<Integer> gridSize = new AtomicReference<>(0); |
|
|
AtomicReference<Integer> gridSize = new AtomicReference<>(0); |
|
|