ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

20210428v1.9

recovery
zy_Java 5 years ago
parent
3b11f76a17
commit
586af9fe0d
1 changed files with 42 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

52
tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
View File

@ -1397,10 +1397,10 @@ public class ProTaskDetailService implements IProTaskDetailService {
if (ObjectUtil.isNotNull(updateTaskInfo.getMilestone())) { if (ObjectUtil.isNotNull(updateTaskInfo.getMilestone())) {
taskDetail.setMilestone(updateTaskInfo.getMilestone()); taskDetail.setMilestone(updateTaskInfo.getMilestone());
} }
//父任务id // //父任务id
if(null != updateTaskInfo.getParentId()){ // if(null != updateTaskInfo.getParentId()){
taskDetail.setParentId(updateTaskInfo.getParentId()); // taskDetail.setParentId(updateTaskInfo.getParentId());
} // }
//时间 //时间
if (ObjectUtil.isNotNull(updateTaskInfo.getBeginTime()) || if (ObjectUtil.isNotNull(updateTaskInfo.getBeginTime()) ||
ObjectUtil.isNotNull(updateTaskInfo.getEndTime()) || ObjectUtil.isNotNull(updateTaskInfo.getEndTime()) ||
@ -1494,8 +1494,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
} }
}); });
} }
//修改项目信息 当前的项目 //修改任务所属的项目
if(ObjectUtil.isNotNull(updateTaskInfo.getId())){
if (ObjectUtil.isNotNull(updateTaskInfo.getProjectId())) { if (ObjectUtil.isNotNull(updateTaskInfo.getProjectId())) {
if (ObjectUtil.isNotNull(updateTaskInfo.getParentId())) { if (ObjectUtil.isNotNull(updateTaskInfo.getParentId())) {
//检查父任务在不在移动后的项目下，不在的话提示错误信息 该任务不在该项目下，在的话则修改项目信息 //检查父任务在不在移动后的项目下，不在的话提示错误信息 该任务不在该项目下，在的话则修改项目信息
@ -1503,27 +1502,40 @@ public class ProTaskDetailService implements IProTaskDetailService {
ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample(); ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
proTaskDetailExample.createCriteria().andIdEqualTo(updateTaskInfo.getParentId()).andProjectIdEqualTo(updateTaskInfo.getProjectId()); proTaskDetailExample.createCriteria().andIdEqualTo(updateTaskInfo.getParentId()).andProjectIdEqualTo(updateTaskInfo.getProjectId());
long l = taskDetailDao.countByExample(proTaskDetailExample); long l = taskDetailDao.countByExample(proTaskDetailExample);
if(l <= 0 ){ if (l > 0) {
throw new BaseException(CodeEnum.NOT_TASK); // throw new BaseException(CodeEnum.NOT_TASK);
}else { //在的话则修改项目信息
taskDetail.setId(updateTaskInfo.getId());
taskDetail.setParentId(updateTaskInfo.getParentId());
taskDetail.setProjectId(updateTaskInfo.getProjectId()); taskDetail.setProjectId(updateTaskInfo.getProjectId());
taskDetailDao.updateByPrimaryKeySelective(taskDetail); taskDetail.setParentId(updateTaskInfo.getParentId());
} } else { //在的话则修改项目信息
throw new BaseException(CodeEnum.PARENT_PROJECT_NOT_MATCHING);
} }
//把这个任务当作父任务，如果原来任务下的父任务有值 设置为0，修改项目信息 } else {
//taskDetail = taskDetailDao.selectByPrimaryKey(updateTaskInfo.getId()); //任务详情
if(ObjectUtil.isNotNull(taskDetail.getParentId())){
taskDetail.setParentId(0L); taskDetail.setParentId(0L);
taskDetailDao.updateByPrimaryKeySelective(taskDetail);
}
taskDetail.setId(updateTaskInfo.getId());
taskDetail.setProjectId(updateTaskInfo.getProjectId()); taskDetail.setProjectId(updateTaskInfo.getProjectId());
taskDetailDao.updateByPrimaryKeySelective(taskDetail);
} }
//将此任务以前的子任务的父id改成0
ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
proTaskDetailExample.createCriteria().andParentIdEqualTo(taskDetail.getId());
List<ProTaskDetail> proTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample);
if(CollectionUtil.isNotEmpty(proTaskDetailList)){
proTaskDetailList.forEach(proTaskDetail -> {
proTaskDetail.setParentId(0L);
taskDetailDao.updateByPrimaryKeySelective(proTaskDetail);
});
}
} else {
//父任务id
if (null != updateTaskInfo.getParentId()) {
ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
proTaskDetailExample.createCriteria().andIdEqualTo(updateTaskInfo.getParentId()).andProjectIdEqualTo(taskDetail.getProjectId());
long l = taskDetailDao.countByExample(proTaskDetailExample);
if (l <= 0) {
throw new BaseException(CodeEnum.PARENT_PROJECT_NOT_MATCHING);
}
taskDetail.setParentId(updateTaskInfo.getParentId());
} }
}
//修改数据 //修改数据
taskDetailDao.updateByPrimaryKeySelective(taskDetail); taskDetailDao.updateByPrimaryKeySelective(taskDetail);
//修改提醒信息 //修改提醒信息

Write Preview
Loading…
Cancel
Save