Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理分页问题

Browse Source
This commit is contained in:
wanggeng 2022-09-14 15:03:19 +08:00
parent a5632aa299
commit 1ed690ca61
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiProcdefServiceImpl.java
View File

@ -45,7 +45,7 @@ public class ActivitiProcdefServiceImpl extends DefaultBaseService implements IA
@Override @Override
public SuccessResultList<List<ActivitiProcdefDTO>> listPage(int page, int rows) { public SuccessResultList<List<ActivitiProcdefDTO>> listPage(int page, int rows) {
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery(); ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery();
List<ProcessDefinition> processDefinitions = processDefinitionQuery.orderByDeploymentId().asc().listPage(page - 1, rows); List<ProcessDefinition> processDefinitions = processDefinitionQuery.orderByDeploymentId().asc().listPage((page - 1) * rows, rows);
List<ActivitiProcdefDTO> activitiProcdefDTOs = new ArrayList<>(); List<ActivitiProcdefDTO> activitiProcdefDTOs = new ArrayList<>();
processDefinitions.forEach(processDefinition -> { processDefinitions.forEach(processDefinition -> {

4
module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java
View File

@ -167,7 +167,7 @@ public class ActivitiServiceImpl extends DefaultBaseService implements IActiviti
@Override @Override
public SuccessResultList<List<ModelDTO>> listPage(int page, int rows) { public SuccessResultList<List<ModelDTO>> listPage(int page, int rows) {
ModelQuery modelQuery = repositoryService.createModelQuery(); ModelQuery modelQuery = repositoryService.createModelQuery();
List<Model> models = modelQuery.orderByCreateTime().desc().listPage(page - 1, rows); List<Model> models = modelQuery.orderByCreateTime().desc().listPage((page - 1) * rows, rows);
return new SuccessResultList<>(listModelDTO(models), page, modelQuery.count()); return new SuccessResultList<>(listModelDTO(models), page, modelQuery.count());
} }
@ -177,7 +177,7 @@ public class ActivitiServiceImpl extends DefaultBaseService implements IActiviti
return listPage(page, rows); return listPage(page, rows);
} }
ModelQuery modelQuery = repositoryService.createModelQuery(); ModelQuery modelQuery = repositoryService.createModelQuery();
List<Model> models = modelQuery.modelCategory(modelCategory).orderByCreateTime().desc().listPage(page - 1, rows); List<Model> models = modelQuery.modelCategory(modelCategory).orderByCreateTime().desc().listPage((page - 1) * rows, rows);
return new SuccessResultList<>(listModelDTO(models), page, modelQuery.count()); return new SuccessResultList<>(listModelDTO(models), page, modelQuery.count());
} }

6
module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaServiceImpl.java
View File

@ -84,7 +84,7 @@ public class OaServiceImpl extends DefaultBaseService implements IOaService {
@Override @Override
public SuccessResultList<List<OaProcdefDTO>> listPageProcdef(int page, int rows) { public SuccessResultList<List<OaProcdefDTO>> listPageProcdef(int page, int rows) {
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery(); ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery();
List<ProcessDefinition> processDefinitions = processDefinitionQuery.latestVersion().listPage(page - 1, rows); List<ProcessDefinition> processDefinitions = processDefinitionQuery.latestVersion().listPage((page - 1) * rows, rows);
List<OaProcdefDTO> oaProcdefDTOs = listOaProcdef(processDefinitions); List<OaProcdefDTO> oaProcdefDTOs = listOaProcdef(processDefinitions);
return new SuccessResultList<>(oaProcdefDTOs, page, processDefinitionQuery.count()); return new SuccessResultList<>(oaProcdefDTOs, page, processDefinitionQuery.count());
} }
@ -181,7 +181,7 @@ public class OaServiceImpl extends DefaultBaseService implements IOaService {
@Override @Override
public SuccessResultList<List<OaTaskDTO>> listPageTaskByUserId(String userId, int page, int rows) { public SuccessResultList<List<OaTaskDTO>> listPageTaskByUserId(String userId, int page, int rows) {
TaskQuery taskQuery = taskService.createTaskQuery().taskCandidateOrAssigned(userId); TaskQuery taskQuery = taskService.createTaskQuery().taskCandidateOrAssigned(userId);
List<Task> tasks = taskQuery.includeProcessVariables().orderByTaskCreateTime().desc().listPage(page - 1, rows); List<Task> tasks = taskQuery.includeProcessVariables().orderByTaskCreateTime().desc().listPage((page - 1) * rows, rows);
List<OaTaskDTO> oaTaskDTOs = listOaTask(tasks); List<OaTaskDTO> oaTaskDTOs = listOaTask(tasks);
return new SuccessResultList<>(oaTaskDTOs, page, taskQuery.count()); return new SuccessResultList<>(oaTaskDTOs, page, taskQuery.count());
} }
@ -272,7 +272,7 @@ public class OaServiceImpl extends DefaultBaseService implements IOaService {
@Override @Override
public SuccessResultList<List<OaHistoryTaskDTO>> listPageHistoryTaskByUserId(String userId, int page, int rows) { public SuccessResultList<List<OaHistoryTaskDTO>> listPageHistoryTaskByUserId(String userId, int page, int rows) {
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId); HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId);
List<HistoricTaskInstance> historicTaskInstances = historicTaskInstanceQuery.includeProcessVariables().finished().orderByHistoricTaskInstanceEndTime().desc().listPage(page - 1, rows); List<HistoricTaskInstance> historicTaskInstances = historicTaskInstanceQuery.includeProcessVariables().finished().orderByHistoricTaskInstanceEndTime().desc().listPage((page - 1) * rows, rows);
List<OaHistoryTaskDTO> oaHistoryTaskDTOs = listOaHistoryTask(historicTaskInstances); List<OaHistoryTaskDTO> oaHistoryTaskDTOs = listOaHistoryTask(historicTaskInstances);
return new SuccessResultList<>(oaHistoryTaskDTOs, page, historicTaskInstanceQuery.count()); return new SuccessResultList<>(oaHistoryTaskDTOs, page, historicTaskInstanceQuery.count());
} }