From 661f9c6d1e868c89f3516e57d77dbd1281eba8c7 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 18 Dec 2020 10:38:56 +0800
Subject: [PATCH 1/3] =?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

---
 .../java/com/lz/modules/app/dto/ApprovalDto.java   |  1 +
 .../service/app/impl/ResultRecordServiceImpl.java  | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/app/dto/ApprovalDto.java b/src/main/java/com/lz/modules/app/dto/ApprovalDto.java
index 0181ebbe..edc4e6a4 100644
--- a/src/main/java/com/lz/modules/app/dto/ApprovalDto.java
+++ b/src/main/java/com/lz/modules/app/dto/ApprovalDto.java
@@ -13,4 +13,5 @@ public class ApprovalDto {
     private Long flowRecordId;//   流程 id
     private int resetFlag;
     private int clearFlag;//0 全清，1 还是保留指标
+    private Long commentId;
 }
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 ede99e92..809e9ad7 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
@@ -143,6 +143,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     @Autowired
     private ResultScoreService resultScoreService;
 
+
     @Override
     public ResultRecord selectResultRecordById(Long id) {
         return resultRecordMapper.selectResultRecordById(id);
@@ -1066,14 +1067,25 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         StaffEntity staffEntity = staffService.selectStaffById(approvalDto.getLoginUserId());
         if (staffEntity != null) {
             ResultComment resultComment = new ResultComment();
+            if(approvalDto.getCommentId() !=null && approvalDto.getCommentId() > 0 ){
+                log.info("更新前评论commentId=" + approvalDto.getCommentId());
+                resultComment = resultCommentService.selectResultCommentById(approvalDto.getCommentId());
+            }
             resultComment.setComment(approvalDto.getComment());
             resultComment.setStaffName(staffEntity.getName());
             resultComment.setStaffId(staffEntity.getId());
             resultComment.setRecordId(approvalDto.getResultRecordId());
             resultComment.setOptDesc(approvalDto.getMenuName() + flowChart.getName());
-            resultCommentService.insertResultComment(resultComment);
+            if(approvalDto.getCommentId() !=null && approvalDto.getCommentId() > 0 ){
+                resultCommentService.updateResultCommentById(resultComment);
+                log.info("更新后评论commentId=" + resultComment.getId());
+            }else{
+                resultCommentService.insertResultComment(resultComment);
+                log.info("插入后评论commentId=" + resultComment.getId());
+            }
             return resultComment.getId();
         }
+
         return 0l;
     }
 

From fb76d5f9de9c0d5f06d4e68dcaf7aa082a679406 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 18 Dec 2020 10:44:03 +0800
Subject: [PATCH 2/3] =?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

---
 .../sys/service/app/impl/ResultRecordServiceImpl.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 a5a4a070..d73cf7f1 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
@@ -1072,12 +1072,14 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 log.info("更新前评论commentId=" + approvalDto.getCommentId());
                 resultComment = resultCommentService.selectResultCommentById(approvalDto.getCommentId());
             }
-            resultComment.setComment(approvalDto.getComment());
+            String comment = StringUtil.isNotBlank(resultComment.getComment()) ? resultComment.getComment() + "_" : "";
+            String optDesc = StringUtil.isNotBlank(resultComment.getOptDesc()) ? resultComment.getOptDesc() + "_" : "";
+            resultComment.setComment(comment + approvalDto.getComment());
             resultComment.setStaffName(staffEntity.getName());
             resultComment.setStaffId(staffEntity.getId());
             resultComment.setRecordId(approvalDto.getResultRecordId());
-            resultComment.setOptDesc(approvalDto.getMenuName() + flowChart.getName());
-            if(approvalDto.getCommentId() !=null && approvalDto.getCommentId() > 0 ){
+            resultComment.setOptDesc(optDesc + approvalDto.getMenuName() + flowChart.getName());
+            if (approvalDto.getCommentId() !=null && approvalDto.getCommentId() > 0 ){
                 resultCommentService.updateResultCommentById(resultComment);
                 log.info("更新后评论commentId=" + resultComment.getId());
             }else{

From 5979e51b26346b052a68e04edc5ef369af2d6403 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 18 Dec 2020 10:45:05 +0800
Subject: [PATCH 3/3] =?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

---
 .../lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java | 1 -
 1 file changed, 1 deletion(-)

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 d73cf7f1..c5626b7e 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
@@ -1088,7 +1088,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             }
             return resultComment.getId();
         }
-
         return 0l;
     }