From 1e133de871164bfd3f6c90f844a88165d986eab5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 三月 2025 11:29:59 +0800
Subject: [PATCH] 任务日志查询bug
---
flowable/src/main/java/com/ycl/domain/vo/FormDetailVO.java | 5 +++++
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 12 +++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index d1e99b7..fdf46b4 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -1406,6 +1406,7 @@
Map<String, List<FormDetailVO>> map = new HashMap<>(2);
beforeNodes.stream().forEach(node -> {
if (node.getCurrent()) {
+ node.setTaskId(taskId);
dataList.add(node);
} else {
List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
@@ -1416,6 +1417,7 @@
.desc()
.list();
if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {
+ node.setTaskId(beforeTasks.get(0).getId());
List<FormDetailVO> l = map.get(beforeTasks.get(0));
if (CollectionUtils.isEmpty(l)) {
map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));
@@ -1439,7 +1441,7 @@
}
// 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
ProcessLogQuery query = new ProcessLogQuery();
- query.setTaskDefKey(node.getUserTask().getId());
+ query.setTaskId(node.getTaskId());
query.setProcessInsId(finalProcessInsId);
Result result = processLogService.projectProcessLogPage(query);
List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
@@ -1483,6 +1485,7 @@
Map<String, List<FormDetailVO>> map = new HashMap<>(2);
beforeNodes.stream().forEach(node -> {
if (node.getCurrent()) {
+ node.setTaskId(taskId);
dataList.add(node);
} else {
List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
@@ -1493,6 +1496,7 @@
.desc()
.list();
if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {
+ node.setTaskId(beforeTasks.get(0).getId());
List<FormDetailVO> l = map.get(beforeTasks.get(0));
if (CollectionUtils.isEmpty(l)) {
map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));
@@ -1516,7 +1520,7 @@
}
// 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
ProcessLogQuery query = new ProcessLogQuery();
- query.setTaskDefKey(node.getUserTask().getId());
+ query.setTaskId(node.getTaskId());
query.setProcessInsId(hisTask.getProcessInstanceId());
Result result = processLogService.projectProcessLogPage(query);
List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
@@ -1552,6 +1556,7 @@
Map<String, List<FormDetailVO>> map = new HashMap<>(2);
beforeNodes.stream().forEach(node -> {
if (node.getCurrent()) {
+ node.setTaskId(taskId);
dataList.add(node);
} else {
List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()
@@ -1562,6 +1567,7 @@
.desc()
.list();
if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {
+ node.setTaskId(beforeTasks.get(0).getId());
List<FormDetailVO> l = map.get(beforeTasks.get(0));
if (CollectionUtils.isEmpty(l)) {
map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));
@@ -1585,7 +1591,7 @@
}
// 鍒ゆ柇浠诲姟鏄惁瀛樺湪鐗规畩鎿嶄綔(濡傝烦杩囥�佽浆鍔炵瓑)锛岄渶瑕佸湪鍓嶇灞曠ず鍑烘潵
ProcessLogQuery query = new ProcessLogQuery();
- query.setTaskDefKey(node.getUserTask().getId());
+ query.setTaskId(node.getTaskId());
query.setProcessInsId(processInsId);
Result result = processLogService.projectProcessLogPage(query);
List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
diff --git a/flowable/src/main/java/com/ycl/domain/vo/FormDetailVO.java b/flowable/src/main/java/com/ycl/domain/vo/FormDetailVO.java
index 589c5fc..b39f3e9 100644
--- a/flowable/src/main/java/com/ycl/domain/vo/FormDetailVO.java
+++ b/flowable/src/main/java/com/ycl/domain/vo/FormDetailVO.java
@@ -69,4 +69,9 @@
*
*/
private UserTask userTask;
+
+ /**
+ * 浠诲姟鐨刬d
+ */
+ private String taskId;
}
--
Gitblit v1.8.0