| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -122,8 +122,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            log.debug("user:{}", JSON.toJSONString(user)); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            if (!user.getRegTotal().equals(0)) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                BigDecimal avgIssueCount = new BigDecimal(issue.getIssueIncr()).divide(new BigDecimal(user.getRegTotal()) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                        .divide(new BigDecimal(NumConstant.ONE_HUNDRED)), 4, BigDecimal.ROUND_HALF_UP) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                        .multiply(new BigDecimal(NumConstant.ONE_HUNDRED)); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                        .divide(new BigDecimal(NumConstant.ONE_HUNDRED)), 4, BigDecimal.ROUND_HALF_UP); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                entity.setAvgIssue(avgIssueCount); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        }); | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -146,6 +145,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        //遍历实际参与人数
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        Map<String, List<IssueVoteUserCountResultDTO>> voteMap = voteCountList.stream().collect(Collectors.groupingBy(IssueVoteUserCountResultDTO::getOrgId)); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        log.debug("平均参与度:实际参与人数:{}", JSON.toJSONString(voteMap)); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        for (Map.Entry<String, List<IssueVoteUserCountResultDTO>> entry : voteMap.entrySet()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            String gridId = entry.getKey(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            ScreenUserJoinEntity entity = insertMap.get(gridId); | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -154,6 +154,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            BigDecimal votedByIssueCount = new BigDecimal(issueList.get(0).getIssueCount()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            for (IssueVoteUserCountResultDTO vote : issueList) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                Integer memberCount = gridMemberCount.get(gridId); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                log.debug("平均参与度:网格Id:{},实际投票人数:{},参与投票人数:{}", gridId, vote.getVoteCount(), memberCount); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                if (memberCount == null) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    memberCount = 0; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                } | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |