From 56f5157ae8dba22eb30fb6c7cb132f80b7161932 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 07 九月 2025 00:53:08 +0800
Subject: [PATCH] 派工界面增加选择主管工艺
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 be09907..0689209 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
@@ -13,6 +13,7 @@
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
+import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.program.entity.NcNode;
@@ -32,7 +33,7 @@
private final ProduceDivisionService produceDivisionService;
private final NodeDeptQueryService nodeDeptQueryService;
private final MachineService machineService;
- private final IUserClient userClient;
+ private final UserCommonService userCommonService;
/**
* 鏍规嵁娴佺▼瀹炰緥id鑾峰彇definitionKey
* @param processInstanceId
@@ -80,6 +81,11 @@
return programProperties;
}
+ /**
+ * 浠巑ap涓祴鍊兼祦绋嬩究鍒╁埌vo
+ * @param programProperties vo
+ * @param vars 鍙橀噺map
+ */
void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){
programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
@@ -114,6 +120,8 @@
programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
+
+ programProperties.setProgramNo(Func.toStr(vars.get(FlowContants.PROGRAM_NO)));
programProperties.setActProgrammerId(Func.toLong(vars.get(FlowVariableContants.ACT_PROGRAMMER)));
}
@@ -178,10 +186,7 @@
vars.put(FlowContants.ASSIGNEE, defaultAssignee);//绗竴涓鎵圭敤鎴凤細缁勯暱
}
- R<User> programmerResult = userClient.userInfoById(div.getProgrammerId());
- if(programmerResult.isSuccess()) {
- vars.put(FlowContants.PROGRAMMER_NAME, programmerResult.getData().getName());
- }
+ vars.put(FlowContants.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
return div;
}
--
Gitblit v1.9.3