From 4988082dcafba6a928aab186ae18a8da3e16795e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 18 八月 2025 12:00:55 +0800
Subject: [PATCH] 替换流程发起，增加文件校验
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 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 4818d2a..fd1b8aa 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
@@ -26,10 +26,8 @@
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.TaskDispatchService;
-import org.springblade.mdm.flow.service.execute.AbstractFlowCompleteService;
-import org.springblade.mdm.flow.service.execute.BatchDispatchService;
-import org.springblade.mdm.flow.service.execute.DefaultFlowCompleteService;
-import org.springblade.mdm.flow.service.execute.TryFlowCompleteService;
+import org.springblade.mdm.flow.service.execute.*;
+import org.springblade.mdm.flow.vo.BatchDispatchVO;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
@@ -55,9 +53,6 @@
private final TaskService taskService;
private final RuntimeService runtimeService;
- private final ProcessProgRefService processProgRefService;
-
- private final ApproveRecordService approveRecordService;
private final FlowProgramFileService flowProgramFileService;
@@ -65,7 +60,7 @@
private final DefaultFlowCompleteService defaultFlowCompleteService;
private final TaskDispatchService taskDispatchService;
private final BatchDispatchService dispatchService;
-
+ private final ReplaceFlowCompleteService replaceFlowCompleteService;
/**
* 鍙戣捣娲惧伐娴佺▼
*/
@@ -85,8 +80,11 @@
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.UNLOCK_PROCESS_KEY)){
return tryFlowCompleteService;
+ }else if(inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
+ return replaceFlowCompleteService;
}else{
return defaultFlowCompleteService;
}
@@ -109,9 +107,9 @@
@Operation(summary = "鎵嬪姩鎵归噺娲惧伐", description = "缁勯暱鎵嬪姩鎵归噺娲惧伐")
@PostMapping("batchDispatch")
- public R<Void> batchDispatch(String[] taskIds, String[] processInstanceIds, @Parameter(name = "comment", description = "澶囨敞")String comment,@Parameter(name = "assignee", description = "澶勭悊浜篿d") String assignee) {
+ public R<Void> batchDispatch(@RequestBody BatchDispatchVO batchDispatchVO) {
try {
- dispatchService.batchCompleteTask(taskIds, processInstanceIds, comment, assignee);
+ dispatchService.batchDispatchTask(batchDispatchVO);
return R.success("娴佺▼鎻愪氦鎴愬姛");
}catch(Exception e){
return R.fail(e.getMessage());
@@ -121,9 +119,21 @@
@Operation(summary = "鑷姩鎵归噺娲惧伐", description = "缁勯暱鎵归噺娲惧伐锛屽悗绔嚜鍔ㄦ煡鎵惧鐞嗕汉")
@PostMapping("batchDispatchAuto")
- public R<Void> batchDispatchAuto(String[] taskIds, String[] processInstanceIds, @Parameter(name = "comment", description = "澶囨敞")String comment) {
+ public R<Void> batchDispatchAuto(@RequestBody BatchDispatchVO batchDispatchVO) {
try {
- dispatchService.batchAutoCompleteTask(taskIds, processInstanceIds, comment);
+ 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