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/execute/TryFlowCompleteService.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
index 2315566..888c79b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
@@ -11,8 +11,8 @@
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.commons.service.ParamService;
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.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
@@ -57,36 +57,36 @@
if(task.getTaskDefinitionKey().equals("programmingTask") ) {//缂栧埗鑺傜偣
//璁板綍瀹為檯缂栫▼鍛�
- variables.put(FlowVariableContants.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
+ variables.put(FlowVariableConstant.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
- String programOnMachine = Func.toStr(variables.getOrDefault(FlowVariableContants.PROGRAM_ON_MACHINE,FlowContants.N));//鏄惁鐜板満缂栫▼
- if(this.needUploadProgramFile(props.getMachineCode()) && programOnMachine.equals(FlowContants.N)) {
- flowProgramFileService.checkProgramFiles(processInstanceId, FlowContants.Y.equals(operateResult));
+ String programOnMachine = Func.toStr(variables.getOrDefault(FlowVariableConstant.PROGRAM_ON_MACHINE, FlowConstant.N));//鏄惁鐜板満缂栫▼
+ if(this.needUploadProgramFile(props.getMachineCode()) && programOnMachine.equals(FlowConstant.N)) {
+ flowProgramFileService.checkProgramFiles(processInstanceId, FlowConstant.Y.equals(operateResult));
}
}else if(task.getTaskDefinitionKey().equals("teamLeaderTask")){
- if(FlowContants.Y.equals(operateResult)) {
- runtimeService.setVariable(task.getExecutionId(),FlowContants.PROGRAMMER_NAME,userCommonService.getUserNameById(Func.toLong(variables.get("assignee"))));
+ if(FlowConstant.Y.equals(operateResult)) {
+ runtimeService.setVariable(task.getExecutionId(), FlowConstant.PROGRAMMER_NAME,userCommonService.getUserNameById(Func.toLong(variables.get("assignee"))));
}
}else if(task.getTaskDefinitionKey().equals("check")){
- variables.put(FlowVariableContants.ACT_CHECKER,Func.toStr(AuthUtil.getUserId()));
+ variables.put(FlowVariableConstant.ACT_CHECKER,Func.toStr(AuthUtil.getUserId()));
}else if(task.getTaskDefinitionKey().equals("approveTask")){
- variables.put(FlowVariableContants.ACT_SENIOR,Func.toStr(AuthUtil.getUserId()));
+ variables.put(FlowVariableConstant.ACT_SENIOR,Func.toStr(AuthUtil.getUserId()));
}
- variables.remove(FlowVariableContants.PROGRAM_ON_MACHINE);//鍏朵粬鑺傜偣锛屽拷鐣ョ幇鍦虹紪绋嬫爣璁�
+ variables.remove(FlowVariableConstant.PROGRAM_ON_MACHINE);//鍏朵粬鑺傜偣锛屽拷鐣ョ幇鍦虹紪绋嬫爣璁�
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
}
- variables.put(FlowVariableContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
+ variables.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
- variables.remove(FlowVariableContants.PROCESS_EDITION);//涓嶈鍗囩増浜�
+ variables.remove(FlowVariableConstant.PROCESS_EDITION);//涓嶈鍗囩増浜�
if("confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
- variables.put(FlowContants.CURE_PROGRAM_USEABLE,operateResult);
+ variables.put(FlowConstant.CURE_PROGRAM_USEABLE,operateResult);
- if(FlowContants.Y.equals(operateResult)) {
+ if(FlowConstant.Y.equals(operateResult)) {
//鍒ゅ畾鍙敤锛岃褰曚负瀹為檯缂栫▼鍛�
- variables.put(FlowVariableContants.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
+ variables.put(FlowVariableConstant.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
}
}
taskService.complete(taskId, variables);
--
Gitblit v1.9.3