From 8b4a821dc9f3b26f3dbd7eb649bd698fb739c645 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 9 Dec 2020 17:09:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/modules/job/business/DingtalkBusiness.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 6c2d0bd6..4bb551bf 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -645,6 +645,9 @@ public class DingtalkBusiness { return "error"; } + public String sendTaskNoticeMsg(Long detailId, Long taskId) { + return "OK"; + } public String sendNoticeMsg(ResultRecord lzResultRecord, List staffs) { ThirdAppConfig thirdAppConfig = thirdAppConfigService.getByAppId(appid); From d6c1a0f9c3e9a18d15f89c7de54d736eed3d7203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 9 Dec 2020 17:16:33 +0800 Subject: [PATCH 2/2] fix --- .../impl/TaskProcessRecordServiceImpl.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java index 30bfd385..640d9faa 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -2,10 +2,18 @@ package com.lz.modules.performance.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.utils.PageUtils; +import com.lz.modules.app.entity.StaffEntity; +import com.lz.modules.app.service.StaffService; import com.lz.modules.performance.dao.TaskProcessRecordMapper; +import com.lz.modules.performance.dto.TaskProcessRecordDto; +import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.req.ChangeTaskListReq; +import com.lz.modules.performance.service.ResultTaskService; import com.lz.modules.performance.service.TaskProcessRecordService; +import com.lz.modules.sys.entity.app.ResultDetail; +import com.lz.modules.sys.service.app.ResultDetailService; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,6 +35,15 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId()) ); + List list = pageUtils.getList(); + if(CollectionUtils.isNotEmpty(list)){ + Long taskId = req.getTaskId(); + ResultTask resultTask = resultTaskService.selectResultTaskById(taskId); + ResultDetail resultDetail = resultDetailService.selectResultDetailById(resultTask.getDetailId()); + StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId()); + List dtos = list; + for(TaskProcessRecordDto dto:dtos){ + dto.setAvatar(staffEntity.getAvatar()); + dto.setStaffName(staffEntity.getName()); + } + } return pageUtils; }