From 945202652af6fc0267a718196104e41fb0caab67 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期三, 27 三月 2024 21:15:42 +0800
Subject: [PATCH] update 调整工作流分页返回参数
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
index f068032..3edf8ec 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
@@ -21,10 +21,7 @@
import org.dromara.workflow.domain.bo.ProcessInstanceBo;
import org.dromara.workflow.domain.bo.ProcessInvalidBo;
import org.dromara.workflow.domain.bo.TaskUrgingBo;
-import org.dromara.workflow.domain.vo.ActHistoryInfoVo;
-import org.dromara.workflow.domain.vo.GraphicInfoVo;
-import org.dromara.workflow.domain.vo.ProcessInstanceVo;
-import org.dromara.workflow.domain.vo.TaskVo;
+import org.dromara.workflow.domain.vo.*;
import org.dromara.workflow.flowable.CustomDefaultProcessDiagramGenerator;
import org.dromara.workflow.flowable.cmd.DeleteExecutionCmd;
import org.dromara.workflow.flowable.cmd.ExecutionChildByExecutionIdCmd;
@@ -128,7 +125,10 @@
WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
}
long count = query.count();
- return new TableDataInfo<>(list, count);
+ TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();
+ build.setRows(list);
+ build.setTotal(count);
+ return build;
}
/**
@@ -167,7 +167,10 @@
WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
}
long count = query.count();
- return new TableDataInfo<>(list, count);
+ TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();
+ build.setRows(list);
+ build.setTotal(count);
+ return build;
}
/**
@@ -669,7 +672,10 @@
WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
}
long count = query.count();
- return new TableDataInfo<>(list, count);
+ TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();
+ build.setRows(list);
+ build.setTotal(count);
+ return build;
}
/**
--
Gitblit v1.9.3