Merge branch 'sd' of dd.tall.wiki:ccsens_wiki/ccsenscloud into sd

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

@@ -57,6 +57,8 @@ public class TaskVo {
         private int delay;
         @ApiModelProperty("状态：0-未开始，1-进行中，2-已完成")
         private int process;
+        @ApiModelProperty("子任务")
+        private List<GlobalTask> secondTasks;
 
         @ApiModelProperty("页面/接口路径")
         private String webPath;

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

@@ -311,6 +311,48 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     normalTask.setShowShortcuts(1);
                     normalTask.setCreateTask(1);
                 }
+
+                //子任务
+                List<TaskVo.NormalTask> secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectId, normalTask.getDetailId(), startTime, endTime,roleId);
+                if (CollectionUtil.isNotEmpty(secondNormalTaskList)) {
+                    for (TaskVo.NormalTask task : secondNormalTaskList) {
+                        //处理插件
+//                        managePlugin(currentUserId,roleId,task);
+                        //二级任务完成状态
+//                        ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, task.getId());
+//                        if (ObjectUtil.isNotNull(subTimeMember)) {
+//                            task.setRealEndTime(subTimeMember.getRealFinishTime());
+//                            task.setProcess(subTimeMember.getComplatedStatus());
+//                        }
+                        if(ObjectUtil.isNotNull(proShow)){
+                            task.setShowShortcuts(proShow.getShowShortcuts());
+                            task.setCreateTask(proShow.getCreateTask());
+                            task.setShowTimeFormat(proShow.getShowTimeFormat());
+                            if(proShow.getDuration() == 1){
+                                task.setDuration(null);
+                                task.setShowTimeFormat(null);
+                            }
+                        }else {
+                            task.setShowTimeFormat("MM-dd HH:mm");
+                            task.setShowShortcuts(1);
+                            task.setCreateTask(1);
+                        }
+                    }
+                    normalTask.setSecondTasks(secondNormalTaskList);
+//                    TaskUtil.Task task = TaskUtil.splitTask(secondNormalTaskList, startTime, endTime, process);
+//                    if (CollectionUtil.isNotEmpty(task.getGlobalTask())) {
+//                        for (TaskVo.NormalTask global : task.getGlobalTask()) {
+//                            globalTask = new TaskVo.GlobalTask();
+//                            BeanUtil.copyProperties(global, globalTask);
+//                            globalTaskList.add(globalTask);
+//                        }
+//                    }
+//                    if (CollectionUtil.isNotEmpty(task.getCommonTask())) {
+//                        normalTask.setSecondTasks(new ArrayList<>());
+//                        normalTask.getSecondTasks().addAll(task.getCommonTask());
+//                    }
+                }
+
             }
             TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList, startTime, endTime, process);
             if (CollectionUtil.isNotEmpty(task.getGlobalTask())) {
@@ -323,6 +365,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
             if (CollectionUtil.isNotEmpty(task.getCommonTask())) {
                 normalTaskList = sortTaskTime(task.getCommonTask());
             }
+
         }
 
         //2.业务层分页

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common

tall/src/main/resources/mapper_dao/TaskDetailDao.xml

@@ -103,7 +103,7 @@
         </if>
 
 		AND
-          d.Level in (2,3)
+          d.Level in (2)
         AND
           d.has_group = 0
         AND