From 8dd3c178d457e1d96aedd47683655d4ba198152b Mon Sep 17 00:00:00 2001 From: lbw Date: Thu, 29 Feb 2024 11:36:08 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1=E5=9D=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/flow/engine/controller/EngineFlowController.java | 8 ++++---- .../pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java | 4 ++-- .../task/service/impl/ProcessInstanceServiceImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java index 0d98c83fe..1708d02b6 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java @@ -177,8 +177,8 @@ public class EngineFlowController { } List list = activityInstanceQuery.listPage( - (taskQueryParamDto.getPageNum() - 1) * taskQueryParamDto.getPageSize(), - taskQueryParamDto.getPageSize()); + (taskQueryParamDto.getCurrent() - 1) * taskQueryParamDto.getSize(), + taskQueryParamDto.getSize()); long count = activityInstanceQuery.count(); List taskDtoList = new ArrayList<>(); @@ -230,8 +230,8 @@ public class EngineFlowController { List taskDtoList = new ArrayList<>(); - int pageIndex = taskQueryParamDto.getPageNum() - 1; - int pageSize = taskQueryParamDto.getPageSize(); + int pageIndex = taskQueryParamDto.getCurrent() - 1; + int pageSize = taskQueryParamDto.getSize(); Page pageResultDto = new Page<>(); TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(assign).orderByTaskCreateTime().desc(); diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java index f05afebfe..349135269 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java @@ -18,12 +18,12 @@ public class TaskQueryParamDto { /** * 页码 */ - private Integer pageNum; + private Integer current; /** * 每页的数量 */ - private Integer pageSize; + private Integer size; /** * 流程名称 diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java index 431f4771a..20293b927 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java @@ -239,7 +239,7 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService { ArrayUtil.isNotEmpty(taskQueryParamDto.getTaskTime()) ? taskQueryParamDto.getTaskTime()[0] : null, ArrayUtil.isNotEmpty(taskQueryParamDto.getTaskTime()) ? taskQueryParamDto.getTaskTime()[1] : null) .orderByDesc(ProcessInstanceRecord::getCreateTime) - .page(new Page<>(taskQueryParamDto.getPageNum(), taskQueryParamDto.getPageSize())); + .page(new Page<>(taskQueryParamDto.getCurrent(), taskQueryParamDto.getSize())); return R.ok(instanceRecordPage); } @@ -260,7 +260,7 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService { ArrayUtil.isNotEmpty(taskQueryParamDto.getTaskTime()) ? taskQueryParamDto.getTaskTime()[0] : null, ArrayUtil.isNotEmpty(taskQueryParamDto.getTaskTime()) ? taskQueryParamDto.getTaskTime()[1] : null) .orderByDesc(ProcessCopy::getNodeTime) - .page(new Page<>(taskQueryParamDto.getPageNum(), taskQueryParamDto.getPageSize())); + .page(new Page<>(taskQueryParamDto.getCurrent(), taskQueryParamDto.getSize())); List records = page.getRecords();