From 7154a6ddcf8f9bc71622642d3138db69a3dc781d Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 7 Sep 2021 15:05:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E4=BB=BB=E5=8A=A1=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ccsens/common/bean/vo/CTaskVo.java | 3 ++- .../main/java/com/ccsens/common/service/TaskService.java | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/ccsens/common/bean/vo/CTaskVo.java b/common/src/main/java/com/ccsens/common/bean/vo/CTaskVo.java index b8bf30c3..8fc08755 100644 --- a/common/src/main/java/com/ccsens/common/bean/vo/CTaskVo.java +++ b/common/src/main/java/com/ccsens/common/bean/vo/CTaskVo.java @@ -141,7 +141,8 @@ public class CTaskVo { private Long realEndTime; @ApiModelProperty("任务完成状态 0未开始 1进行中 2暂停 3完成") private Byte taskStatus; - + @ApiModelProperty("检查人列表") + private List checkerList; } diff --git a/common/src/main/java/com/ccsens/common/service/TaskService.java b/common/src/main/java/com/ccsens/common/service/TaskService.java index caa8bf00..f395a381 100644 --- a/common/src/main/java/com/ccsens/common/service/TaskService.java +++ b/common/src/main/java/com/ccsens/common/service/TaskService.java @@ -620,7 +620,14 @@ public class TaskService implements ITaskService { if (ObjectUtil.isNull(proTaskDetail)) { throw new BaseException(CommonCodeError.NOT_TASK); } - return taskDetailDao.findSonTask(param); + List sonTask = taskDetailDao.findSonTask(param); + if (CollectionUtil.isNotEmpty(sonTask)) { + for (CTaskVo.SonTaskDetail sonTaskDetail : sonTask) { + List checkerOfTasks = roleTaskDao.queryCheckerOfTask(sonTaskDetail.getDetailId()); + sonTaskDetail.setCheckerList(checkerOfTasks); + } + } + return sonTask; } @Override