| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -583,15 +583,6 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            return null; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        // 事件分类
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        IcEventCategoryEntity eventCategory = icEventCategoryService.getByEventId(eventId); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        // 分类字典
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        IssueProjectCategoryDictDTO categoryDictItem = getResultDataOrThrowsException(govIssueOpenFeignClient.getByCategoryCode(eventCategory.getCategoryCode()), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                ServiceConstant.GOV_ISSUE_SERVER, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                EpmetErrorCode.SERVER_ERROR.getCode(), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                "【事件研判分析】查询分类字典失败", | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                "【事件研判分析】查询分类字典失败"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        // 上报人信息
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        IcEventYpAnalysisResultDTO r = new IcEventYpAnalysisResultDTO(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        String idCard = event.getIdCard(); | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -617,12 +608,24 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        r.setReportorName(event.getName()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        r.setSourceTypeName(sourceTypeMap.get(event.getSourceType())); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        r.setDependents(dependents); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        r.setCategoryCode(categoryDictItem.getParentCategoryCode()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        r.setCategoryPids(eventCategory.getCategoryPids()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        r.setReportorMobile(event.getMobile()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        r.setReportorIdCard(idCard); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        r.setResiReportEventCount(resiReportEventCount); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        // 事件分类
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        IcEventCategoryEntity eventCategory = icEventCategoryService.getByEventId(eventId); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        // 有的事件刚创建,可能没有分类
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        if (eventCategory != null) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            // 分类字典
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            IssueProjectCategoryDictDTO categoryDictItem = getResultDataOrThrowsException(govIssueOpenFeignClient.getByCategoryCode(eventCategory.getCategoryCode()), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    ServiceConstant.GOV_ISSUE_SERVER, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    EpmetErrorCode.SERVER_ERROR.getCode(), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    "【事件研判分析】查询分类字典失败", | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    "【事件研判分析】查询分类字典失败"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            r.setCategoryCode(categoryDictItem.getParentCategoryCode()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            r.setCategoryPids(eventCategory.getCategoryPids()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            r.setCategoryName(categoryDictItem.getParentCategoryName()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |