DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix -- 修复流程模块分页错误bug

Browse Source
This commit is contained in:
konbai
2022-03-01 21:17:25 +08:00
parent c4d7f300bf
commit 994de50e9d
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowDefinitionServiceImpl.java
View File

@@ -74,7 +74,8 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
if (pageTotal <= 0) { if (pageTotal <= 0) {
return TableDataInfo.build(); return TableDataInfo.build();
} }
List<ProcessDefinition> definitionList = processDefinitionQuery.listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize()); int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
List<ProcessDefinition> definitionList = processDefinitionQuery.listPage(offset, pageQuery.getPageSize());
List<FlowDefinitionVo> definitionVoList = new ArrayList<>(); List<FlowDefinitionVo> definitionVoList = new ArrayList<>();
for (ProcessDefinition processDefinition : definitionList) { for (ProcessDefinition processDefinition : definitionList) {
@@ -115,8 +116,9 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
return TableDataInfo.build(); return TableDataInfo.build();
} }
// 根据查询条件，查询所有版本 // 根据查询条件，查询所有版本
int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
List<ProcessDefinition> processDefinitionList = processDefinitionQuery List<ProcessDefinition> processDefinitionList = processDefinitionQuery
.listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize()); .listPage(offset, pageQuery.getPageSize());
List<FlowDefinitionVo> flowDefinitionVoList = processDefinitionList.stream().map(item -> { List<FlowDefinitionVo> flowDefinitionVoList = processDefinitionList.stream().map(item -> {
FlowDefinitionVo vo = new FlowDefinitionVo(); FlowDefinitionVo vo = new FlowDefinitionVo();
vo.setDefinitionId(item.getId()); vo.setDefinitionId(item.getId());

11
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
View File

@@ -420,8 +420,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
.startedBy(userId.toString()) .startedBy(userId.toString())
.orderByProcessInstanceStartTime() .orderByProcessInstanceStartTime()
.desc(); .desc();
int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery
.listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize()); .listPage(offset, pageQuery.getPageSize());
page.setTotal(historicProcessInstanceQuery.count()); page.setTotal(historicProcessInstanceQuery.count());
List<FlowTaskDto> flowList = new ArrayList<>(); List<FlowTaskDto> flowList = new ArrayList<>();
for (HistoricProcessInstance hisIns : historicProcessInstances) { for (HistoricProcessInstance hisIns : historicProcessInstances) {
@@ -564,7 +565,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
.taskCandidateOrAssigned(userId.toString()) .taskCandidateOrAssigned(userId.toString())
.orderByTaskCreateTime().desc(); .orderByTaskCreateTime().desc();
page.setTotal(taskQuery.count()); page.setTotal(taskQuery.count());
List<Task> taskList = taskQuery.listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize()); int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
List<Task> taskList = taskQuery.listPage(offset, pageQuery.getPageSize());
List<FlowTaskDto> flowList = new ArrayList<>(); List<FlowTaskDto> flowList = new ArrayList<>();
for (Task task : taskList) { for (Task task : taskList) {
FlowTaskDto flowTask = new FlowTaskDto(); FlowTaskDto flowTask = new FlowTaskDto();
@@ -615,7 +617,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
.taskAssignee(userId.toString()) .taskAssignee(userId.toString())
.orderByHistoricTaskInstanceEndTime() .orderByHistoricTaskInstanceEndTime()
.desc(); .desc();
List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize()); int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(offset, pageQuery.getPageSize());
List<FlowTaskDto> hisTaskList = Lists.newArrayList(); List<FlowTaskDto> hisTaskList = Lists.newArrayList();
for (HistoricTaskInstance histTask : historicTaskInstanceList) { for (HistoricTaskInstance histTask : historicTaskInstanceList) {
FlowTaskDto flowTask = new FlowTaskDto(); FlowTaskDto flowTask = new FlowTaskDto();
@@ -649,7 +652,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
flowTask.setStartDeptName(startUser.getDept().getDeptName()); flowTask.setStartDeptName(startUser.getDept().getDeptName());
hisTaskList.add(flowTask); hisTaskList.add(flowTask);
} }
page.setTotal(hisTaskList.size()); page.setTotal(taskInstanceQuery.count());
page.setRecords(hisTaskList); page.setRecords(hisTaskList);
// Map<String, Object> result = new HashMap<>(); // Map<String, Object> result = new HashMap<>();
// result.put("result",page); // result.put("result",page);