From b16c903f3a09f8170eeedcd239fde8acc99f1d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Thu, 19 Nov 2020 11:32:00 +0800
Subject: [PATCH] ix

---
 .../performance/service/impl/AssessManagerServiceImpl.java | 7 ++++---
 .../com/lz/modules/sys/dao/app/ResultRecordMapper.java     | 2 +-
 src/main/resources/mapper/app/ResultRecordMapper.xml       | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
index 61347731..6662f31f 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
@@ -285,7 +285,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
             Long evaluation = group.getId();
             int i = evaluationStartStaffService.updateBatchToScore(req.getStartId(), group.getId());
             log.info("更新evaluationStartStaff 数据 为已评分 " + i);
-            List<ToScoreDingTalkDto> dtos = resultRecordMapper.selectToScoreList(req.getStartId(), evaluation);
+            List<ResultRecord> dtos = resultRecordMapper.selectToScoreList(req.getStartId(), evaluation);
             if(CollectionUtils.isNotEmpty(dtos)){
                 log.info("本次评分更新操作 num: " + dtos.size());
                 dtos.forEach(dto -> {
@@ -304,8 +304,9 @@ public class AssessManagerServiceImpl implements AssessManagerService {
                     //钉钉通知评分构建
                     StaffSimpleInfo staffSimpleInfo = new StaffSimpleInfo();
                     staffSimpleInfo.setId(dto.getStaffId());
-                    staffSimpleInfo.setRecordId(recordId);
-                    staffSimpleInfo.setStartId(req.getStartId());
+                    staffSimpleInfo.setResultRecord(dto);
+                    FlowStart start = flowStartMapper.selectFlowStartById(req.getStartId());
+                    staffSimpleInfo.setFlowStart(start);
                     toStaffids.add(staffSimpleInfo);
 
                 });
diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
index 9d97e66f..7955fc78 100644
--- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
+++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
@@ -94,7 +94,7 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
 
     int batchDeleteByStartIdAndStaffId(@Param("startId")Long startId,@Param("staffIds") List<String> staffIds);
 
-    List<ToScoreDingTalkDto> selectToScoreList(@Param("startId")Long startId, @Param("evaluationId")Long evaluationId);
+    List<ResultRecord> selectToScoreList(@Param("startId")Long startId, @Param("evaluationId")Long evaluationId);
 
     int countAssessNumJoin(@Param("req")AssessDetailReq req);
 
diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml
index 4084fc0e..fc84d68f 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -580,8 +580,8 @@
         )
     </update>
 
-    <select id="selectToScoreList" resultType="com.lz.modules.performance.dto.ToScoreDingTalkDto">
-        select id,staff_id from lz_result_record  where is_delete = 0
+    <select id="selectToScoreList" resultType="ResultRecord">
+        select * from lz_result_record  where is_delete = 0
         and start_id = #{startId}
         and flow_process = 2
         and evaluation_id = #{evaluationId}