|
@@ -11903,41 +11903,7 @@ public class TaskManagerImpl implements ITaskManager {
|
|
t.setEndDate(endTime);
|
|
t.setEndDate(endTime);
|
|
Date endDate = endTime;
|
|
Date endDate = endTime;
|
|
updateTaskSummary(t);
|
|
updateTaskSummary(t);
|
|
- //需要将事项最后一个阶段时间自动修改至事项完成时间才对
|
|
|
|
- List<TaskPhase> phaseList=findTaskPhaseByTaskId(taskId);
|
|
|
|
- if(CollectionUtil.isNotEmpty(phaseList)){
|
|
|
|
- TaskPhase phase=phaseList.get(phaseList.size()-1);
|
|
|
|
- phase.setEndDate(endDate);
|
|
|
|
- //相关数据修改
|
|
|
|
- Criterion cr=Restrictions.eq("taskId",taskId);
|
|
|
|
- cr=Restrictions.and(cr, Restrictions.eq("phaseId",phase.getId()));
|
|
|
|
- List<TaskMemberPhase> memberPhases=AppContext.getBean(ITaskMemberDao.class).findTaskMemberPhaseByTaskIdAndType(cr);
|
|
|
|
- if(CollectionUtil.isNotEmpty(memberPhases)){
|
|
|
|
- for(TaskMemberPhase tmp:memberPhases){
|
|
|
|
- tmp.setEndDate(endDate);
|
|
|
|
- saveOrUpdateAll(Arrays.asList(tmp));
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- List<TaskMemberPhaseReportConfig> tmpsList=findTaskMemberPhaseReportConfigByTaskIdAndPhaseId(new Long[]{phase.getId()},taskId);
|
|
|
|
- if(CollectionUtil.isNotEmpty(tmpsList)){
|
|
|
|
- for(TaskMemberPhaseReportConfig c:tmpsList){
|
|
|
|
- c.setEndDate(endTime);
|
|
|
|
- saveOrUpdateAll(Arrays.asList(c));
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- //这张表里面的最后一个阶段时间也要自动修改至事项完成时间
|
|
|
|
- List<TaskPhaseReportConfig> taskPhaseReportConfig = findTaskPhaseReportConfigByPhaseId(phase.getId());
|
|
|
|
- if (CollectionUtil.isNotEmpty(taskPhaseReportConfig)) {
|
|
|
|
- for (TaskPhaseReportConfig c : taskPhaseReportConfig) {
|
|
|
|
- c.setTime(endDate);
|
|
|
|
- c.setConfigName(DateUtil.monthAndDayByDate(endTime)+"前完成");
|
|
|
|
- saveOrUpdateAll(Arrays.asList(c));
|
|
|
|
- }
|
|
|
|
- saveOrUpdateAll(Arrays.asList(phase));
|
|
|
|
- }
|
|
|
|
- saveOrUpdateAll(Arrays.asList(phase));
|
|
|
|
- }
|
|
|
|
|
|
+ updateTaskPhaseEndDate(taskId, endDate);
|
|
if (!isSys) {
|
|
if (!isSys) {
|
|
// 行为
|
|
// 行为
|
|
|
|
|
|
@@ -11969,6 +11935,46 @@ public class TaskManagerImpl implements ITaskManager {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public void updateTaskPhaseEndDate(Long taskId, Date endDate){
|
|
|
|
+ //需要将事项最后一个阶段时间自动修改至事项完成时间才对
|
|
|
|
+ List<TaskPhase> phaseList=findTaskPhaseByTaskId(taskId);
|
|
|
|
+ if(CollectionUtil.isNotEmpty(phaseList)){
|
|
|
|
+ TaskPhase phase=phaseList.get(phaseList.size()-1);
|
|
|
|
+ phase.setEndDate(endDate);
|
|
|
|
+ //相关数据修改
|
|
|
|
+ Criterion cr=Restrictions.eq("taskId", taskId);
|
|
|
|
+ cr=Restrictions.and(cr, Restrictions.eq("phaseId",phase.getId()));
|
|
|
|
+ List<TaskMemberPhase> memberPhases=AppContext.getBean(ITaskMemberDao.class).findTaskMemberPhaseByTaskIdAndType(cr);
|
|
|
|
+ if(CollectionUtil.isNotEmpty(memberPhases)){
|
|
|
|
+ for(TaskMemberPhase tmp:memberPhases){
|
|
|
|
+ tmp.setEndDate(endDate);
|
|
|
|
+ saveOrUpdateAll(Arrays.asList(tmp));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ List<TaskMemberPhaseReportConfig> tmpsList=findTaskMemberPhaseReportConfigByTaskIdAndPhaseId(new Long[]{phase.getId()},
|
|
|
|
+ taskId);
|
|
|
|
+ if(CollectionUtil.isNotEmpty(tmpsList)){
|
|
|
|
+ for(TaskMemberPhaseReportConfig c:tmpsList){
|
|
|
|
+ c.setEndDate(endDate);
|
|
|
|
+ saveOrUpdateAll(Arrays.asList(c));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //这张表里面的最后一个阶段时间也要自动修改至事项完成时间
|
|
|
|
+ List<TaskPhaseReportConfig> taskPhaseReportConfig = findTaskPhaseReportConfigByPhaseId(phase.getId());
|
|
|
|
+ if (CollectionUtil.isNotEmpty(taskPhaseReportConfig)) {
|
|
|
|
+ for (TaskPhaseReportConfig c : taskPhaseReportConfig) {
|
|
|
|
+ c.setTime(endDate);
|
|
|
|
+ c.setConfigName(DateUtil.monthAndDayByDate(endDate)+"前完成");
|
|
|
|
+ saveOrUpdateAll(Arrays.asList(c));
|
|
|
|
+ }
|
|
|
|
+ saveOrUpdateAll(Arrays.asList(phase));
|
|
|
|
+ }
|
|
|
|
+ saveOrUpdateAll(Arrays.asList(phase));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<Map<String,Object>> findAllTaskFileByTaskId(Long taskId) throws BusinessException {
|
|
public List<Map<String,Object>> findAllTaskFileByTaskId(Long taskId) throws BusinessException {
|