From 0d61b9bfca526e9c3da2209de8f9f367e76fd013 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 18:09:35 +0800
Subject: [PATCH] 修改constant类名
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
index 113283f..1d64fe4 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
@@ -10,7 +10,8 @@
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.basesetting.machine.service.MachineService;
-import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.vo.ReplaceFlowStartVO;
import org.springblade.mdm.flow.vo.ReplaceUploadVO;
@@ -106,12 +107,16 @@
flowCommonService.putFlowVariablesByNode(vars,programPackage);
flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),startVO.getAssignee()+"");
- vars.put(FlowContants.TITLE,startVO.getTitle());
+ vars.put(FlowVariableConstant.TITLE,startVO.getTitle());
vars.put("comment", startVO.getComment());
- vars.put(FlowContants.MY_PROCESS_NAME,"鏇挎崲娴佺▼");
- identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.REPLACE_PROCESS_KEY,startVO.getNodeId()+"",vars);
+ vars.put(FlowVariableConstant.MY_PROCESS_NAME,"鏇挎崲娴佺▼");
+
+ String userId = String.valueOf(AuthUtil.getUserId());
+ identityService.setAuthenticatedUserId(userId);//璁剧疆娴佺▼鍙戣捣浜�
+ vars.put(FlowVariableConstant.ACT_PROGRAMMER,userId);//鍙戣捣浜烘寜鐓у疄闄呯紪绋嬩汉鍛樼畻
+
+ ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowConstant.REPLACE_PROCESS_KEY,startVO.getNodeId()+"",vars);
//鏇存柊鑺傜偣鐨勬祦绋媔d锛岄伩鍏嶉噸澶嶅彂璧锋祦绋�
programPackage.setProcessInstanceId(inst.getId());
this.nodeService.updateById(programPackage);
@@ -121,25 +126,7 @@
.set(FlowProgramFile::getProcessInstanceId,inst.getProcessInstanceId()).update();
}
- /*
- public void checkProgramFiles(String processInstanceId,boolean isPass) {
- List<FlowProgramFile> flowPrograms = this.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).orderByAsc(FlowProgramFile::getCreateTime).list();
- List<FlowProgramFile> purePrograms = flowPrograms.stream().filter(FlowProgramFile::isProgram).toList();
- if(isPass && purePrograms.isEmpty()){
- throw new ServiceException("璇蜂笂浼犵▼搴忔枃浠�");
- }
- int totalSeg = 0;
- if(!purePrograms.isEmpty()){
- FlowProgramFile progFile = purePrograms.get(0);
- totalSeg = ProgramFileNameCheckUtil.getProgramSegCount(progFile.getName());
- }
-
- if(totalSeg != purePrograms.size()){
- throw new ServiceException("搴斾笂浼�"+totalSeg+"娈电▼搴忥紝瀹為檯涓婁紶"+flowPrograms.size()+"娈�");
- }
-
- }*/
/**
* 涓婁紶绋嬪簭寰愭枃浠讹紙缂栧埗鑺傜偣璋冪敤锛�
@@ -159,8 +146,7 @@
ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(),progProps);
}
-
- String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo());
+ String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo(),progProps.getProcessEdition());
BladeFile bfile = ossTemplate.putFile(file);
--
Gitblit v1.9.3