From 18d9c0bdc04e71cf3903c30c139f59dab744cf3f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 15:09:35 +0800
Subject: [PATCH] 偏离回传 流程改名
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
index 04274a5..c8403f4 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -34,8 +34,6 @@
private final RuntimeService runtimeService;
- private final HistoryService historyService;
- private final TaskService taskService;
private final IdentityService identityService;
private final NodeDeptQueryService nodeDeptQueryService;
private final NcNodeService ncNodeService;
@@ -43,7 +41,7 @@
private final FlowProgramFileService flowProgramFileService;
private final ProduceDivisionService produceDivisionService;
private final MachineService machineService;
-
+ private final FlowCommonService flowCommonService;
/**
* 鍚姩鍥哄寲娴佺▼
@@ -61,10 +59,9 @@
private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
Map<String, Object> vars = new HashMap<>();
NcNode programPackage = this.ncNodeService.getById(nodeId);
-
+ vars.put(FlowContants.NODE_ID,programPackage.getId());
vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
- //鏈哄簥鍨嬪彿
- //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
+
//鏈哄簥鍨嬪彿
Machine machine = machineService.getByCode(programPackage.getMachineCode());
if(machine != null) {
@@ -85,13 +82,9 @@
vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
- ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
- vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
- vars.put(FlowContants.CHECKER,div.getCheckerId());
- vars.put(FlowContants.SENIOR,div.getSeniorId());
- vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
-
- vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());
+ flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
+ //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
+ vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
@@ -99,8 +92,11 @@
vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
vars.put(FlowContants.TITLE,programPackage.getName()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
- vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
-
+ if(programPackage.getDeviation() != null) {
+ vars.put(FlowContants.MY_PROCESS_NAME, "鍋忕鍥炰紶");
+ }else {
+ vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ }
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);
//鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
--
Gitblit v1.9.3