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] =?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) {