From d7fb77e791eb5d7f32f9fab2599a4ecff389bf01 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 18:30:35 +0800
Subject: [PATCH] 补充替换流程上传的fileType
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index b6095a3..6cb0fc4 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -56,9 +56,6 @@
private final TaskService taskService;
private final RuntimeService runtimeService;
- private final ProcessProgRefService processProgRefService;
-
- private final ApproveRecordService approveRecordService;
private final FlowProgramFileService flowProgramFileService;
@@ -86,7 +83,7 @@
AbstractFlowCompleteService getActualService(String processInstanceId){
ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
- if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
+ if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
return tryFlowCompleteService;
}else{
return defaultFlowCompleteService;
@@ -112,7 +109,7 @@
@PostMapping("batchDispatch")
public R<Void> batchDispatch(@RequestBody BatchDispatchVO batchDispatchVO) {
try {
- dispatchService.batchCompleteTask(batchDispatchVO);
+ dispatchService.batchDispatchTask(batchDispatchVO);
return R.success("娴佺▼鎻愪氦鎴愬姛");
}catch(Exception e){
return R.fail(e.getMessage());
@@ -124,7 +121,19 @@
@PostMapping("batchDispatchAuto")
public R<Void> batchDispatchAuto(@RequestBody BatchDispatchVO batchDispatchVO) {
try {
- dispatchService.batchAutoCompleteTask(batchDispatchVO);
+ dispatchService.batchAutoDispatchTask(batchDispatchVO);
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
+ }
+
+ @Operation(summary = "鎵归噺瀹℃壒", description = "楂樺笀鎵归噺瀹℃壒")
+ @PostMapping("batchApprove")
+ public R<Void> batchApprove(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ dispatchService.batchApprove(batchDispatchVO);
return R.success("娴佺▼鎻愪氦鎴愬姛");
}catch(Exception e){
return R.fail(e.getMessage());
--
Gitblit v1.9.3