| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -317,7 +317,6 @@ public class RunMonthServiceImpl extends ServiceImpl<RunMonthMapper, RunMonthEnt | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        // 将设备名称拼接位标准格式
 | 
					 | 
					 | 
					 | 
					        // 将设备名称拼接位标准格式
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        List<RunReportDataAnalyseDTO> analyseDTOList = analyseVOList.stream() | 
					 | 
					 | 
					 | 
					        List<RunReportDataAnalyseDTO> analyseDTOList = analyseVOList.stream() | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                .sorted(Comparator.comparing(RunReportDataAnalyseDTO::getDeviceOrder)) | 
					 | 
					 | 
					 | 
					                .sorted(Comparator.comparing(RunReportDataAnalyseDTO::getDeviceOrder)) | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                .peek(a -> a.setEmName(a.getDeviceOrder() + "#机组")) | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                .collect(Collectors.toList()); | 
					 | 
					 | 
					 | 
					                .collect(Collectors.toList()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        analyseRequest.setAnalyseDTOS(analyseDTOList); | 
					 | 
					 | 
					 | 
					        analyseRequest.setAnalyseDTOS(analyseDTOList); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        dataAnalyseClient.smartReportGeneratePower(analyseRequest); | 
					 | 
					 | 
					 | 
					        dataAnalyseClient.smartReportGeneratePower(analyseRequest); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
  |