From e39db9ad02f8226a0b75c0b1c1d3aa876d618620 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 6 Apr 2021 17:19:24 +0800 Subject: [PATCH] =?UTF-8?q?20210406=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/tall/bean/dto/TaskDto.java | 2 +- .../java/com/ccsens/tall/bean/vo/RoleVo.java | 1 - .../ccsens/tall/service/InputDocService.java | 19 +++++++++++++++++-- tall/src/main/resources/application.yml | 4 ++-- .../resources/mapper_dao/IInputDocDao.xml | 5 ++--- .../resources/mapper_dao/TaskDetailDao.xml | 2 +- 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java index c4474a31..115ec1fc 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java +++ b/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天") diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java index e28a5382..81364a5c 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java +++ b/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; diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java index ddbb6b89..c70fabd6 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/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; @@ -51,7 +53,10 @@ public class InputDocService implements IInputDocService { private ProTaskInputDocMapper proTaskInputDocMapper; @Resource private Snowflake snowflake; - + @Resource + private TaskDetailDao taskDetailDao; + @Resource + private TaskSubTimeDao taskSubTimeDao; @Override @@ -171,7 +176,17 @@ public class InputDocService implements IInputDocService { */ @Override public List findDocByTask(InputDocDto.FindDocByTask param) { - List 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 docByTasks = iInputDocDao.findDocByTask(taskDetail.getId()); for (InputDocVo.DocOfTask docs:docByTasks){ for (InputDocVo.Record record:docs.getRecords()){ if(ObjectUtil.isNotNull(record.getFileIds())) { diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common diff --git a/tall/src/main/resources/mapper_dao/IInputDocDao.xml b/tall/src/main/resources/mapper_dao/IInputDocDao.xml index 367191cb..560b5867 100644 --- a/tall/src/main/resources/mapper_dao/IInputDocDao.xml +++ b/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 +