From 64d336dd5fd1d651306447f5ea560b9f60c1eccb Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 27 Oct 2020 15:44:42 +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

---
 .../lz/modules/app/controller/ResultRecordController.java    | 1 +
 .../sys/service/app/impl/ResultRecordServiceImpl.java        | 5 +++--
 2 files changed, 4 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 b638b1d4..b599ed67 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -674,6 +674,7 @@ public class ResultRecordController extends AbstractController {
      */
     // 审批：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=1&loginUserId=825&comment=xxx&menuName=bbb
     // 跳过：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=4&menuName=bbb&flowRecordId=360
+    // 转交：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=8&menuName=bbb&flowRecordId=360&transferStaffId=294
     @RequestMapping("/new/approval")
     public R approval(ApprovalDto approvalDto) {
         try {
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 633e4103..680f395f 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
@@ -889,11 +889,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
     private R transfer(ApprovalDto approvalDto) {
         FlowRecord flowRecord = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
+        flowChangeService.saveChange(approvalDto, flowRecord, 1);
         StaffEntity staffEntity = staffService.selectStaffById(approvalDto.getTransferStaffId());
         flowRecord.setApprovalStaffId(staffEntity.getId());
         flowRecord.setApprovalStaffName(staffEntity.getName());
-        flowChangeService.saveChange(approvalDto, flowRecord, 1);
-        return R.ok("跳过成功");
+        flowRecordService.updateFlowRecordById(flowRecord);
+        return R.ok("转交成功");
     }