| 
						
						
							
								
							
						
						
					 | 
					@ -453,10 +453,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							Integer workMinutes = calculateDelta_T(ProjectConstant.PRECISE_CALCULATION, | 
					 | 
					 | 
							Integer workMinutes = calculateDelta_T(ProjectConstant.PRECISE_CALCULATION, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
									ProjectConstant.CALCULATION_TYPE_DEFAULT, fromDTO.getProjectId(), projectEntity.getCreatedTime(), current); | 
					 | 
					 | 
									ProjectConstant.CALCULATION_TYPE_DEFAULT, fromDTO.getProjectId(), projectEntity.getCreatedTime(), current); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
							projectEntity.setStatus(ProjectConstant.CLOSED); | 
					 | 
					 | 
							ProjectEntity newProject = new ProjectEntity(); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
							projectEntity.setClosedStatus(fromDTO.getClosedStatus()); | 
					 | 
					 | 
							newProject.setId(fromDTO.getProjectId()); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
							projectEntity.setWorkMinutes(workMinutes); | 
					 | 
					 | 
							newProject.setStatus(ProjectConstant.CLOSED); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
							baseDao.updateById(projectEntity); | 
					 | 
					 | 
							newProject.setClosedStatus(fromDTO.getClosedStatus()); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							newProject.setWorkMinutes(workMinutes); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							baseDao.updateById(newProject); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							//更新项目关联表
 | 
					 | 
					 | 
							//更新项目关联表
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity(); | 
					 | 
					 | 
							ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							projectStaffEntity.setId(fromDTO.getProjectStaffId()); | 
					 | 
					 | 
							projectStaffEntity.setId(fromDTO.getProjectStaffId()); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -655,10 +657,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							Integer workMinutes = calculateDelta_T(ProjectConstant.PRECISE_CALCULATION, | 
					 | 
					 | 
							Integer workMinutes = calculateDelta_T(ProjectConstant.PRECISE_CALCULATION, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
									ProjectConstant.CALCULATION_TYPE_DEFAULT, fromDTO.getProjectId(), projectEntity.getCreatedTime(), current); | 
					 | 
					 | 
									ProjectConstant.CALCULATION_TYPE_DEFAULT, fromDTO.getProjectId(), projectEntity.getCreatedTime(), current); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
							projectEntity.setStatus(ProjectConstant.CLOSED); | 
					 | 
					 | 
							ProjectEntity newProject = new ProjectEntity(); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
							projectEntity.setClosedStatus(fromDTO.getClosedStatus()); | 
					 | 
					 | 
							newProject.setId(fromDTO.getProjectId()); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
							projectEntity.setWorkMinutes(workMinutes); | 
					 | 
					 | 
							newProject.setStatus(ProjectConstant.CLOSED); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
							baseDao.updateById(projectEntity); | 
					 | 
					 | 
							newProject.setClosedStatus(fromDTO.getClosedStatus()); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							newProject.setWorkMinutes(workMinutes); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							baseDao.updateById(newProject); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							//更新项目关联表
 | 
					 | 
					 | 
							//更新项目关联表
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity(); | 
					 | 
					 | 
							ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							projectStaffEntity.setId(fromDTO.getProjectStaffId()); | 
					 | 
					 | 
							projectStaffEntity.setId(fromDTO.getProjectStaffId()); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |