From 56b0188dd9f0f2e388f436e2b00d4f680f5c7d50 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 15 Dec 2020 13:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=B7=9F=E6=96=B0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=97=B6=E9=98=B2=E6=AD=A2=E4=BA=8B=E5=8A=A1=E7=9A=84?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/ResultRecordController.java    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 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 26fe63ac..c7a70ce1 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -802,6 +802,7 @@ public class ResultRecordController extends AbstractController {
                 resultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e));
 
         List<ResultDetail> updateResultDetails = new ArrayList<>();
+        List<ResultDetail> editResultDetails = new ArrayList<>();//涉及到修改的指标保存，方便后面生成修改记录
 
         //获取当前绩效的节点
         boolean isSetKeyResult = false;
@@ -837,11 +838,15 @@ public class ResultRecordController extends AbstractController {
                 BeanUtils.copyProperties(detailDto, resultDetail);
                 if(!isSetKeyResult){
                     if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了
+                        log.info("指标被删除了");
                         resultDetail.setIsBack(2);
                         resultDetail.setBackId(resultDetail.getId());
                         updateResultDetails.add(resultDetail);
+                        editResultDetails.add(resultDetail);
                     }else if(resultDetail.getId() == null){
                         resultDetail.setIsBack(3);//新增
+                        editResultDetails.add(resultDetail);//插入数据库之后会生成id
+                        log.info("新增指标");
                     }else {
                         if(resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){
                             //这里判断是否有更新，或者删除
@@ -852,15 +857,18 @@ public class ResultRecordController extends AbstractController {
 
                             if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){
                                 //打上标识
+                                log.info("修改名称");
                                 isUp = true;
                             }
                             if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
                                 //打上标识
+                                log.info("修改关键结果");
                                 isUp = true;
                             }
 
                             if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
                                 //打上标识
+                                log.info("修改权重");
                                 isUp = true;
                             }
                             if(isUp){
@@ -868,6 +876,7 @@ public class ResultRecordController extends AbstractController {
                                 resultDetail1.setIsBack(2);
                                 resultDetail1.setBackId(resultDetail.getId());
                                 inserts.add(resultDetail1);
+                                editResultDetails.add(resultDetail1);//插入数据库之后会生成id
                             }
                         }
                     }
@@ -968,11 +977,11 @@ public class ResultRecordController extends AbstractController {
 
         if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0){
             //修改评论信息
-            updateResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ;
+            editResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ;
             log.info("可能需要写入评论的内容条数{}", updateResultDetails.size());
             //去重
-            mapDetails = updateResultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e));
-            updateResultDetails = mapDetails.values().stream().collect(Collectors.toList());
+            mapDetails = editResultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e));
+            editResultDetails = mapDetails.values().stream().collect(Collectors.toList());
             if(!isSetKeyResult){
                 log.info("实际需要写入评论的内容条数{}", updateResultDetails.size());
                 if(updateResultDetails.size() > 0){