From ffd5abc74eea1f6ee6433ac11e401aaa57bcc4ab Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 08 七月 2025 22:37:50 +0800
Subject: [PATCH] 接口文档描述修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 44 ++++++++++++++++----------------------------
1 files changed, 16 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 911f2cc..eba482e 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,8 +1,10 @@
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.StringUtils;
import org.flowable.engine.TaskService;
@@ -16,7 +18,9 @@
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.vo.TaskAssignVO;
+import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -30,19 +34,19 @@
@Slf4j
@RestController
+@AllArgsConstructor
@RequestMapping("/flow/dispatch")
@Tag(name = "娲惧伐娴佺▼", description = "娲惧伐娴佺▼")
public class DispatchController {
- @Autowired
- private StartDispatcher dispatcher;
- @Autowired
- private TaskService taskService;
- @Autowired
- private ProcessProgRefService processProgRefService;
+ private final StartDispatcher dispatcher;
- @Autowired
+ private final TaskService taskService;
+
+ private final ProcessProgRefService processProgRefService;
+
private ApproveRecordService approveRecordService;
+ private final FlowCommonService flowCommonService;
/**
* 鏂板
*/
@@ -77,7 +81,7 @@
if(variables.containsKey("assignee")){
- addApproveRecord(taskId,processInstanceId,comment,programIds,variables);
+ addApproveRecord(taskId,processInstanceId,comment,variables);
//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
taskService.complete(taskId, variables);
@@ -89,29 +93,13 @@
}
- void addApproveRecord(String taskId, String processInstanceId, String comment,String programIds,Map<String, Object> variables){
- List<Long> programIdList = new ArrayList<>();
- if(programIds != null){
- programIdList = Func.toLongList(programIds);
- }else{
- programIdList.add(null);
- }
+ void addApproveRecord(String taskId, String processInstanceId, String comment,Map<String, Object> variables){
+ String operateResult = variables.get("approve")+"";
+
Task task = taskService.createTaskQuery()
.taskId(taskId)
.singleResult();
- for(Long programId : programIdList){
- ApproveRecord rec = new ApproveRecord();
- rec.setTaskName(task.getName());
- rec.setComment(comment);
- rec.setNcProgramId(programId);
- rec.setOperateResult(variables.get("approve")+"");//瀹℃壒缁撴灉
- rec.setOperateTime(DateUtil.now());
- rec.setProcessInstanceId(processInstanceId);
- rec.setUserId(AuthUtil.getUserId());
- rec.setUserNickname(AuthUtil.getNickName());
-
- approveRecordService.save(rec);
- }
+ approveRecordService.saveApproveRecords(task,processInstanceId,operateResult,comment);
}
}
--
Gitblit v1.9.3