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

20210428v1.7

recovery
zy_Java 4 years ago
parent
39c9557e04
commit
c057d4fe0a
4 changed files with 120 additions and 108 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. 20
      tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java
  2. 137
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
  3. 2
      tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
  4. 3
      util/src/main/java/com/ccsens/util/CodeEnum.java

20
tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java
View File

@ -56,14 +56,14 @@ public interface IProTaskDetailService {
*/ */
List<TaskVo.TaskListByProjectId> queryAllTaskByProjectId(Long currentUserId, TaskDto.QueryAllTaskByProjectId projectId) throws Exception; List<TaskVo.TaskListByProjectId> queryAllTaskByProjectId(Long currentUserId, TaskDto.QueryAllTaskByProjectId projectId) throws Exception;
/** // /**
* 新增和修改交付物的方法 // * 新增和修改交付物的方法
* @param jiaoFuWu // * @param jiaoFuWu
*/ // */
void addAndUpdateJiaoFuWu(TaskDto.JiaoFuWu jiaoFuWu); // void addAndUpdateJiaoFuWu(TaskDto.JiaoFuWu jiaoFuWu);
/** // /**
* 新增和修改交付物的方法 // * 新增和修改交付物的方法
* @param jiaoFuWu // * @param jiaoFuWu
*/ // */
void addAndUpdateShuWuWenDang(TaskDto.JiaoFuWu jiaoFuWu); // void addAndUpdateShuWuWenDang(TaskDto.JiaoFuWu jiaoFuWu);
} }

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

@ -290,7 +290,6 @@ public class ProTaskDetailService implements IProTaskDetailService {
PageInfo pageInfo = new PageInfo<>(firstTaskDetailList); PageInfo pageInfo = new PageInfo<>(firstTaskDetailList);
if (CollectionUtil.isNotEmpty(firstTaskDetailList)) { if (CollectionUtil.isNotEmpty(firstTaskDetailList)) {
int sequence = 1; int sequence = 1;
for (ProTaskDetail firstTaskDetail : firstTaskDetailList) { for (ProTaskDetail firstTaskDetail : firstTaskDetailList) {
@ -1395,10 +1394,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
if (ObjectUtil.isNotNull(updateTaskInfo.getMilestone())) { if (ObjectUtil.isNotNull(updateTaskInfo.getMilestone())) {
taskDetail.setMilestone(updateTaskInfo.getMilestone()); taskDetail.setMilestone(updateTaskInfo.getMilestone());
} }
//父任务id
if(null != updateTaskInfo.getParentId()){
taskDetail.setParentId(updateTaskInfo.getParentId());
}
//时间 //时间
if (ObjectUtil.isNotNull(updateTaskInfo.getBeginTime()) || if (ObjectUtil.isNotNull(updateTaskInfo.getBeginTime()) ||
ObjectUtil.isNotNull(updateTaskInfo.getEndTime()) || ObjectUtil.isNotNull(updateTaskInfo.getEndTime()) ||
@ -1492,8 +1488,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())) {
//检查父任务在不在移动后的项目下，不在的话提示错误信息 该任务不在该项目下，在的话则修改项目信息 //检查父任务在不在移动后的项目下，不在的话提示错误信息 该任务不在该项目下，在的话则修改项目信息
@ -1502,24 +1497,38 @@ public class ProTaskDetailService implements IProTaskDetailService {
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.setProjectId(updateTaskInfo.getProjectId());
taskDetail.setId(updateTaskInfo.getId());
taskDetail.setParentId(updateTaskInfo.getParentId()); taskDetail.setParentId(updateTaskInfo.getParentId());
} else { //在的话则修改项目信息
throw new BaseException(CodeEnum.PARENT_PROJECT_NOT_MATCHING);
}
} else {
taskDetail.setParentId(0L);
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);
});
} }
//把这个任务当作父任务，如果原来任务下的父任务有值 设置为0，修改项目信息 } else {
//taskDetail = taskDetailDao.selectByPrimaryKey(updateTaskInfo.getId()); //任务详情 //父任务id
if(ObjectUtil.isNotNull(taskDetail.getParentId())){ if (null != updateTaskInfo.getParentId()) {
taskDetail.setParentId(0L); ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
taskDetailDao.updateByPrimaryKeySelective(taskDetail); 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.setId(updateTaskInfo.getId()); taskDetail.setParentId(updateTaskInfo.getParentId());
taskDetail.setProjectId(updateTaskInfo.getProjectId());
taskDetailDao.updateByPrimaryKeySelective(taskDetail);
} }
} }
//修改数据 //修改数据
@ -1752,48 +1761,50 @@ public class ProTaskDetailService implements IProTaskDetailService {
return taskList; return taskList;
} }
/** // /**
* 新增和修改交付物 // * 新增和修改交付物
* @param jiaoFuWu // *
*/ // * @param jiaoFuWu
@Override // */
public void addAndUpdateJiaoFuWu(TaskDto.JiaoFuWu jiaoFuWu) { // @Override
ProTaskDeliverExample proTaskDeliverExample=new ProTaskDeliverExample(); // public void addAndUpdateJiaoFuWu(TaskDto.JiaoFuWu jiaoFuWu) {
ProTaskDeliver proTaskDeliver=new ProTaskDeliver(); // ProTaskDeliverExample proTaskDeliverExample = new ProTaskDeliverExample();
if(jiaoFuWu.getId()!=null && StringUtils.isNotBlank(jiaoFuWu.getNames())){ // ProTaskDeliver proTaskDeliver = new ProTaskDeliver();
//修改 // if (jiaoFuWu.getId() != null && StringUtils.isNotBlank(jiaoFuWu.getNames())) {
proTaskDeliver.setId(jiaoFuWu.getId()); // //修改
proTaskDeliver.setName(jiaoFuWu.getNames()); // proTaskDeliver.setId(jiaoFuWu.getId());
proTaskDeliverExample.createCriteria().andIdEqualTo(jiaoFuWu.getId()).andRecStatusEqualTo((byte) 0); // proTaskDeliver.setName(jiaoFuWu.getNames());
proTaskDeliverMapper.updateByExampleSelective(proTaskDeliver,proTaskDeliverExample); // proTaskDeliverExample.createCriteria().andIdEqualTo(jiaoFuWu.getId()).andRecStatusEqualTo((byte) 0);
}else if(jiaoFuWu.getId()==null && StringUtils.isNotBlank(jiaoFuWu.getNames())) { // proTaskDeliverMapper.updateByExampleSelective(proTaskDeliver, proTaskDeliverExample);
//新增 // } else if (jiaoFuWu.getId() == null && StringUtils.isNotBlank(jiaoFuWu.getNames())) {
proTaskDeliver.setId(snowflake.nextId()); // //新增
proTaskDeliver.setName(jiaoFuWu.getNames()); // proTaskDeliver.setId(snowflake.nextId());
proTaskDeliverMapper.insertSelective(proTaskDeliver); // proTaskDeliver.setName(jiaoFuWu.getNames());
} // proTaskDeliverMapper.insertSelective(proTaskDeliver);
// }
} //
// }
/** //
* 新增和修改输入文档 // /**
* @param jiaoFuWu // * 新增和修改输入文档
*/ // *
@Override // * @param jiaoFuWu
public void addAndUpdateShuWuWenDang(TaskDto.JiaoFuWu jiaoFuWu) { // */
ProTaskInputDocExample proTaskDeliverExample=new ProTaskInputDocExample(); // @Override
ProTaskInputDoc proTaskDeliver=new ProTaskInputDoc(); // public void addAndUpdateShuWuWenDang(TaskDto.JiaoFuWu jiaoFuWu) {
if(jiaoFuWu.getId()!=null && StringUtils.isNotBlank(jiaoFuWu.getNames())){ // ProTaskInputDocExample proTaskDeliverExample = new ProTaskInputDocExample();
//修改 // ProTaskInputDoc proTaskDeliver = new ProTaskInputDoc();
proTaskDeliver.setId(jiaoFuWu.getId()); // if (jiaoFuWu.getId() != null && StringUtils.isNotBlank(jiaoFuWu.getNames())) {
proTaskDeliver.setName(jiaoFuWu.getNames()); // //修改
proTaskDeliverExample.createCriteria().andIdEqualTo(jiaoFuWu.getId()).andRecStatusEqualTo((byte) 0); // proTaskDeliver.setId(jiaoFuWu.getId());
proTaskInputDocDao.updateByExampleSelective(proTaskDeliver,proTaskDeliverExample); // proTaskDeliver.setName(jiaoFuWu.getNames());
}else if(jiaoFuWu.getId()==null && StringUtils.isNotBlank(jiaoFuWu.getNames())) { // proTaskDeliverExample.createCriteria().andIdEqualTo(jiaoFuWu.getId()).andRecStatusEqualTo((byte) 0);
//新增 // proTaskInputDocDao.updateByExampleSelective(proTaskDeliver, proTaskDeliverExample);
proTaskDeliver.setId(snowflake.nextId()); // } else if (jiaoFuWu.getId() == null && StringUtils.isNotBlank(jiaoFuWu.getNames())) {
proTaskDeliver.setName(jiaoFuWu.getNames()); // //新增
proTaskInputDocDao.insertSelective(proTaskDeliver); // proTaskDeliver.setId(snowflake.nextId());
} // proTaskDeliver.setName(jiaoFuWu.getNames());
} // proTaskInputDocDao.insertSelective(proTaskDeliver);
// }
// }
} }

2
tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
View File

@ -1272,7 +1272,7 @@ public class TaskDeliverService implements ITaskDeliverService {
proTaskDeliverExample.createCriteria().andTaskDetailIdEqualTo(taskDetailId).andNameEqualTo(param.getFileName()[i]); proTaskDeliverExample.createCriteria().andTaskDetailIdEqualTo(taskDetailId).andNameEqualTo(param.getFileName()[i]);
long l = taskDeliverDao.countByExample(proTaskDeliverExample); long l = taskDeliverDao.countByExample(proTaskDeliverExample);
if(l>0){ if(l>0){
throw new BaseException(CodeEnum.Deliver_REPEAT); throw new BaseException(CodeEnum.DELIVER_REPEAT);
} }
//添加交付物 //添加交付物
ProTaskDeliver proTaskDeliver = new ProTaskDeliver(); ProTaskDeliver proTaskDeliver = new ProTaskDeliver();

3
util/src/main/java/com/ccsens/util/CodeEnum.java
View File

@ -210,7 +210,8 @@ public enum CodeEnum {
CANNOT_DELETE_PM(170,"无法删除项目经理",true), CANNOT_DELETE_PM(170,"无法删除项目经理",true),
LABEL_TOO_LONG(171,"标签长度过长,请不要超过六个字",true), LABEL_TOO_LONG(171,"标签长度过长,请不要超过六个字",true),
WBS_PROJECT_NAME_REPEAT(172,"项目名称不能重复",true), WBS_PROJECT_NAME_REPEAT(172,"项目名称不能重复",true),
Deliver_REPEAT(173,"交付物已存在",true), DELIVER_REPEAT(173,"交付物已存在",true),
PARENT_PROJECT_NOT_MATCHING(174,"父任务与项目不匹配",true),
; ;

Write Preview
Loading…
Cancel
Save