| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -76,6 +76,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            log.warn("no event data to save table base_conflicts_resolve"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            return; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        log.debug("sql结果" + list); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        List<EventreportPingyinEntity> entityList = list.stream().map(item -> { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            EventreportPingyinEntity entity = new EventreportPingyinEntity(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            entity.setQxBm("370124"); | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -138,6 +139,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            return entity; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        }).collect(Collectors.toList()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        log.debug("数据拼装结果" + entityList); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        //过滤掉必填字段为空的数据
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        entityList = entityList.stream().filter(item -> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                StringUtils.isNotBlank(item.getGridCode()) && StringUtils.isNotBlank(item.getGridName()) && | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |