From 7d56f2a7c8b3907ecf7ff74a1f9a20b977c3adf8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 08 七月 2025 20:21:10 +0800
Subject: [PATCH] 调整审批记录的保存方式
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
index f742e48..39e093a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
@@ -7,13 +7,17 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
+import org.flowable.engine.task.Comment;
+import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.mdm.basesetting.machine.vo.MachineExcelVO;
+import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.mdm.flow.vo.OvertimeTaskExcelVO;
@@ -36,6 +40,10 @@
private TaskService taskService;
@Autowired
private FlowBusinessService businessService;
+
+ @Autowired
+ private HistoryService historyService;
+
@GetMapping("overtime-list")
@ApiOperationSupport(order = 3)
@@ -65,10 +73,25 @@
}
-
+ @Operation(summary = "娴佺▼鎵ц杞ㄨ抗", description = "娴佺▼鎵ц杞ㄨ抗")
@GetMapping("process-trace")
- public R<List<TaskTraceVO>> processTrace(long processInstanceId){
- return R.data(Collections.emptyList());
+ public R<List<TaskTraceVO>> processTrace(String processInstanceId){
+ List<TaskTraceVO> result = new ArrayList<>();
+ List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(processInstanceId).orderByTaskCreateTime().desc().list();
+// 鎵规敞淇℃伅
+ List<Comment> comments;
+ for (HistoricTaskInstance hisTask : hisTasks) {
+ TaskTraceVO vo = new TaskTraceVO();
+ BeanUtils.copyProperties(hisTask, vo);
+ comments = taskService.getTaskComments(hisTask.getId());
+ if(!comments.isEmpty()) {
+ vo.setComment(comments.get(0).getFullMessage());
+ }
+ result.add(vo);
+ }
+
+ return R.data(result);
}
--
Gitblit v1.9.3