From 39474fd69c703d7cbbbcde40657b2aa7254d828d 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:39:37 +0800
Subject: [PATCH 1/2] fix

---
 .../modules/performance/service/impl/ResultTaskServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
index 208ca3a7..1abe031f 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
@@ -150,7 +150,6 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 	//记录变更记录
 	private int changeTaskProcess(ResultTask before,ResultUpdateTaskReq after){
 		TaskProcessRecord taskProcessRecord = new TaskProcessRecord();
-		taskProcessRecord.setTaskId(before.getId());
 		BeanUtils.copyProperties(after,taskProcessRecord);
 		//新增操作
 		if(before == null){
@@ -158,6 +157,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 			taskProcessRecord.setLabel("新增key Results名称：" + after.getName() + "进度：" + after.getProcessRate());
 			return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
 		}
+		taskProcessRecord.setTaskId(before.getId());
 		//判断修改了名称或进度
 		if(before.getName().equals(after.getName())){
 			if(before.getProcessRate().equals(after.getProcessRate())){

From 82700a091c517675ce604ffe40aa04c902c89e64 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 9 Dec 2020 18:07:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E5=AE=9Ebug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/controller/ResultRecordController.java    | 3 ++-
 .../java/com/lz/modules/job/business/DingtalkBusiness.java   | 1 +
 .../lz/modules/performance/service/ResultTaskService.java    | 1 +
 .../performance/service/impl/ResultTaskServiceImpl.java      | 5 +++++
 src/main/resources/mapper/performance/ResultTaskMapper.xml   | 2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index 94cf0e54..5c4cc508 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -562,7 +562,8 @@ public class ResultRecordController extends AbstractController {
             ) {
                 //下面设置计算公式
                 dto.setCalculate(setCalculateValue(calculateModels1, dto)) ;
-                List<ResultTask> resultTasks = resultTaskService.selectResultTasksByDetailId(dto.getId());
+                List<ResultTaskDto> resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(dto.getId());
+                dto.setTaskDtos(resultTaskDtos);
                 weight = weight.add(dto.getCheckWeight());
                 if(scoreDtos.size() > 0){
                     //获取评分详细
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 4bb551bf..03c8ced1 100644
--- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
+++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
@@ -646,6 +646,7 @@ public class DingtalkBusiness {
     }
 
     public String sendTaskNoticeMsg(Long detailId, Long taskId) {
+
         return "OK";
     }
     public String sendNoticeMsg(ResultRecord lzResultRecord, List<StaffEntity> staffs) {
diff --git a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java
index c1e24370..92b0cb1b 100644
--- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java
+++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java
@@ -44,4 +44,5 @@ public interface ResultTaskService extends IService<ResultTask> {
     List<ResultTask> selectResultTasksByDetailId(Long detailId);
 
     void deleteTask(Long taskId);
+	List<ResultTaskDto> selectResultTaskDtosByDetailId(Long detailId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
index 1abe031f..f142c315 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
@@ -206,4 +206,9 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 		taskProcessRecord.setLabel("将" +resultTask.getName() +  "任务删除");
 		taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord);
 	}
+
+	@Override
+	public List<ResultTaskDto> selectResultTaskDtosByDetailId(Long detailId){
+		return resultTaskMapper.selectResultTaskDtosByDetailId(detailId);
+	}
 }
diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml
index d542f868..5b94ecd5 100644
--- a/src/main/resources/mapper/performance/ResultTaskMapper.xml
+++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml
@@ -93,7 +93,7 @@
     </update>
 
     <select id="selectResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
-        select name,process_rate from lz_result_task  where detail_id=#{detailId} and is_delete = 0 order by order_by asc
+        select id, is_delete, name,process_rate from lz_result_task  where detail_id=#{detailId} and is_delete = 0 order by order_by asc
     </select>
 </mapper>