20210429v1.2

tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java

@@ -93,6 +93,8 @@ public class TaskVo {
         private String name;
         @ApiModelProperty("详细描述")
         private String description;
+        @ApiModelProperty("父任务id")
+        private Long parentId;
         @ApiModelProperty("父任务名称")
         private String parentName;
         @ApiModelProperty("所属项目id")

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -792,6 +792,16 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     if (ObjectUtil.isNotNull(subTimeId)) {
                         groupTask = taskDetailDao.selectTaskByTaskId(subTimeId, detail.getId(), detail.getExecutorRole());
                         if (ObjectUtil.isNotNull(groupTask)) {
+
+                            ProTaskDetail proTaskDetail = taskDetailDao.selectByPrimaryKey(groupTask.getDetailId());
+                            if(ObjectUtil.isNotNull(proTaskDetail.getParentId())){
+                                groupTask.setParentId(proTaskDetail.getParentId());
+                                ProTaskDetail proTaskDetail1 = taskDetailDao.selectByPrimaryKey(proTaskDetail.getParentId());
+                                groupTask.setParentName(proTaskDetail1.getName());
+                            }else{
+                                groupTask.setParentId(proTaskDetail.getParentId());
+                            }
+
                             //处理查询到的任务的插件
                             managePlugin(currentUserId, task.getExecutorRole(), taskDetail, imitation);
                             //任务的完成状态
@@ -1397,10 +1407,13 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     if (ObjectUtil.isNotNull(updateTaskInfo.getMilestone())) {
                         taskDetail.setMilestone(updateTaskInfo.getMilestone());
                     }
+
+
 //                    //父任务id
 //                    if(null != updateTaskInfo.getParentId()){
 //                        taskDetail.setParentId(updateTaskInfo.getParentId());
 //                    }
+
                     //时间
                     if (ObjectUtil.isNotNull(updateTaskInfo.getBeginTime()) ||
                             ObjectUtil.isNotNull(updateTaskInfo.getEndTime()) ||
@@ -1494,6 +1507,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
                             }
                         });
                     }
+
                     //修改任务所属的项目
                     if (ObjectUtil.isNotNull(updateTaskInfo.getProjectId())) {
                         if (ObjectUtil.isNotNull(updateTaskInfo.getParentId())) {
@@ -1503,10 +1517,9 @@ public class ProTaskDetailService implements IProTaskDetailService {
                             proTaskDetailExample.createCriteria().andIdEqualTo(updateTaskInfo.getParentId()).andProjectIdEqualTo(updateTaskInfo.getProjectId());
                             long l = taskDetailDao.countByExample(proTaskDetailExample);
                             if (l > 0) {
-//                                    throw new BaseException(CodeEnum.NOT_TASK);
                                 taskDetail.setProjectId(updateTaskInfo.getProjectId());
                                 taskDetail.setParentId(updateTaskInfo.getParentId());
-                            } else { //在的话则修改项目信息
+                            } else {
                                 throw new BaseException(CodeEnum.PARENT_PROJECT_NOT_MATCHING);
                             }
                         } else {
@@ -1522,6 +1535,10 @@ public class ProTaskDetailService implements IProTaskDetailService {
                                 proTaskDetail.setParentId(0L);
                                 taskDetailDao.updateByPrimaryKeySelective(proTaskDetail);
                             });
+
+                            for (ProTaskDetail proTaskDetail : proTaskDetailList) {
+                                
+                            }
                         }
                     } else {
                         //父任务id
@@ -1536,6 +1553,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
                         }
 
                     }
+
                     //修改数据
                     taskDetailDao.updateByPrimaryKeySelective(taskDetail);
                     //修改提醒信息
@@ -1770,6 +1788,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
      * 新增和修改交付物
      * @param jiaoFuWu
      */
+
 //    @Override
 //    public void addAndUpdateJiaoFuWu(TaskDto.JiaoFuWu jiaoFuWu) {
 //        ProTaskDeliverExample proTaskDeliverExample=new ProTaskDeliverExample();
@@ -1789,10 +1808,12 @@ public class ProTaskDetailService implements IProTaskDetailService {
 //
 //    }
 
+
     /**
      * 新增和修改输入文档
      * @param jiaoFuWu
      */
+
 //    @Override
 //    public void addAndUpdateShuWuWenDang(TaskDto.JiaoFuWu jiaoFuWu) {
 //        ProTaskInputDocExample proTaskDeliverExample=new ProTaskInputDocExample();

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: greenvalley
+    active: dev
-    include: util-greenvalley,common
+    include: util-dev,common