From a049dda2f63d59f5092994b44387fe0aa889d375 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 14 八月 2025 15:01:04 +0800
Subject: [PATCH] 固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
index 372356c..0a39ee5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
@@ -7,13 +7,16 @@
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
+import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
+import java.util.List;
import java.util.Map;
@AllArgsConstructor
@@ -46,6 +49,7 @@
Map<String, Object> vars = runtimeService.getVariables(processInstanceId);
+ programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowContants.DRAWING_NO_EDITION)));
programProperties.setProductModel(String.valueOf(vars.get(FlowContants.PRODUCT_MODEL)));
@@ -60,6 +64,15 @@
programProperties.setCraftEdition(String.valueOf(vars.get(FlowContants.CRAFT_EDITION)));
programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowContants.HAS_CURED_PROGRAM)));
+ programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowContants.IS_PROCESS_EDITION_SAME)));
+ if(vars.containsKey(FlowContants.DEVIATION)) {
+ programProperties.setDeviation(String.valueOf(vars.get(FlowContants.DEVIATION)));
+ }
+ if(vars.containsKey(FlowContants.CURED_NODE_ID)){
+ programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
+ }
+ programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
+
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(processInstanceId)
@@ -94,7 +107,25 @@
return historicInstance != null && historicInstance.getEndTime() == null;
}
+ /**
+ * 涓婁竴姝ュ鐞嗕汉
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @return assignee
+ */
+ public String previusAssignee(String processInstanceId) {
+ // 鑾峰彇鍘嗗彶浠诲姟瀹炰緥
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .orderByHistoricTaskInstanceEndTime().asc()
+ .list();
+ // 鑾峰彇涓婁竴涓凡瀹屾垚鐨勪换鍔�
+ String assignee = "";
+ if(!historicTasks.isEmpty()) {
+ assignee = historicTasks.get(historicTasks.size() - 1).getAssignee();
+ }
+ return assignee;
+ }
}
--
Gitblit v1.9.3