From 9a5abe507d6602f2311ffbe1d7bf25e2b58d3a7a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 00:17:30 +0800
Subject: [PATCH] 优化审批界面
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java | 27 +++++++++++++++------------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java | 2 +-
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java
index db26cc3..62435a6 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java
@@ -58,7 +58,7 @@
query.finishedAfter(DateUtil.toDate(queryVO.getEndTimeBegin()));
}
if(queryVO.getEndTimeEnd()!=null) {
- query.finishedBefore(DateUtil.toDate(queryVO.getEndTimeEnd()));
+ query.finishedBefore(DateUtil.plusDays(DateUtil.toDate(queryVO.getEndTimeEnd()),1));
}
if(Func.isNotEmpty(queryVO.getDrawingNo())) {
String likeVal = "%" + queryVO.getDrawingNo() + "%";
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 888c79b..4be1c27 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
@@ -51,28 +51,31 @@
String operateResult = this.getApproveResult(variables);
FlowProgramProperties props = flowCommonService.getProgramProperties(processInstanceId);
- if(!variables.containsKey("assignee")) {
+ if (!variables.containsKey("assignee")) {
throw new ServiceException("璇锋寚瀹氭祦绋嬩笅涓�姝ュ鐞嗕汉");
}
- if(task.getTaskDefinitionKey().equals("programmingTask") ) {//缂栧埗鑺傜偣
+ if (task.getTaskDefinitionKey().equals("programmingTask")) {//缂栧埗鑺傜偣
//璁板綍瀹為檯缂栫▼鍛�
- variables.put(FlowVariableConstant.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
+ variables.put(FlowVariableConstant.ACT_PROGRAMMER, Func.toStr(AuthUtil.getUserId()));
String programOnMachine = Func.toStr(variables.getOrDefault(FlowVariableConstant.PROGRAM_ON_MACHINE, FlowConstant.N));//鏄惁鐜板満缂栫▼
- if(this.needUploadProgramFile(props.getMachineCode()) && programOnMachine.equals(FlowConstant.N)) {
+ //variables.put(FlowVariableConstant.PROGRAM_ON_MACHINE, programOnMachine);
+ if (this.needUploadProgramFile(props.getMachineCode()) && programOnMachine.equals(FlowConstant.N)) {
flowProgramFileService.checkProgramFiles(processInstanceId, FlowConstant.Y.equals(operateResult));
}
- }else if(task.getTaskDefinitionKey().equals("teamLeaderTask")){
- if(FlowConstant.Y.equals(operateResult)) {
- runtimeService.setVariable(task.getExecutionId(), FlowConstant.PROGRAMMER_NAME,userCommonService.getUserNameById(Func.toLong(variables.get("assignee"))));
+ } else if (task.getTaskDefinitionKey().equals("teamLeaderTask")) {
+ 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(FlowVariableConstant.ACT_CHECKER,Func.toStr(AuthUtil.getUserId()));
- }else if(task.getTaskDefinitionKey().equals("approveTask")){
- variables.put(FlowVariableConstant.ACT_SENIOR,Func.toStr(AuthUtil.getUserId()));
+ } else if (task.getTaskDefinitionKey().equals("check")) {
+ variables.put(FlowVariableConstant.ACT_CHECKER, Func.toStr(AuthUtil.getUserId()));
+ } else if (task.getTaskDefinitionKey().equals("approveTask")) {
+ variables.put(FlowVariableConstant.ACT_SENIOR, Func.toStr(AuthUtil.getUserId()));
}
- variables.remove(FlowVariableConstant.PROGRAM_ON_MACHINE);//鍏朵粬鑺傜偣锛屽拷鐣ョ幇鍦虹紪绋嬫爣璁�
+ if (!task.getTaskDefinitionKey().equals("programmingTask")){
+ variables.remove(FlowVariableConstant.PROGRAM_ON_MACHINE);//鍏朵粬鑺傜偣锛屽拷鐣ョ幇鍦虹紪绋嬫爣璁�
+ }
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
}
--
Gitblit v1.9.3