|
|
|
@ -417,7 +417,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
|
.startedBy(userId.toString())
|
|
|
|
|
.orderByProcessInstanceStartTime()
|
|
|
|
|
.desc();
|
|
|
|
|
List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery.listPage(pageNum - 1, pageSize);
|
|
|
|
|
List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery.listPage(pageSize * (pageNum - 1), pageSize);
|
|
|
|
|
page.setTotal(historicProcessInstanceQuery.count());
|
|
|
|
|
List<FlowTaskDto> flowList = new ArrayList<>();
|
|
|
|
|
for (HistoricProcessInstance hisIns : historicProcessInstances) {
|
|
|
|
@ -570,7 +570,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
|
// .taskAssignee(userId.toString())
|
|
|
|
|
.orderByTaskCreateTime().desc();
|
|
|
|
|
page.setTotal(taskQuery.count());
|
|
|
|
|
List<Task> taskList = taskQuery.listPage(pageNum - 1, pageSize);
|
|
|
|
|
List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);
|
|
|
|
|
List<FlowTaskDto> flowList = new ArrayList<>();
|
|
|
|
|
for (Task task : taskList) {
|
|
|
|
|
FlowTaskDto flowTask = new FlowTaskDto();
|
|
|
|
@ -623,7 +623,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
|
.taskAssignee(userId.toString())
|
|
|
|
|
.orderByHistoricTaskInstanceEndTime()
|
|
|
|
|
.desc();
|
|
|
|
|
List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(pageNum - 1, pageSize);
|
|
|
|
|
List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(pageSize * (pageNum - 1), pageSize);
|
|
|
|
|
List<FlowTaskDto> hisTaskList = Lists.newArrayList();
|
|
|
|
|
for (HistoricTaskInstance histTask : historicTaskInstanceList) {
|
|
|
|
|
FlowTaskDto flowTask = new FlowTaskDto();
|
|
|
|
@ -657,7 +657,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
|
flowTask.setStartDeptName(startUser.getDept().getDeptName());
|
|
|
|
|
hisTaskList.add(flowTask);
|
|
|
|
|
}
|
|
|
|
|
page.setTotal(hisTaskList.size());
|
|
|
|
|
page.setTotal(taskInstanceQuery.count());
|
|
|
|
|
page.setRecords(hisTaskList);
|
|
|
|
|
// Map<String, Object> result = new HashMap<>();
|
|
|
|
|
// result.put("result",page);
|
|
|
|
|