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/controller/DispatchController.java | 75 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 28 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 f3e0fd6..2dee5b9 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
@@ -1,27 +1,24 @@
package org.springblade.mdm.flow.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.IResultCode;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
-import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.service.execute.*;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
+import org.springblade.mdm.flow.vo.FlowStartResult;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -38,9 +35,7 @@
private final StartDispatcher dispatcher;
- private final TaskService taskService;
private final RuntimeService runtimeService;
- private final FlowProgramFileService flowProgramFileService;
private final TryFlowCompleteService tryFlowCompleteService;
@@ -60,24 +55,46 @@
boolean isDuplicate = taskDispatchService.checkIsDuplicate(startVO);
TaskDispatch dispatch = taskDispatchService.saveTask(startVO,isDuplicate);
+ startVO.setCreateUser(dispatch.getCreateUser());
if(isDuplicate){
throw new ServiceException("閲嶅娲惧伐");
}
try {
- String instId = dispatcher.start(startVO);
+ FlowStartResult result = dispatcher.start(startVO);
dispatch.setStatus(TaskDispatch.STATUS_STARTED);
- dispatch.setProcessInstanceId(instId);
+ dispatch.setProcessInstanceId(result.getProcessInstanceId());
+ dispatch.setProgramNo(result.getProgramNo());
taskDispatchService.updateById(dispatch);
return R.data(true);
} catch (Exception e) {
dispatch.setStatus(TaskDispatch.STATUS_EXCEPTION);
dispatch.setErrMsg(e.getMessage());
taskDispatchService.updateById(dispatch);
- return R.fail("浠诲姟鍚姩寮傚父:"+e.getMessage());
+ return R.fail(new IResultCode() {
+ @Override
+ public String getMessage() {
+ return e.getMessage();
+ }
+
+ @Override
+ public int getCode() {
+ return 201;
+ }
+ });
}
}catch(Exception e){
- return R.fail(e.getMessage());
+ return R.fail(new IResultCode() {
+ @Override
+ public String getMessage() {
+ return e.getMessage();
+ }
+
+ @Override
+ public int getCode() {
+ return 201;
+ }
+ });
}
}
@@ -89,17 +106,17 @@
*/
AbstractFlowCompleteService getActualService(String processInstanceId){
ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).includeProcessVariables().singleResult();
- if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY)
- || inst.getProcessDefinitionKey().equals(FlowContants.UNLOCK_PROCESS_KEY)){
- String isTempFlow = Func.toStr(inst.getProcessVariables().get(FlowContants.IS_TEMP_FLOW));
- if(FlowContants.N.equals(isTempFlow)){
+ if(inst.getProcessDefinitionKey().equals(FlowConstant.TRY_PROCESS_KEY)
+ || inst.getProcessDefinitionKey().equals(FlowConstant.UNLOCK_PROCESS_KEY)){
+ String isTempFlow = Func.toStr(inst.getProcessVariables().get(FlowVariableConstant.IS_TEMP_FLOW));
+ if(FlowConstant.N.equals(isTempFlow)){
return tryFlowCompleteService;
}else{
return tempFlowCompleteService;
}
- }else if(inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
+ }else if(inst.getProcessDefinitionKey().equals(FlowConstant.CURE_PROCESS_KEY)){
return cureFlowCompleteService;
- }else if(inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
+ }else if(inst.getProcessDefinitionKey().equals(FlowConstant.REPLACE_PROCESS_KEY)){
return replaceFlowCompleteService;
}else{
return defaultFlowCompleteService;
@@ -153,16 +170,18 @@
}catch(Exception e){
return R.fail(e.getMessage());
}
+ }
+
+ @Operation(summary = "缂栫▼鍛樼幇鍦虹紪鍒舵壒閲忓鐞�", description = "缂栫▼鍛樼幇鍦虹紪鍒舵壒閲忓鐞�")
+ @PostMapping("batch-program-on-machine")
+ public R<Void> batchProgramOnMachine(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ dispatchService.batchProgramOnMachine(batchDispatchVO);
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
}
- /*
- void addApproveRecord(String taskId,String comment,Map<String, Object> variables){
- String operateResult = variables.get("approve")+"";
- Task task = taskService.createTaskQuery()
- .taskId(taskId)
- .singleResult();
- approveRecordService.saveApproveRecords(task,operateResult,comment);
-
- }*/
}
--
Gitblit v1.9.3