From 0db6d993345160e624293382a2c66aebe159c10b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 12 八月 2025 11:48:23 +0800
Subject: [PATCH] 替换流程完成后增加了审批记录，可导出；程序版本号+1
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 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 689ce47..32556d7 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
@@ -1,10 +1,19 @@
package org.springblade.mdm.flow.service;
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.runtime.ProcessInstance;
+import org.flowable.task.api.Task;
+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.Map;
@@ -12,6 +21,7 @@
@Service
public class FlowCommonService {
private final RuntimeService runtimeService;
+ private final HistoryService historyService;
/**
* 鏍规嵁娴佺▼瀹炰緥id鑾峰彇definitionKey
@@ -37,18 +47,63 @@
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)));
programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//宸ュ簭鐗堟
+ programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));
+
+ programProperties.setMachineMode(String.valueOf(vars.get(FlowContants.MACHINE_MODE)));
//鏁版嵁澶勭悊鍚嶇О涓虹増娆′互鍓嶏紝闆朵欢鍙峰姞宸ュ簭鍙凤細YZL4-1100-01-50 闆剁粍浠跺彿锛歒ZL4-1100-01 宸ュ簭鍙� 50
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)));
+ }
+
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .singleResult();
+ String processDefinitionKey = processInstance.getProcessDefinitionKey();
+ programProperties.setProcessDefinitionKey(processDefinitionKey);
return programProperties;
}
+ /**
+ * 娴佺▼鏄惁鍦ㄨ繘琛�
+ * @param processInstanceId 瀹炰緥id
+ */
+ public boolean isProcessInstanceActive(String processInstanceId) {
+ if(processInstanceId == null){
+ return false;
+ }
+ // 鍏堟煡杩愯鏃惰〃
+ ProcessInstance instance = runtimeService.createProcessInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .singleResult();
+
+ if (instance != null) {
+ return true;
+ }
+
+ // 鍐嶆煡鍘嗗彶琛ㄧ‘璁ゆ槸鍚︽浘缁忓瓨鍦�
+ HistoricProcessInstance historicInstance = historyService.createHistoricProcessInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .singleResult();
+
+ return historicInstance != null && historicInstance.getEndTime() == null;
+ }
+
+
}
+
+
--
Gitblit v1.9.3