From 4c3c380fd04118d9507986002e3b563eb42dbdc4 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 16 八月 2023 16:09:01 +0800
Subject: [PATCH] 已发起事件获取流程开始时间和流程变量

---
 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
index abc996d..6aca608 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
@@ -24,6 +24,7 @@
 import com.vci.ubcs.flow.engine.constant.FlowEngineConstant;
 import com.vci.ubcs.flow.engine.entity.FlowProcess;
 import com.vci.ubcs.flow.engine.utils.FlowCache;
+import com.vci.ubcs.flow.engine.utils.FlowableUtils;
 import com.vci.ubcs.starter.web.util.VciDateUtil;
 import com.vci.ubcs.system.user.cache.UserCache;
 import com.vci.ubcs.system.user.entity.User;
@@ -40,6 +41,7 @@
 import org.flowable.task.api.TaskQuery;
 import org.flowable.task.api.history.HistoricTaskInstance;
 import org.flowable.task.api.history.HistoricTaskInstanceQuery;
+import org.flowable.variable.api.history.HistoricVariableInstance;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
@@ -182,8 +184,13 @@
 			}
 			flow.setStatus(FlowEngineConstant.STATUS_FINISH);
 
+			//娴佺▼鍙戣捣鏃堕棿
+			flow.setProcessDefinitionStartTime(VciDateUtil.date2Str(historicProcessInstance.getStartTime(),VciDateUtil.DateTimeFormat));
+
 			//娴佺▼鍙橀噺
-			Map<String,Object> variables = historicProcessInstance.getProcessVariables();
+
+			List<HistoricVariableInstance> variableInstances = historyService.createHistoricVariableInstanceQuery().processInstanceId(historicProcessInstance.getId()).list();
+			Map<String,Object> variables = FlowableUtils.switchVariable(variableInstances);
 			flow.setVariables(variables);
 
 			//businessKey

--
Gitblit v1.9.3