zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-09 04:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Refactoring code. 统一工作流模块查询分页参数

Browse Source
This commit is contained in:
lbw committed 2024-02-29 11:40:22 +08:00
1 parent c3cdc145d5
commit 8dd3c178d4
3 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/controller/EngineFlowController.java
+4 -4
View File
@@ -177,8 +177,8 @@ public class EngineFlowController {
}
List<HistoricActivityInstance> list = activityInstanceQuery.listPage(
(taskQueryParamDto.getPageNum() - 1) * taskQueryParamDto.getPageSize(),
taskQueryParamDto.getPageSize());
(taskQueryParamDto.getCurrent() - 1) * taskQueryParamDto.getSize(),
taskQueryParamDto.getSize());
long count = activityInstanceQuery.count();
List<TaskDto> taskDtoList = new ArrayList<>();
@@ -230,8 +230,8 @@ public class EngineFlowController {
List<TaskDto> taskDtoList = new ArrayList<>();
int pageIndex = taskQueryParamDto.getPageNum() - 1;
int pageSize = taskQueryParamDto.getPageSize();
int pageIndex = taskQueryParamDto.getCurrent() - 1;
int pageSize = taskQueryParamDto.getSize();
Page<TaskDto> pageResultDto = new Page<>();
TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(assign).orderByTaskCreateTime().desc();
pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/dto/TaskQueryParamDto.java
+2 -2
View File
@@ -18,12 +18,12 @@ public class TaskQueryParamDto {
/**
* 页码
*/
private Integer pageNum;
private Integer current;
/**
* 每页的数量
*/
private Integer pageSize;
private Integer size;
/**
* 流程名称
pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessInstanceServiceImpl.java
+2 -2
View File
@@ -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<ProcessCopy> records = page.getRecords();