|
|
@ -929,7 +929,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
AtomicInteger total = new AtomicInteger(); |
|
|
|
|
|
|
|
categories.forEach(cat -> { |
|
|
|
Integer quantity = doDataListCount(customerId, agencyId, staffOrgIds, cat.getPlaceType(), cat.getCategoryKey(), null); |
|
|
|
Integer quantity = doDataListCount(customerId, agencyId, staffOrgIds, cat.getPlaceType(), cat.getCategoryKey(), null, null); |
|
|
|
cat.setQuantity(quantity); |
|
|
|
total.getAndAdd(quantity); |
|
|
|
}); |
|
|
@ -1058,7 +1058,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
if (CollectionUtils.isEmpty(children)) { |
|
|
|
// 城市管理时间 || 安全生产隐患等只有一层的
|
|
|
|
Integer quantity = doDataListCount(customerId, agencyId, staffOrgIds, targetsOfOnePlaceType.getPlaceType(), |
|
|
|
targetsOfOnePlaceType.getCategoryKey(), null); |
|
|
|
targetsOfOnePlaceType.getCategoryKey(), null, null); |
|
|
|
targetsOfOnePlaceType.setQuantity(quantity); |
|
|
|
} else { |
|
|
|
// 综合治理人群 || 公共服务人群等有子级的
|
|
|
@ -1066,7 +1066,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
AtomicInteger totalOfPlaceType = new AtomicInteger(); |
|
|
|
children.forEach(governedTarget -> { |
|
|
|
Integer quantity = doDataListCount(customerId, agencyId, staffOrgIds, governedTarget.getPlaceType(), |
|
|
|
governedTarget.getCategoryKey(), null); |
|
|
|
governedTarget.getCategoryKey(), null, null); |
|
|
|
governedTarget.setQuantity(quantity); |
|
|
|
totalOfPlaceType.addAndGet(quantity); |
|
|
|
}); |
|
|
|