From 047bb771200a233eff32141b963cfdc5b362b4a1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 14 八月 2025 11:57:44 +0800
Subject: [PATCH] 流程查询按时间搜索错误问题修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 144 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 122 insertions(+), 22 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 400cf3a..2cf990b 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,56 +1,156 @@
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.apache.commons.lang3.SerializationException;
+import org.apache.commons.lang3.StringUtils;
+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.R;
import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
+import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.excution.StartDispatcher;
+import org.springblade.mdm.flow.service.ApproveRecordService;
+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.vo.BatchDispatchVO;
import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.entity.ProcessProgRef;
+import org.springblade.mdm.program.service.NcNodeAutoCreateService;
+import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
@Slf4j
@RestController
+@AllArgsConstructor
@RequestMapping("/flow/dispatch")
@Tag(name = "娲惧伐娴佺▼", description = "娲惧伐娴佺▼")
public class DispatchController {
- @Autowired
- private StartDispatcher dispatcher;
- @Autowired
- private TaskService taskService;
+ private final StartDispatcher dispatcher;
+
+ private final TaskService taskService;
+ private final RuntimeService runtimeService;
+ private final ProcessProgRefService processProgRefService;
+
+ private final ApproveRecordService approveRecordService;
+ private final FlowProgramFileService flowProgramFileService;
+
+
+ private final TryFlowCompleteService tryFlowCompleteService;
+ private final DefaultFlowCompleteService defaultFlowCompleteService;
+ private final TaskDispatchService taskDispatchService;
+ private final BatchDispatchService dispatchService;
+
/**
- * 鏂板
+ * 鍙戣捣娲惧伐娴佺▼
*/
@PostMapping("/start")
- @Operation(summary = "鍚姩娲惧伐娴佺▼", description = "鍚姩娲惧伐娴佺▼")
- public R<Boolean> save(@RequestBody TaskAssignVO startVO) {
- dispatcher.start(startVO);
- return R.<Boolean>status(true);
+ @Operation(summary = "浠诲姟璁″垝(娲惧伐娴佺▼)", description = "鍚姩娲惧伐娴佺▼")
+ public R<Boolean> start(@RequestBody TaskAssignVO startVO) {
+ try {
+ long id= taskDispatchService.saveTask(startVO);
+ String instId = dispatcher.start(startVO);
+ taskDispatchService.updateSuccess(id,instId);
+ return R.data(true);
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
}
- @PostMapping("completeTask")
- public R<Void> completeTask(String taskId, String processInstanceId, String comment, @RequestBody Map<String, Object> variables) {
- // 澧炲姞璇勮
- if (StringUtil.isNoneBlank(processInstanceId, comment)) {
- taskService.addComment(taskId, processInstanceId, comment);
+ 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) || inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
+ return tryFlowCompleteService;
+ }else{
+ return defaultFlowCompleteService;
}
- // 闈炵┖鍒ゆ柇
- if (Func.isEmpty(variables)) {
- variables = Kv.create();
- }
- // 瀹屾垚浠诲姟
- taskService.complete(taskId, variables);
- return R.success("娴佺▼鎻愪氦鎴愬姛");
}
+ @Operation(summary = "瀹屾垚浠诲姟", description = "娴佸悜涓嬩竴涓妭鐐�")
+ @PostMapping("completeTask")
+ public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
+ try {
+ AbstractFlowCompleteService completeService = getActualService(processInstanceId);
+ completeService.completeTask(taskId, processInstanceId, comment, variables);
+
+
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
+
+ }
+
+ @Operation(summary = "鎵嬪姩鎵归噺娲惧伐", description = "缁勯暱鎵嬪姩鎵归噺娲惧伐")
+ @PostMapping("batchDispatch")
+ public R<Void> batchDispatch(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ dispatchService.batchDispatchTask(batchDispatchVO);
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
+ }
+
+ @Operation(summary = "鑷姩鎵归噺娲惧伐", description = "缁勯暱鎵归噺娲惧伐锛屽悗绔嚜鍔ㄦ煡鎵惧鐞嗕汉")
+ @PostMapping("batchDispatchAuto")
+ public R<Void> batchDispatchAuto(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ 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());
+ }
+
+ }
+ /*
+ 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