From e47e95aaa3587868f80ac720fce487cbe2f19366 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 3 Dec 2020 13:30:12 +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

---
 .../com/lz/modules/app/controller/TestController.java     | 2 +-
 .../sys/service/app/impl/ResultRecordServiceImpl.java     | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java
index 88a02844..d90ff5c7 100644
--- a/src/main/java/com/lz/modules/app/controller/TestController.java
+++ b/src/main/java/com/lz/modules/app/controller/TestController.java
@@ -299,7 +299,7 @@ public class TestController {
         System.out.println(roleIds);
     }
 
-    //http://localhost:8080/lz_management/test/reset/data?resultRecordId=3714
+    //http://localhost:8080/lz_management/test/reset/data?resultRecordId=3682
     @RequestMapping("/test/reset/data")
     public R getResetData(RecordDetailDto recordDetailDto) {
         return resultRecordService.getResetData(recordDetailDto);
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 0345ebca..487801ca 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
@@ -937,9 +937,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         for(FlowRecord flowRecord:flowRecords){
             // 如果结果录入己经走了
             if (new Integer(3).equals(flowRecord.getFlowProcess()) && flowRecord.getStatus() == 1 ) {
-                continue;
+                flowRecord.setStatus(4);        //表示流程己经被重置
+            }else{
+                flowRecord.setStatus(0);        //表示流程己经被重置
             }
-            flowRecord.setStatus(0);        //表示流程己经被重置
+
             flowRecordService.updateFlowRecordById(flowRecord);
         }
         return R.ok();
@@ -966,7 +968,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             if(flag ){  //如果录入己经走了，设置新的数据，结果录入己走
                 FlowRecord newFlowRecord = newflowRecords.get(i) ;
                 if (new Integer(3).equals(newFlowRecord.getFlowProcess()) ) {
-                    newFlowRecord.setStatus(1);
+                    newFlowRecord.setStatus(4);
                     flowRecordService.updateFlowRecordById(newFlowRecord);
                 }
             }