|  | @ -186,7 +186,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
			
		
	
		
		
			
				
					|  |  | 			if (ProjectConstant.CLOSED.equals(p.getStatus())) { |  |  | 			if (ProjectConstant.CLOSED.equals(p.getStatus())) { | 
			
		
	
		
		
			
				
					|  |  | 				created.setDepartmentNameList(departmentNameList); |  |  | 				created.setDepartmentNameList(departmentNameList); | 
			
		
	
		
		
			
				
					|  |  | 				created.setWarningFlag(false); |  |  | 				created.setWarningFlag(false); | 
			
		
	
		
		
			
				
					
					|  |  | 				created.setDetentionDays("0"); |  |  | 				created.setDetentionDays(NumConstant.ZERO_STR); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					|  |  | 			} else { |  |  | 			} else { | 
			
		
	
		
		
			
				
					|  |  | 				String detentionDays = getDetentionDays(p); |  |  | 				String detentionDays = getDetentionDays(p); | 
			
		
	
		
		
			
				
					|  |  | 				if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) { |  |  | 				if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) { | 
			
		
	
	
		
		
			
				
					|  | @ -229,7 +229,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
			
		
	
		
		
			
				
					|  |  | 			if (ProjectConstant.CLOSED.equals(p.getStatus())) { |  |  | 			if (ProjectConstant.CLOSED.equals(p.getStatus())) { | 
			
		
	
		
		
			
				
					|  |  | 				involved.setDepartmentNameList(departmentNameList); |  |  | 				involved.setDepartmentNameList(departmentNameList); | 
			
		
	
		
		
			
				
					|  |  | 				involved.setWarningFlag(false); |  |  | 				involved.setWarningFlag(false); | 
			
		
	
		
		
			
				
					
					|  |  | 				involved.setDetentionDays("0"); |  |  | 				involved.setDetentionDays(NumConstant.ZERO_STR); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					|  |  | 			} else { |  |  | 			} else { | 
			
		
	
		
		
			
				
					|  |  | 				String detentionDays = getDetentionDays(p); |  |  | 				String detentionDays = getDetentionDays(p); | 
			
		
	
		
		
			
				
					|  |  | 				if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) { |  |  | 				if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) { | 
			
		
	
	
		
		
			
				
					|  | @ -258,7 +258,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
			
		
	
		
		
			
				
					|  |  | 			projectStaffDTO.setProjectId(fromDTO.getProjectId()); |  |  | 			projectStaffDTO.setProjectId(fromDTO.getProjectId()); | 
			
		
	
		
		
			
				
					|  |  | 			projectStaffDTO.setStaffId(fromDTO.getUserId()); |  |  | 			projectStaffDTO.setStaffId(fromDTO.getUserId()); | 
			
		
	
		
		
			
				
					|  |  | 			List<DepartmentResultDTO> departmentList = projectStaffService.getDepartmentNameList(projectStaffDTO); |  |  | 			List<DepartmentResultDTO> departmentList = projectStaffService.getDepartmentNameList(projectStaffDTO); | 
			
		
	
		
		
			
				
					
					|  |  | 			if (null != departmentList && departmentList.size() > 0) { |  |  | 			if (null != departmentList && departmentList.size() > NumConstant.ZERO) { | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					|  |  | 				resultDTO.setProcessable(true); |  |  | 				resultDTO.setProcessable(true); | 
			
		
	
		
		
			
				
					|  |  | 			} else { |  |  | 			} else { | 
			
		
	
		
		
			
				
					|  |  | 				resultDTO.setProcessable(false); |  |  | 				resultDTO.setProcessable(false); | 
			
		
	
	
		
		
			
				
					|  | @ -404,7 +404,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
			
		
	
		
		
			
				
					|  |  | 		workDayFormDTO.setEndDate(format.format(new Date())); |  |  | 		workDayFormDTO.setEndDate(format.format(new Date())); | 
			
		
	
		
		
			
				
					|  |  | 		list.add(workDayFormDTO); |  |  | 		list.add(workDayFormDTO); | 
			
		
	
		
		
			
				
					|  |  | 		Result<List<WorkDayResultDTO>> detentionDays = commonFeignClient.detentionDays(list); |  |  | 		Result<List<WorkDayResultDTO>> detentionDays = commonFeignClient.detentionDays(list); | 
			
		
	
		
		
			
				
					
					|  |  | 		return detentionDays.getData().get(0).getDetentionDays(); |  |  | 		return detentionDays.getData().get(NumConstant.ZERO).getDetentionDays(); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					|  |  | 	} |  |  | 	} | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  | 	/** |  |  | 	/** | 
			
		
	
	
		
		
			
				
					|  | 
 |