From d34d3c83500d5a68715a280eee3d930c88291d71 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 07 九月 2025 19:10:05 +0800
Subject: [PATCH] 增加新编程序统计；固化程序统计
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 3ff7c54..c134be6 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
@@ -59,22 +59,25 @@
if(task.getTaskDefinitionKey().equals("programmingTask") ) {//缂栧埗鑺傜偣
//璁板綍瀹為檯缂栫▼鍛�
variables.put(FlowVariableContants.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
-
- if(this.needUploadProgramFile(props.getMachineCode())) {
+ String programOnMachine = Func.toStr(variables.getOrDefault("programOnMachine",FlowContants.N));//鏄惁鐜板満缂栫▼
+ if(this.needUploadProgramFile(props.getMachineCode()) && programOnMachine.equals(FlowContants.N)) {
flowProgramFileService.checkProgramFiles(processInstanceId, FlowContants.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"))));
}
-
+ }else if(task.getTaskDefinitionKey().equals("check")){
+ runtimeService.setVariable(task.getExecutionId(),FlowVariableContants.ACT_CHECKER,Func.toLong(variables.get("assignee")));
+ }else if(task.getTaskDefinitionKey().equals("approveTask")){
+ runtimeService.setVariable(task.getExecutionId(),FlowVariableContants.ACT_SENIOR,Func.toLong(variables.get("assignee")));
}
+ variables.remove("programOnMachine");//鍏朵粬鑺傜偣锛屽拷鐣ョ幇鍦虹紪绋嬫爣璁�
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
}
variables.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
-
addApproveRecord(taskId,comment,variables);
--
Gitblit v1.9.3