From 03028ba53bfcd5e8f26daa564d376cf68b430ca0 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 4 Dec 2020 16:44:04 +0800
Subject: [PATCH 1/2] =?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   | 13 ++++++++++---
 1 file changed, 10 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 910a4b25..56386009 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
@@ -884,13 +884,18 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         }
 
         List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(approvalDto.getResultRecordId(), 2);
+        Long commentId = 0l;
         if (CollectionUtils.isNotEmpty(flowRecords)) {
             FlowRecord preFlowRecord = flowRecords.get(0);
             // 评论内容
             FlowChart flowChart = flowService.selectFlowChartByChartId(preFlowRecord.getFlowId());
-            comment(approvalDto, flowChart);
+            commentId = comment(approvalDto, flowChart);
         }
+        R r = apply(approvalDto);
+        return r.put("commentId",commentId);
+    }
 
+    public R apply( ApprovalDto approvalDto){
         switch (approvalDto.getStatus()) {
             case 1: //1 提交审批,审批通过
                 return newSubmit(approvalDto, null);
@@ -920,7 +925,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             default:
                 break;
         }
-        return null;
+        return R.ok();
     }
 
 
@@ -1029,7 +1034,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         return newReject(approvalDto);
     }
 
-    public void comment(ApprovalDto approvalDto, FlowChart flowChart) {
+    public Long comment(ApprovalDto approvalDto, FlowChart flowChart) {
         StaffEntity staffEntity = staffService.selectStaffById(approvalDto.getLoginUserId());
         if (staffEntity != null) {
             ResultComment resultComment = new ResultComment();
@@ -1039,7 +1044,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             resultComment.setRecordId(approvalDto.getResultRecordId());
             resultComment.setOptDesc(approvalDto.getMenuName() + flowChart.getName());
             resultCommentService.insertResultComment(resultComment);
+            return resultComment.getId();
         }
+        return 0l;
     }
 
     private R newSubmit(ApprovalDto approvalDto, Integer finishedStatus) {

From 9e49c4bb31898cead204500a3e841d50ef6183fc Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 4 Dec 2020 16:49:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BB=A9=E6=95=88?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0commandId=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/ResultRecordController.java     | 14 +++++++-------
 .../modules/flow/model/ResultRecordDetailDto.java  |  2 ++
 2 files changed, 9 insertions(+), 7 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 620608ca..0f4a8b92 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -762,24 +762,25 @@ public class ResultRecordController extends AbstractController {
 
                     }
 
-                    if(!resultDetail.getCheckResult().equals(resultDetail1.getCheckResult())){
+                    if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
                         //打上标识
                         isUp = true;
-                        resultDetail1.setCheckResult("<s>" + resultDetail1.getCheckResult() + "</s>");
+                        resultDetail1.setKeyResult("<s>" + resultDetail1.getKeyResult() + "</s>");
+                    }
+                    if(resultDetail.getIsDelete().intValue() == 1){//被删除了
+                        resultDetail.setIsDelete(0);
+                        isUp = true;
                     }
-
                     if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
                         //打上标识
                         isUp = true;
-
-                        //resultDetail1.setTarget("<s>" + resultDetail1.getTarget() + "</s>");
                     }
                     if(isUp){
                         resultDetail1.setId(null);
                         resultDetail1.setIsBack(1);
                         resultDetail1.setTarget("<s>" + resultDetail1.getTarget() + "</s>");
                         resultDetail1.setBackId(resultDetail.getId());
-                        inserts.add(resultDetail);
+                        inserts.add(resultDetail1);
                     }
                 }
                 resultDetail.setPriority(index);
@@ -814,7 +815,6 @@ public class ResultRecordController extends AbstractController {
                         }
                         resultDetail.setAcquireScore(score);
                         weight = weight.add(resultDetail.getCheckWeight());
-
                     }
                 }
 
diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
index b2c906c0..19d1ad27 100644
--- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
+++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
@@ -33,6 +33,8 @@ public class ResultRecordDetailDto {
     //备注
     @ApiModelProperty(value = "备注", name = "remark")
     private String remark;
+    @ApiModelProperty(value = "业绩评论id", name = "commandId")
+    private Long commandId;
     //员工id
     @ApiModelProperty(value = "员工id", name = "staffId")
     private Long staffId;