From 1e2b04fabbbc4b1ae37d7951068d7ab235f5b5f9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 15:29:38 +0800
Subject: [PATCH] 现场编制功能适配
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
index 22ad390..0793846 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
@@ -4,6 +4,7 @@
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.IdentityService;
import org.flowable.engine.runtime.ProcessInstance;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
@@ -72,6 +73,8 @@
}
vars.put(FlowVariableContants.TITLE,startVO.getTitle());
+ addLastStepUserName(startVO,vars);
+
//鏈哄簥缂栧彿
vars.put(FlowVariableContants.MACHINE_CODE,startVO.getMachineCode());
String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(startVO.getMachineCode());
@@ -79,8 +82,10 @@
//鏈哄簥鍨嬪彿
Machine machine = machineService.getByCode(startVO.getMachineCode());
+ if(machine == null){
+ throw new ServiceException("閿欒鐨勮澶囩紪鐮侊細"+startVO.getMachineCode());
+ }
vars.put(FlowVariableContants.MACHINE_MODE,machine.getName());
-
vars.put(FlowVariableContants.MACHINE_GROUP_CODE,machine.getMachineGroupCode());
vars.put(FlowVariableContants.PROCESS_NO,startVO.getProcessNo());
@@ -161,6 +166,23 @@
return result;
}
+ /**
+ * 娴佺▼鍙橀噺涓姞鍏ヤ笂涓�姝ュ鐞嗕簡浜猴紙鍙戣捣浜猴級
+ * @param startVO 鍚姩vo
+ * @param vars 娴佺▼鍙橀噺map
+ */
+ private void addLastStepUserName(TaskAssignVO startVO, Map<String, Object> vars) {
+ if(startVO.getDispatchBy() != null) {
+ vars.put(FlowVariableContants.LAST_STEP_USER_NICKNAME, startVO.getDispatchBy());
+ }else{
+ if(startVO.getCreateUser() != null) {
+ vars.put(FlowVariableContants.LAST_STEP_USER_NICKNAME, this.userCommonService.getUserNameById(startVO.getCreateUser()));
+ }else{
+ vars.put(FlowVariableContants.LAST_STEP_USER_NICKNAME,"MES绯荤粺");
+ }
+ }
+ }
+
/**
* 澶嶅埗娴佺▼绋嬪簭鏂囦欢
--
Gitblit v1.9.3