| 
						
						
							
								
							
						
						
					 | 
					@ -357,33 +357,23 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            // 根据网格分组
 | 
					 | 
					 | 
					            // 根据网格分组
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            Map<String, List<ProjectEvaluateResultDTO>> groupByGrid = projectEvaluateList.stream().collect(Collectors.groupingBy(ProjectEvaluateResultDTO::getGridId)); | 
					 | 
					 | 
					            Map<String, List<ProjectEvaluateResultDTO>> groupByGrid = projectEvaluateList.stream().collect(Collectors.groupingBy(ProjectEvaluateResultDTO::getGridId)); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            groupByGrid.forEach((gridId,projectEvaluateInfoList) -> { | 
					 | 
					 | 
					            groupByGrid.forEach((gridId,projectEvaluateInfoList) -> { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                Map<String,Integer> scoreMap = new HashMap<>(16); | 
					 | 
					 | 
					                projectEvaluateInfoList.forEach(p -> { | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                // 根据项目分组
 | 
					 | 
					 | 
					                    switch (p.getActionCode()) { | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                Map<String, List<ProjectEvaluateResultDTO>> groupByProject = projectEvaluateInfoList.stream().collect(Collectors.groupingBy(ProjectEvaluateResultDTO::getProjectId)); | 
					 | 
					 | 
					                        case ExtractConstant.EVALUATE_BAD: | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                groupByProject.forEach((projectId,projectList) -> { | 
					 | 
					 | 
					                            p.setScore(ProjectEvaluateConstant.BAD); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                    projectList.forEach(project -> { | 
					 | 
					 | 
					                            break; | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                        switch (project.getActionCode()) { | 
					 | 
					 | 
					                        case ExtractConstant.EVALUATE_GOOD: | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                            case ExtractConstant.EVALUATE_BAD: | 
					 | 
					 | 
					                            p.setScore(ProjectEvaluateConstant.GOOD); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                                project.setScore(ProjectEvaluateConstant.BAD); | 
					 | 
					 | 
					                            break; | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                                break; | 
					 | 
					 | 
					                        case ExtractConstant.EVALUATE_PERFECT: | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                            case ExtractConstant.EVALUATE_GOOD: | 
					 | 
					 | 
					                            p.setScore(ProjectEvaluateConstant.PERFECT); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                                project.setScore(ProjectEvaluateConstant.GOOD); | 
					 | 
					 | 
					                            break; | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                                break; | 
					 | 
					 | 
					                        default: | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                            case ExtractConstant.EVALUATE_PERFECT: | 
					 | 
					 | 
					                            log.warn("calGridIndexGovernAbility other projectEvaluate,actionCode:{}", p.getActionCode()); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                                project.setScore(ProjectEvaluateConstant.PERFECT); | 
					 | 
					 | 
					                    } | 
				
			
			
				
				
			
		
	
		
		
			
				
					 | 
					 | 
					                                break; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            default: | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                                log.warn("calGridIndexGovernAbility other projectEvaluate,actionCode:{}", project.getActionCode()); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        } | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    }); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    Integer projectAllScore = projectList.stream().mapToInt(ProjectEvaluateResultDTO::getScore).sum(); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    scoreMap.put(projectId,projectAllScore/projectList.size()); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                }); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                AtomicReference<Integer> allScore = new AtomicReference<>(0); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                scoreMap.forEach((k,v) -> { | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    allScore.set(++v); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                }); | 
					 | 
					 | 
					                }); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                resultSatisfactionScore.put(gridId,getRound(new BigDecimal(allScore.get()/scoreMap.size()))); | 
					 | 
					 | 
					                Integer projectAllScore = projectEvaluateInfoList.stream().collect(Collectors.summingInt(ProjectEvaluateResultDTO::getScore)); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                resultSatisfactionScore.put(gridId,getRound(new BigDecimal(projectAllScore/projectEvaluateInfoList.size()))); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            }); | 
					 | 
					 | 
					            }); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        String quarterId = DateUtils.getQuarterId(monthId); | 
					 | 
					 | 
					        String quarterId = DateUtils.getQuarterId(monthId); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |