From c864fec5f798a1aabcde877469886dd0dc90d092 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 02 Jan 2023 13:54:18 +0800
Subject: [PATCH] 申请表getAll接口可以根据通行证状态查询

---
 src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java b/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
index 0db6bba..debceeb 100644
--- a/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
+++ b/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
@@ -19,9 +19,12 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.flowable.engine.HistoryService;
+import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.history.HistoricProcessInstanceQuery;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.task.api.Task;
 import org.flowable.task.api.TaskQuery;
 import org.flowable.task.api.history.HistoricTaskInstance;
 import org.flowable.task.api.history.HistoricTaskInstanceQuery;
@@ -170,6 +173,11 @@
 			} else {
 				flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
 			}
+			//当deleteReason不为null时视为自行撤销
+			if (historicProcessInstance.getDeleteReason() != null){
+				flow.setProcessIsFinished(FlowEngineConstant.STATUS_WITHDRAW);
+			}
+
 			flow.setStatus(FlowEngineConstant.STATUS_FINISH);
 			flowList.add(flow);
 		});

--
Gitblit v1.9.3