| 
						
						
							
								
							
						
						
					 | 
					@ -258,6 +258,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    @Transactional(rollbackFor = Exception.class) | 
					 | 
					 | 
					    @Transactional(rollbackFor = Exception.class) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    public void syncVotingCacheToDb() { | 
					 | 
					 | 
					    public void syncVotingCacheToDb() { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        IssueDTO issueParam = new IssueDTO(); | 
					 | 
					 | 
					        IssueDTO issueParam = new IssueDTO(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        // 表决中
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        issueParam.setIssueStatus(ModuleConstants.ISSUE_STATUS_VOTING); | 
					 | 
					 | 
					        issueParam.setIssueStatus(ModuleConstants.ISSUE_STATUS_VOTING); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        //获取所有voting的议题
 | 
					 | 
					 | 
					        //获取所有voting的议题
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        Set<IssueDTO> issues = | 
					 | 
					 | 
					        Set<IssueDTO> issues = | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -265,18 +266,20 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if(null == issues || issues.isEmpty()){ | 
					 | 
					 | 
					        if(null == issues || issues.isEmpty()){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            return; | 
					 | 
					 | 
					            return; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        // 议题ID集合
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        Set<String> ids = issues.stream().map(IssueDTO::getId).collect(Collectors.toSet()); | 
					 | 
					 | 
					        Set<String> ids = issues.stream().map(IssueDTO::getId).collect(Collectors.toSet()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        List<String> gridIds = issues.stream().map(IssueDTO::getGridId).distinct().collect(Collectors.toList()); | 
					 | 
					 | 
					        List<String> gridIds = issues.stream().map(IssueDTO::getGridId).distinct().collect(Collectors.toList()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        CommonGridIdListFormDTO gridIdList = new CommonGridIdListFormDTO(); | 
					 | 
					 | 
					        CommonGridIdListFormDTO gridIdList = new CommonGridIdListFormDTO(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        gridIdList.setGridIds(gridIds); | 
					 | 
					 | 
					        gridIdList.setGridIds(gridIds); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        // 根据网格Id查询网格下所有加入组的组员
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        Result<GridVotableCountResultDTO> votableCountResult = resiGroupFeignClient.votableCounts(gridIdList); | 
					 | 
					 | 
					        Result<GridVotableCountResultDTO> votableCountResult = resiGroupFeignClient.votableCounts(gridIdList); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        Map<String,Integer> votableCountMap1 = null; | 
					 | 
					 | 
					        Map<String,Integer> votableCountMap1 = null; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if(votableCountResult.success() && null != votableCountResult.getData() && null != votableCountResult.getData().getVotableCountMap()){ | 
					 | 
					 | 
					        if(votableCountResult.success() && null != votableCountResult.getData() && null != votableCountResult.getData().getVotableCountMap()){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            votableCountMap1 = votableCountResult.getData().getVotableCountMap(); | 
					 | 
					 | 
					            votableCountMap1 = votableCountResult.getData().getVotableCountMap(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        final Map<String,Integer> votableCountMap = votableCountMap1; | 
					 | 
					 | 
					        final Map<String,Integer> votableCountMap = votableCountMap1; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					
 | 
					 | 
					 | 
					        //查询指定议题的统计数据
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        List<IssueVoteStatisticalDTO> statisticalList = | 
					 | 
					 | 
					        List<IssueVoteStatisticalDTO> statisticalList = | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                baseDao.selectListByIds(ids); | 
					 | 
					 | 
					                baseDao.selectListByIds(ids); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if (null != statisticalList && statisticalList.size() > NumConstant.ZERO) { | 
					 | 
					 | 
					        if (null != statisticalList && statisticalList.size() > NumConstant.ZERO) { | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |