From f8ce7aa161ef2ef316357ead8208bc60de938ead Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 三月 2025 09:36:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 47599e1..af1da78 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -73,7 +73,6 @@
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springframework.beans.BeanUtils;
import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -1478,7 +1477,7 @@
ProcessLogQuery query = new ProcessLogQuery();
query.setTaskId(node.getTaskId());
query.setProcessInsId(finalProcessInsId);
- Result result = processLogService.projectProcessLogPage(query);
+ Result result = processLogService.projectProcessLogList(query);
List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
DoFormDetailVO vo = new DoFormDetailVO();
BeanUtils.copyProperties(node, vo);
@@ -1557,7 +1556,7 @@
ProcessLogQuery query = new ProcessLogQuery();
query.setTaskId(node.getTaskId());
query.setProcessInsId(hisTask.getProcessInstanceId());
- Result result = processLogService.projectProcessLogPage(query);
+ Result result = processLogService.projectProcessLogList(query);
List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
DoFormDetailVO vo = new DoFormDetailVO();
BeanUtils.copyProperties(node, vo);
@@ -1628,7 +1627,7 @@
ProcessLogQuery query = new ProcessLogQuery();
query.setTaskId(node.getTaskId());
query.setProcessInsId(processInsId);
- Result result = processLogService.projectProcessLogPage(query);
+ Result result = processLogService.projectProcessLogList(query);
List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
DoFormDetailVO vo = new DoFormDetailVO();
BeanUtils.copyProperties(node, vo);
--
Gitblit v1.8.0