From 5093665e4a222544adb259b915db7aa3159de667 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Mon, 31 Aug 2020 09:33:35 +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

---
 .../controller/ResultRecordController.java    |  1 -
 .../app/impl/ResultDetailServiceImpl.java     | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 9 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 204f0149..4023d9e5 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -328,7 +328,6 @@ public class ResultRecordController extends AbstractController {
                         flowRecordService.updateFlowRecordById(flowRecord);
                     }
                 }
-
                 // 可能会被删除
                 FlowRecord lastFlowRecord = flowRecordService.selectLastFlowRecordByRecordId(req.getRecordResultId());
                 lastFlowRecord.setGmtCreate(new Date());
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
index 13f8db1e..8cd0c916 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
@@ -261,26 +261,29 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
 		SimpleDateFormat myFmt2 = new SimpleDateFormat("MM-dd HH:mm");
 		FlowRecord lastFlowRecord = null;
 		if (CollectionUtils.isNotEmpty(flowRecordList)) {
-			int status = 0;
 			int index = 0;
+			String lastStatusStr = "";
 			for (FlowRecord flowRecord : flowRecordList) {
 				String name = roleNameMap.get(flowRecord.getDepartmentLevel());
 				String time = myFmt2.format(flowRecord.getGmtCreate());
 				String statusStr = "通过";
 				if (flowRecord.getStatus().equals(0)) {
-					if (status == 1) {
-						statusStr = "驳回";
-					}
 					lastFlowRecord = flowRecord;
-					status = 0;
 				} else if (flowRecord.getStatus().equals(1)) {
-					status = 1;
+					if (index + 1 <= flowRecordList.size() - 1) {
+						FlowRecord flowRecord1 = flowRecordList.get(index + 1);
+						if (flowRecord1.getStatus().equals(0)) {
+							statusStr = "驳回";
+						}
+					}
 				}
+				statusStr = index == 0 ? "提交" : statusStr;
 				if (index == flowRecordList.size() - 1) {
-					stepList.add(new Step(name, time, 1, "审批中" ));
+					stepList.add(new Step(name, time, 1, "驳回".equals(lastStatusStr) ? "确认" : "审批中"));
 				} else {
-					stepList.add(new Step(name, time, 1, index == 0 ? "提交" : statusStr));
+					stepList.add(new Step(name, time, 1, "驳回".equals(lastStatusStr) ? "确认" : statusStr));
 				}
+				lastStatusStr = statusStr;
 				index++;
 			}
 		}