|
@ -52,17 +52,17 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve |
|
|
Result<List<ListUserByBadgeResultDTO>> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm); |
|
|
Result<List<ListUserByBadgeResultDTO>> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm); |
|
|
List<ListUserByBadgeResultDTO> npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null); |
|
|
List<ListUserByBadgeResultDTO> npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null); |
|
|
|
|
|
|
|
|
|
|
|
if(CollectionUtils.isEmpty(npcData)) { |
|
|
|
|
|
// 没有人大代表,直接返回空列表即可
|
|
|
|
|
|
return npcResultList; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
//批量查询人大代表所在的网格信息
|
|
|
//批量查询人大代表所在的网格信息
|
|
|
List<String> npcGridIds = npcData.stream().map(d -> d.getGridId()).collect(Collectors.toList()); |
|
|
List<String> npcGridIds = npcData.stream().map(d -> d.getGridId()).collect(Collectors.toList()); |
|
|
OrgInfoFormDTO form = new OrgInfoFormDTO(OrgInfoConstant.GRID, npcGridIds); |
|
|
OrgInfoFormDTO form = new OrgInfoFormDTO(OrgInfoConstant.GRID, npcGridIds); |
|
|
Result<List<OrgInfoResultDTO>> npcGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form); |
|
|
Result<List<OrgInfoResultDTO>> npcGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form); |
|
|
List<OrgInfoResultDTO> npcGridInfos = getResultDataOrThrowsException(npcGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); |
|
|
List<OrgInfoResultDTO> npcGridInfos = getResultDataOrThrowsException(npcGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); |
|
|
|
|
|
|
|
|
if(CollectionUtils.isEmpty(npcGridInfos)) { |
|
|
|
|
|
// 没有人大代表,直接返回空列表即可
|
|
|
|
|
|
return npcResultList; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Map<String, OrgInfoResultDTO> npcGridInfoMap = convertNpcGridInfos2Map(npcGridInfos); |
|
|
Map<String, OrgInfoResultDTO> npcGridInfoMap = convertNpcGridInfos2Map(npcGridInfos); |
|
|
|
|
|
|
|
|
npcData.stream().forEach(npc -> { |
|
|
npcData.stream().forEach(npc -> { |
|
|