From 8db9b68d0bf4b7ec2e80b580f5931a40788caac7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 21:48:46 +0800
Subject: [PATCH] 替换流程bug修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 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 c56e955..c19f79a 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,13 +1,25 @@
package org.springblade.mdm.flow.service;
+import com.alibaba.excel.util.StringUtils;
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.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.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
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
@@ -15,6 +27,7 @@
public class FlowCommonService {
private final RuntimeService runtimeService;
private final HistoryService historyService;
+ private final ProduceDivisionService produceDivisionService;
/**
* 鏍规嵁娴佺▼瀹炰緥id鑾峰彇definitionKey
* @param processInstanceId
@@ -39,6 +52,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)));
@@ -47,10 +61,21 @@
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)));
+ }
+ programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
+
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(processInstanceId)
@@ -84,4 +109,44 @@
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;
+ }
+
+ /**
+ * 灏嗛粯璁ゅ鎵圭敤鎴锋斁鍏ap涓�
+ * @param vars 鍚姩娴佺▼鐨勫彉閲弇ap
+ * @param drawingNo 闆剁粍浠跺彿
+ */
+ public ProduceDivision putDefaultAssignees(Map<String, Object> vars,String drawingNo,String defaultAssignee){
+ ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(drawingNo);
+ vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
+ vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
+ vars.put(FlowContants.CHECKER,div.getCheckerId());
+ vars.put(FlowContants.SENIOR,div.getSeniorId());
+ if(StringUtils.isNotBlank(defaultAssignee)) {
+ vars.put(FlowContants.ASSIGNEE, defaultAssignee);//绗竴涓鎵圭敤鎴凤細缁勯暱
+ }
+
+ return div;
+ }
}
+
+
--
Gitblit v1.9.3