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();