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 | 91 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 45 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 8a7d871..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
@@ -6,11 +6,13 @@
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;
@@ -25,8 +27,10 @@
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;
@@ -61,6 +65,8 @@
private final TryFlowCompleteService tryFlowCompleteService;
private final DefaultFlowCompleteService defaultFlowCompleteService;
private final TaskDispatchService taskDispatchService;
+ private final BatchDispatchService dispatchService;
+
/**
* 鍙戣捣娲惧伐娴佺▼
*/
@@ -80,7 +86,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;
@@ -92,57 +98,52 @@
try {
AbstractFlowCompleteService completeService = getActualService(processInstanceId);
completeService.completeTask(taskId, processInstanceId, comment, variables);
+
+
return R.success("娴佺▼鎻愪氦鎴愬姛");
}catch(Exception e){
return R.fail(e.getMessage());
}
- /*
- Task task = taskService.createTaskQuery()
- .taskId(taskId)
- .singleResult();
- String operateResult = variables.get("approve")+"";
- if(task.getTaskDefinitionKey().equals("programmingTask")) {//缂栧埗鑺傜偣
- flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
- }
- // 澧炲姞璇勮
- if (StringUtil.isNoneBlank(processInstanceId, comment)) {
- taskService.addComment(taskId, processInstanceId, comment);
- }
- // 闈炵┖鍒ゆ柇
- if (Func.isEmpty(variables)) {
- variables = Kv.create();
- }
-
- //鍔犲叆瀹℃壒鐢ㄦ埛
- variables.put(FlowContants.LAST_STEP_USER_NICKNAME,AuthUtil.getNickName());
-
- if(variables.containsKey("assignee")){
- addApproveRecord(taskId,comment,variables);
-
- //鍦ㄧ紪鍒朵换鍔℃椂锛屽垱寤鸿妭鐐癸紙娌℃湁鑺傜偣鍒欏垱寤猴紝鏈夊氨鐩存帴浣跨敤
- if(task.getTaskDefinitionKey().equals("programmingTask") && "Y".equals(operateResult)) {
- ncNodeAutoCreateService.createNodeTreeWithProgram(flowCommonService.getProgramProperties(processInstanceId));
- }
- if(!"confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
-
- variables.remove(FlowContants.PROCESS_EDITION);//TODO 涓存椂閿欒鏄紝缁勯暱鎻愪氦鐨勬椂鍊欎細鎻愪氦涓�涓┖涓诧紝娓呯┖浜嗗唴閮ㄦ暟鎹�
- }else{
- //鍗囩増
-
- }
-
- //鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
- taskService.complete(taskId, variables);
-
- return R.success("娴佺▼鎻愪氦鎴愬姛");
- }else {
- // 瀹屾垚浠诲姟,缁欓粯璁ょ敤鎴�
- return R.fail("璇锋寚瀹氭祦绋嬩笅涓�姝ュ鐞嗕汉");
- }*/
}
+ @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")+"";
@@ -151,5 +152,5 @@
.singleResult();
approveRecordService.saveApproveRecords(task,operateResult,comment);
- }
+ }*/
}
--
Gitblit v1.9.3