From b25a5904623ca997ecf5e46ce1562823c4887acd Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 15 Dec 2020 16:50:38 +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

---
 .../app/impl/ResultRecordServiceImpl.java       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 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 f3125b8d..16d1eccd 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
@@ -968,7 +968,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             flowRecordService.updateFlowRecordById(r);
         }
         resultRecordService.updateResultRecordById(resultRecord);
-
         if(flag) {  //如果录入己经走了，设置新的数据，结果录入己走
             List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(f.getRecordId());
             for(int i = 0 ;i < newflowRecords.size() ; i ++){
@@ -985,12 +984,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
     private R resetAll(ApprovalDto approvalDto) {
         FlowRecord flowRecord = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
-        Long flowRecordId = approvalDto.getResultRecordId();
+        Long resultRecordId = approvalDto.getResultRecordId();
 
         if(flowRecord != null ){
-            flowRecordId  = flowRecord.getRecordId();
+            resultRecordId  = flowRecord.getRecordId();
         }
-        List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecordId);
+        List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(resultRecordId);
         List<Long> flowRecordIds =new ArrayList<>();
         boolean flag = false ;
         for(FlowRecord f: flowRecords){
@@ -1000,9 +999,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 flag = true;
             }
         }
-        flowRecordService.deleteFlowRecordByRecordId(flowRecordId);
-        initFlowRecord(flowRecordId);
-        List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecordId);
+        flowRecordService.deleteFlowRecordByRecordId(resultRecordId);
+        initFlowRecord(resultRecordId);
+        List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(resultRecordId);
         for(int i = 0 ;i < newflowRecords.size() ; i ++){
             flowRecordService.updateFlowRecordIdById(newflowRecords.get(i).getId(),flowRecordIds.get(i));
             if(flag ){  //如果录入己经走了，设置新的数据，结果录入己走
@@ -1015,12 +1014,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         }
 
         //更新flowProcess为0
-        ResultRecord resultRecord = resultRecordService.selectResultRecordById(flowRecord.getRecordId());
+        ResultRecord resultRecord = resultRecordService.selectResultRecordById(resultRecordId);
         resultRecord.setFlowProcess(0);
         resultRecordService.updateResultRecordById(resultRecord);
 
 
-        resultRecordService.resetData(flowRecordId,approvalDto.getClearFlag());
+        resultRecordService.resetData(resultRecordId,approvalDto.getClearFlag());
         return R.ok();
     }