From 9d9f13c91743ea951beed66f8226c4e8001ed938 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 16 Apr 2021 19:38:30 +0800
Subject: [PATCH] =?UTF-8?q?20210416=E6=9C=80=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ccsens/tall/bean/dto/LwbsDto.java |  4 ++--
 .../main/java/com/ccsens/tall/bean/vo/TaskVo.java   |  4 ++++
 .../com/ccsens/tall/service/TaskSubTimeService.java | 13 ++++++++++---
 tall/src/main/resources/application.yml             |  4 ++--
 .../src/main/resources/mapper_dao/TaskDetailDao.xml |  7 +++++--
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java
index 8e2a9d85..2201bd01 100644
--- a/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java
@@ -37,7 +37,7 @@ public class LwbsDto {
         private Integer priority = 0;
         @ApiModelProperty("任务等级")
         private Byte level=(byte)2;
-        @ApiModelProperty("查询类型(1-我的,2-项目,3-其他)")
-        private Byte queryType;
+        @ApiModelProperty("查询类型(0-我的,1-项目,2-其他)")
+        private Byte queryType = 1;
     }
 }
diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
index 0b6a770a..90e07850 100644
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
@@ -328,6 +328,10 @@ public class TaskVo {
         private Long id;
         @ApiModelProperty("任务名称")
         private String name;
+        @ApiModelProperty("角色id")
+        private Long roleId;
+        @ApiModelProperty("角色名称")
+        private String roleName;
     }
 
     @Data
diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
index 3a962986..e2c01af2 100644
--- a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
@@ -389,7 +389,14 @@ public class TaskSubTimeService implements ITaskSubTimeService {
         }
 
         if (ObjectUtil.isNotNull(addTask.getParentTaskId())) {
-            ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(addTask.getParentTaskId());
+            ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(addTask.getParentTaskId());
+            ProTaskDetail taskDetail;
+            if(ObjectUtil.isNotNull(proTaskSubTime)){
+                taskDetail = taskDetailDao.selectByPrimaryKey(proTaskSubTime.getTaskDetailId());
+            }else {
+                taskDetail = taskDetailDao.selectByPrimaryKey(addTask.getParentTaskId());
+            }
+
             if (ObjectUtil.isNotNull(taskDetail)) {
                 detail.setProjectId(taskDetail.getProjectId());
                 detail.setParentId(taskDetail.getId());
@@ -464,7 +471,7 @@ public class TaskSubTimeService implements ITaskSubTimeService {
 //            taskDeliverDao.insertSelective(deliver);
 //        }
         //交付物列表的增加
-        if(addTask.getTaskDeliver().size()>0){
+        if(CollectionUtil.isNotEmpty(addTask.getTaskDeliver())){
             addTask.getTaskDeliver().forEach(action->{
                 if(StringUtils.isNotBlank(action)) {
                     ProTaskDeliver deliver = new ProTaskDeliver();
@@ -477,7 +484,7 @@ public class TaskSubTimeService implements ITaskSubTimeService {
             });
         }
         //输入文档的增加
-        if(addTask.getInputDoc().size()>0){
+        if(CollectionUtil.isNotEmpty(addTask.getInputDoc())){
             addTask.getInputDoc().forEach(action->{
                 if(StringUtils.isNotBlank(action)) {
                     ProTaskInputDoc proTaskInputDoc = new ProTaskInputDoc();
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index b5408a3a..ebc544af 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common
 
diff --git a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
index b13e2015..53b985b5 100644
--- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
+++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
@@ -342,9 +342,12 @@
         s.end_time &lt;= #{endTime}
     </select>
 
-    <select id="selectTaskByKey" parameterType="java.util.Map" resultMap="taskDetailByKey">
+    <select id="selectTaskByKey" parameterType="java.util.Map" resultType="com.ccsens.tall.bean.vo.TaskVo$TaskDetailByKey">
       SELECT
-        *
+        t.id,
+        t.`name`,
+        t.executor_role as roleId,
+        (select `name` from t_pro_role where id = t.executor_role) as roleName
       FROM
         t_pro_task_detail t join t_sys_project s on t.project_id = s.id JOIN t_sys_user_attention a on s.id = a.project_id
       WHERE