From 945202652af6fc0267a718196104e41fb0caab67 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Wed, 27 Mar 2024 21:15:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E5=88=86=E9=A1=B5=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ActModelServiceImpl.java | 5 ++++- .../impl/ActProcessDefinitionServiceImpl.java | 6 ++++-- .../impl/ActProcessInstanceServiceImpl.java | 20 ++++++++++++------- .../service/impl/ActTaskServiceImpl.java | 18 ++++++++--------- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java index 62a4a0945..e070dfd14 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java @@ -82,7 +82,10 @@ public class ActModelServiceImpl implements IActModelService { List modelList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize()); // 总记录数 long total = query.count(); - return new TableDataInfo<>(modelList, total); + TableDataInfo build = TableDataInfo.build(); + build.setRows(modelList); + build.setTotal(total); + return build; } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java index 52390f5b6..dafbad64f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java @@ -102,8 +102,10 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer } // 总记录数 long total = query.count(); - - return new TableDataInfo<>(processDefinitionVoList, total); + TableDataInfo build = TableDataInfo.build(); + build.setRows(processDefinitionVoList); + build.setTotal(total); + return build; } /** 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 f068032dc..3edf8ec0b 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.ActHiProcinst; 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 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID); } long count = query.count(); - return new TableDataInfo<>(list, count); + TableDataInfo build = TableDataInfo.build(); + build.setRows(list); + build.setTotal(count); + return build; } /** @@ -167,7 +167,10 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID); } long count = query.count(); - return new TableDataInfo<>(list, count); + TableDataInfo build = TableDataInfo.build(); + build.setRows(list); + build.setTotal(count); + return build; } /** @@ -669,7 +672,10 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID); } long count = query.count(); - return new TableDataInfo<>(list, count); + TableDataInfo build = TableDataInfo.build(); + build.setRows(list); + build.setTotal(count); + return build; } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java index 0d584c869..58c7b8a54 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java @@ -22,10 +22,7 @@ import org.dromara.workflow.common.enums.TaskStatusEnum; import org.dromara.workflow.domain.ActHiTaskinst; import org.dromara.workflow.domain.WfTaskBackNode; import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.MultiInstanceVo; -import org.dromara.workflow.domain.vo.TaskVo; -import org.dromara.workflow.domain.vo.VariableVo; -import org.dromara.workflow.domain.vo.WfCopy; +import org.dromara.workflow.domain.vo.*; import org.dromara.workflow.flowable.cmd.*; import org.dromara.workflow.flowable.strategy.FlowEventStrategy; import org.dromara.workflow.flowable.strategy.FlowProcessEventHandler; @@ -284,7 +281,7 @@ public class ActTaskServiceImpl implements IActTaskService { List processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId); WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID); } - return new TableDataInfo<>(taskList, page.getTotal()); + return TableDataInfo.build(page); } private String getInParam(List param) { @@ -346,7 +343,10 @@ public class ActTaskServiceImpl implements IActTaskService { WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID); } long count = query.count(); - return new TableDataInfo<>(list, count); + TableDataInfo build = TableDataInfo.build(); + build.setRows(list); + build.setTotal(count); + return build; } /** @@ -372,7 +372,7 @@ public class ActTaskServiceImpl implements IActTaskService { List processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId); WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID); } - return new TableDataInfo<>(taskList, page.getTotal()); + return TableDataInfo.build(page); } /** @@ -404,7 +404,7 @@ public class ActTaskServiceImpl implements IActTaskService { List processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId); WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID); } - return new TableDataInfo<>(taskList, page.getTotal()); + return TableDataInfo.build(page); } /** @@ -428,7 +428,7 @@ public class ActTaskServiceImpl implements IActTaskService { List processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId); WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID); } - return new TableDataInfo<>(taskList, page.getTotal()); + return TableDataInfo.build(page); } /**