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

# Conflicts:
#	tall/src/main/java/com/ccsens/tall/service/InputDocService.java

tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java

@@ -86,7 +86,7 @@ public class TaskDto {
     @ApiModel("添加时设置任务提醒")
     public static class TaskRemindByAdd{
         @ApiModelProperty("提醒时机 0不提醒 1开始前，2开始时，3开始后，4结束前，5结束时，6结束后，7自定义时间")
-        private Byte remindTiming;
+        private Byte remindTiming = 0;
         @ApiModelProperty("时长 提醒时机是“开始时”或“结束时”可以为空")
         private Long duration = 0L;
         @ApiModelProperty("时间单位 0分钟 1小时 2天")

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

@@ -1,6 +1,5 @@
 package com.ccsens.tall.bean.vo;
 
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -18,6 +18,8 @@ import com.ccsens.tall.bean.vo.InputDocVo;
 import com.ccsens.tall.bean.vo.LwbsVo;
 import com.ccsens.tall.bean.vo.TaskVo;
 import com.ccsens.tall.persist.dao.IInputDocDao;
+import com.ccsens.tall.persist.dao.TaskDetailDao;
+import com.ccsens.tall.persist.dao.TaskSubTimeDao;
 import com.ccsens.tall.persist.mapper.*;
 
 import com.ccsens.tall.util.TaskUtil;
@@ -52,6 +54,10 @@ public class InputDocService implements IInputDocService {
     @Resource
     private Snowflake snowflake;
     @Resource
+    private TaskDetailDao taskDetailDao;
+    @Resource
+    private TaskSubTimeDao taskSubTimeDao;
+    @Resource
     private RobotService robotService;
     @Resource
     private ProTaskDetailMapper proTaskDetailMapper;
@@ -175,7 +181,17 @@ public class InputDocService implements IInputDocService {
      */
     @Override
     public List<InputDocVo.DocOfTask> findDocByTask(InputDocDto.FindDocByTask param) {
-        List<InputDocVo.DocOfTask> docByTasks = iInputDocDao.findDocByTask(param.getTaskId());
+        //查询任务分解后
+        ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(param.getTaskId());
+        if(ObjectUtil.isNull(proTaskSubTime)){
+            throw new BaseException(CodeEnum.NOT_TASK);
+        }
+        //查询任务详情
+        ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(proTaskSubTime.getTaskDetailId());
+        if(ObjectUtil.isNull(taskDetail)){
+            throw new BaseException(CodeEnum.NOT_TASK);
+        }
+        List<InputDocVo.DocOfTask> docByTasks = iInputDocDao.findDocByTask(taskDetail.getId());
         for (InputDocVo.DocOfTask docs:docByTasks){
             for (InputDocVo.Record record:docs.getRecords()){
                 if(ObjectUtil.isNotNull(record.getFileIds())) {

tall/src/main/resources/application.yml

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

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

@@ -159,12 +159,11 @@
             tir.remark AS remark
         FROM
             t_pro_task_input_doc AS tid
-        LEFT JOIN t_pro_task_input_record AS tir ON tid.id = tir.input_doc_id
+        LEFT JOIN t_pro_task_input_record AS tir ON tid.id = tir.input_doc_id and tir.rec_status = 0
         WHERE
             tid.task_detail_id = #{taskId}
-        AND tid.is_upload = 1
         AND tid.rec_status = 0
-        AND tir.rec_status = 0
+
     </select>
 
     <select id="viewDocHistory" resultType="com.ccsens.tall.bean.vo.InputDocVo$HistoryRecord">

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

@@ -124,7 +124,7 @@
             s.end_time > #{startTime}
         </if>
         AND
-        d.Level in (2,3)
+        d.Level &gt; 1
         AND
         d.has_group = 0
         AND