|
|
@ -94,7 +94,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { |
|
|
|
private void extractGridUserJoin(ExtractScreenFormDTO formDTO) { |
|
|
|
List<DimGridEntity> orgList = dimGridService.getGridListByCustomerId(formDTO.getCustomerId()); |
|
|
|
if (CollectionUtils.isEmpty(orgList)) { |
|
|
|
log.warn("抽取【公众参与-人均议题】,获取组织数据失败"); |
|
|
|
log.warn("抽取【公众参与-人均议题】,获取组织数据失败,客户Id:{}", formDTO.getCustomerId()); |
|
|
|
return; |
|
|
|
} |
|
|
|
//构建组织数据
|
|
|
@ -103,12 +103,12 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { |
|
|
|
//获取议题月份增量
|
|
|
|
List<FactIssueGridMonthlyEntity> issueTotal = factIssueGridMonthlyService.getIssueIncCountAndTotalByMonthId(formDTO.getCustomerId(), formDTO.getMonthId()); |
|
|
|
if (CollectionUtils.isEmpty(issueTotal)) { |
|
|
|
log.error("抽取【公众参与-人均议题】,获取议题增量为空"); |
|
|
|
log.error("抽取【公众参与-人均议题】,获取议题增量为空,客户Id:{}", formDTO.getCustomerId()); |
|
|
|
return; |
|
|
|
} |
|
|
|
List<GridUserCountResultDTO> userCountList = factRegUserGridMonthlyService.selectGridUserCount(formDTO.getCustomerId(), formDTO.getMonthId()); |
|
|
|
if (CollectionUtils.isEmpty(userCountList)) { |
|
|
|
log.error("抽取【公众参与-人均议题】,获取注册用户数为空"); |
|
|
|
log.error("抽取【公众参与-人均议题】,获取注册用户数为空,客户Id:{}", formDTO.getCustomerId()); |
|
|
|
return; |
|
|
|
} |
|
|
|
Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o)); |
|
|
@ -143,7 +143,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { |
|
|
|
//获取每个网格的应表决人数
|
|
|
|
List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID); |
|
|
|
if (CollectionUtils.isEmpty(memberCountList)) { |
|
|
|
log.warn("抽取【公众参与-人均议题】,获取应表决人数为空"); |
|
|
|
log.warn("抽取【公众参与-人均议题】,获取应表决人数为空,客户Id:{}", formDTO.getCustomerId()); |
|
|
|
return; |
|
|
|
} |
|
|
|
gridMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount())); |
|
|
@ -184,7 +184,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { |
|
|
|
private void extractAgencyUserJoin(ExtractScreenFormDTO formDTO) { |
|
|
|
List<DimAgencyEntity> orgList = dimAgencyService.getAgencyListByCustomerId(formDTO.getCustomerId()); |
|
|
|
if (CollectionUtils.isEmpty(orgList)) { |
|
|
|
log.warn("抽取【公众参与-人均议题】,获取组织数据失败"); |
|
|
|
log.warn("抽取【公众参与-人均议题】,获取组织数据失败,客户Id:{}", formDTO.getCustomerId()); |
|
|
|
return; |
|
|
|
} |
|
|
|
//构建组织数据
|
|
|
@ -196,7 +196,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { |
|
|
|
Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o)); |
|
|
|
Set<String> agencyIdSet = new HashSet<>(); |
|
|
|
if (!CollectionUtils.isEmpty(issueTotal)) { |
|
|
|
log.error("抽取【公众参与-人均议题】,获取注册用户数为空"); |
|
|
|
log.error("抽取【公众参与-人均议题】,获取注册用户数为空,客户Id:{}", formDTO.getCustomerId()); |
|
|
|
issueTotal.forEach(issue -> { |
|
|
|
String agencyId = issue.getAgencyId(); |
|
|
|
agencyIdSet.add(agencyId); |
|
|
@ -219,7 +219,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { |
|
|
|
//获取每个网格的应表决人数
|
|
|
|
List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID); |
|
|
|
if (CollectionUtils.isEmpty(memberCountList)) { |
|
|
|
log.warn("抽取【公众参与-人均议题】,获取应表决人数为空"); |
|
|
|
log.warn("抽取【公众参与-人均议题】,获取应表决人数为空,客户Id:{}", formDTO.getCustomerId()); |
|
|
|
return; |
|
|
|
} |
|
|
|
orgMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount())); |
|
|
|