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

This commit is contained in:
lbw committed 2024-02-29 11:42:49 +08:00
1 parent f678bb5c8c
commit 53d273c9bc
3 files changed
+8 -8

No files matched your search

@@ -166,8 +166,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<>();
@@ -219,8 +219,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();
@@ -18,12 +18,12 @@ public class TaskQueryParamDto {
/**
* 页码
*/
private Integer pageNum;
private Integer current;
/**
* 每页的数量
*/
private Integer pageSize;
private Integer size;
/**
* 流程名称
@@ -224,7 +224,7 @@ public class ProcessInstanceServiceImpl implements IProcessInstanceService {
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);
}
@@ -244,7 +244,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();