From 5b2853dcaa133e12ecf05e32387c0ee262db327c Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Mon, 21 Dec 2020 16:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/app/impl/ResultRecordServiceImpl.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 81645537..6f98d401 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -25,12 +25,14 @@ import com.lz.modules.app.service.DepartmentsService;
 import com.lz.modules.app.service.DepartmentsStaffRelateService;
 import com.lz.modules.app.service.StaffService;
 import com.lz.modules.app.utils.t.TwoTuple;
+import com.lz.modules.flow.dao.FlowRecordMapper;
 import com.lz.modules.flow.entity.*;
 import com.lz.modules.flow.enums.FlowRecordEnum;
 import com.lz.modules.flow.model.*;
 import com.lz.modules.flow.service.*;
 import com.lz.modules.job.business.DingtalkBusiness;
 import com.lz.modules.performance.dto.ResultTaskDto;
+import com.lz.modules.performance.dto.TaskListDto;
 import com.lz.modules.performance.req.OwnResultReq;
 import com.lz.modules.performance.req.ResultUpdateTaskReq;
 import com.lz.modules.performance.res.ChartStatistical;
@@ -107,6 +109,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     @Autowired
     private FlowRecordService flowRecordService;
 
+    @Autowired
+    private FlowRecordMapper flowRecordMapper;
 
     @Autowired
     private StaffRoleDepartmentService staffRoleDepartmentService;
@@ -900,6 +904,14 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             commentId = comment(approvalDto, flowChart);
         }
         R r = apply(approvalDto);
+        if (approvalDto.getLoginUserId() != null) {
+            List<TaskListDto> taskListDtos = flowRecordMapper.selectTodoTasksByApprovalStaffId(approvalDto.getLoginUserId(), null);
+            if (taskListDtos != null && taskListDtos.size() > 0) {
+                TaskListDto taskListDto = taskListDtos.get(0);
+                r.put("resultRecordId", taskListDto.getRecordId());
+            }
+        }
+        r.put("waitTime", 3);
         return r.put("commentId",commentId);
     }