| 
						
						
							
								
							
						
						
					 | 
					@ -127,8 +127,6 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if(!CollectionUtils.isEmpty(orientData)) { | 
					 | 
					 | 
							if(!CollectionUtils.isEmpty(orientData)) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								projectIds.addAll(orientData.stream().map(ScreenProjectDataDTO::getProjectId).distinct().collect(Collectors.toList())); | 
					 | 
					 | 
								projectIds.addAll(orientData.stream().map(ScreenProjectDataDTO::getProjectId).distinct().collect(Collectors.toList())); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							projectIds.clear(); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							projectIds.add("18759f2fb5c5fb8513c4a21b0be81834"); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							Map<String, Set<String>> categoryMap = projectService.getProjectCategory(projectIds); | 
					 | 
					 | 
							Map<String, Set<String>> categoryMap = projectService.getProjectCategory(projectIds); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if(!CollectionUtils.isEmpty(categoryMap)){ | 
					 | 
					 | 
							if(!CollectionUtils.isEmpty(categoryMap)){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								Map<String, String> integratedProjectCategoryMap = issueService.getIntegratedProjectCategory(categoryMap, param.getCustomerId()); | 
					 | 
					 | 
								Map<String, String> integratedProjectCategoryMap = issueService.getIntegratedProjectCategory(categoryMap, param.getCustomerId()); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -141,9 +139,6 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
									}); | 
					 | 
					 | 
									}); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								} | 
					 | 
					 | 
								} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if(projectIds.contains("4f670b349899b33c20e888e77842d938")){ | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								return; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							//重新计算orientData的级别 有现成的方法 fact_origin_project_org_period_daily
 | 
					 | 
					 | 
							//重新计算orientData的级别 有现成的方法 fact_origin_project_org_period_daily
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					//		originMainService.computerIfExceed(orientData, exceedLimit,about2ExceedLimit);
 | 
					 | 
					 | 
					//		originMainService.computerIfExceed(orientData, exceedLimit,about2ExceedLimit);
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							//todo 与上面重复处理 暂时注释掉
 | 
					 | 
					 | 
							//todo 与上面重复处理 暂时注释掉
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |