| 
						
						
							
								
							
						
						
					 | 
					@ -41,10 +41,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.security.user.LoginUserUtil; | 
					 | 
					 | 
					import com.epmet.commons.tools.security.user.LoginUserUtil; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.*; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.constant.*; | 
					 | 
					 | 
					import com.epmet.constant.*; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					import com.epmet.dao.ProjectDao; | 
					 | 
					 | 
					import com.epmet.dao.*; | 
				
			
			
				
				
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dao.ProjectOrgRelationDao; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dao.ProjectSatisfactionDetailDao; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dao.ProjectSatisfactionStatisticsDao; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.*; | 
					 | 
					 | 
					import com.epmet.dto.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.form.*; | 
					 | 
					 | 
					import com.epmet.dto.form.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.result.*; | 
					 | 
					 | 
					import com.epmet.dto.result.*; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -157,6 +154,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						private ProjectSatisfactionDetailDao satisfactionDetailDao; | 
					 | 
					 | 
						private ProjectSatisfactionDetailDao satisfactionDetailDao; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						@Autowired | 
					 | 
					 | 
						@Autowired | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						private IcEventService icEventService; | 
					 | 
					 | 
						private IcEventService icEventService; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
						@Autowired | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
						private ProjectStaffDao projectStaffDao; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						private final static String ONE_DAY = "<1"; | 
					 | 
					 | 
						private final static String ONE_DAY = "<1"; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -3513,11 +3512,19 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								}  catch (Exception e) { | 
					 | 
					 | 
								}  catch (Exception e) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
									log.warn("获取组织/网格缓存失败"); | 
					 | 
					 | 
									log.warn("获取组织/网格缓存失败"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								} | 
					 | 
					 | 
								} | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					
 | 
					 | 
					 | 
								//图片url拼接
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
								if (!org.springframework.util.CollectionUtils.isEmpty(dto.getUrlList())) { | 
					 | 
					 | 
								if (!org.springframework.util.CollectionUtils.isEmpty(dto.getUrlList())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
									String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList())," <br/> "); | 
					 | 
					 | 
									String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList())," <br/> "); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
									dto.setImageUrl(imageUrl); | 
					 | 
					 | 
									dto.setImageUrl(imageUrl); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								} | 
					 | 
					 | 
								} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
								//判断未结案项目是否涉及需要当前工作人员处理[列表查询需要,导出的不需要这段逻辑]
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
								if (formDTO.getIsPage() && "pending".equals(dto.getStatus())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
									//查询当前工作人员是否存在当前项目的未处理节点
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
									ProjectStaffDTO projectStaff = projectStaffDao.selectLatestByProjectIdAndStaffId(dto.getProjectId(), formDTO.getUserId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
									if (null != projectStaff) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
										dto.setProcessable(true); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
									} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
								} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							return new PageData<>(list, pageInfo.getTotal()); | 
					 | 
					 | 
							return new PageData<>(list, pageInfo.getTotal()); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |