From da97c50bacd81a6e0fb808ec3a480ae816fe8798 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 8 Sep 2020 10:52:30 +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

---
 .../sys/service/app/impl/ResultRecordServiceImpl.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 2356adf3..13c35ab3 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
@@ -431,15 +431,17 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         flowRecord.setFlowStaffIdRole(staffRoles);
 
         flowRecord.setStatusName(FlowRecordEnum.APPROVALING.getName());
-        FlowRecord lastFlowRecordNoStatus = flowRecordService.selectLastFlowNoStatusRecordByRecordId(resultRecordId);
 
+        FlowRecord lastFlowRecordNoStatus = flowRecordService.selectLastFlowNoStatusRecordByRecordId(resultRecordId);
         // 如果上一步是开始，则不进行修改，如果上一步是确认中，改成提交，如果上一点是审批中，将上一步改成通过
         if (lastFlowRecordNoStatus != null) {
             if (!StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.START.getName())
                     && !StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.CONFIRM.getName())) {
                 lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.APPROVAL.getName());
+                lastFlowRecordNoStatus.setGmtCreate(new Date());
             } else if (StringUtil.equals(lastFlowRecordNoStatus.getStatusName(), FlowRecordEnum.CONFIRM.getName())) {
                 lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.COMMIT.getName());
+                lastFlowRecordNoStatus.setGmtCreate(new Date());
             }
             flowRecordService.updateFlowRecordById(lastFlowRecordNoStatus);
         }
@@ -544,6 +546,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
                 FlowRecord lastFlowRecordNoStatus = flowRecordService.selectLastFlowNoStatusRecordByRecordId(req.getRecordResultId());
                 lastFlowRecordNoStatus.setStatusName(FlowRecordEnum.REJECT.getName());
+                lastFlowRecordNoStatus.setGmtCreate(new Date());    //更新驳回时间
                 flowRecordService.updateFlowRecordById(lastFlowRecordNoStatus);
 
                 // 可能会被删除