xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-04 08:13:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 调整工作流分页返回参数

Browse Source
This commit is contained in:
gssong
2024-03-27 21:15:42 +08:00
parent 6954fdec0a
commit 945202652a
4 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
View File

@@ -82,7 +82,10 @@ public class ActModelServiceImpl implements IActModelService {
List<Model> modelList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
// 总记录数
long total = query.count();
return new TableDataInfo<>(modelList, total);
TableDataInfo<Model> build = TableDataInfo.build();
build.setRows(modelList);
build.setTotal(total);
return build;
}
/**

6
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
View File

@@ -102,8 +102,10 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
}
// 总记录数
long total = query.count();
return new TableDataInfo<>(processDefinitionVoList, total);
TableDataInfo<ProcessDefinitionVo> build = TableDataInfo.build();
build.setRows(processDefinitionVoList);
build.setTotal(total);
return build;
}
/**

20
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
View File

@@ -21,10 +21,7 @@ import org.dromara.workflow.domain.ActHiProcinst;
import org.dromara.workflow.domain.bo.ProcessInstanceBo;
import org.dromara.workflow.domain.bo.ProcessInvalidBo;
import org.dromara.workflow.domain.bo.TaskUrgingBo;
import org.dromara.workflow.domain.vo.ActHistoryInfoVo;
import org.dromara.workflow.domain.vo.GraphicInfoVo;
import org.dromara.workflow.domain.vo.ProcessInstanceVo;
import org.dromara.workflow.domain.vo.TaskVo;
import org.dromara.workflow.domain.vo.*;
import org.dromara.workflow.flowable.CustomDefaultProcessDiagramGenerator;
import org.dromara.workflow.flowable.cmd.DeleteExecutionCmd;
import org.dromara.workflow.flowable.cmd.ExecutionChildByExecutionIdCmd;
@@ -128,7 +125,10 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
}
long count = query.count();
return new TableDataInfo<>(list, count);
TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();
build.setRows(list);
build.setTotal(count);
return build;
}
/**
@@ -167,7 +167,10 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
}
long count = query.count();
return new TableDataInfo<>(list, count);
TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();
build.setRows(list);
build.setTotal(count);
return build;
}
/**
@@ -669,7 +672,10 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
}
long count = query.count();
return new TableDataInfo<>(list, count);
TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();
build.setRows(list);
build.setTotal(count);
return build;
}
/**

18
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
View File

@@ -22,10 +22,7 @@ import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.ActHiTaskinst;
import org.dromara.workflow.domain.WfTaskBackNode;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.MultiInstanceVo;
import org.dromara.workflow.domain.vo.TaskVo;
import org.dromara.workflow.domain.vo.VariableVo;
import org.dromara.workflow.domain.vo.WfCopy;
import org.dromara.workflow.domain.vo.*;
import org.dromara.workflow.flowable.cmd.*;
import org.dromara.workflow.flowable.strategy.FlowEventStrategy;
import org.dromara.workflow.flowable.strategy.FlowProcessEventHandler;
@@ -284,7 +281,7 @@ public class ActTaskServiceImpl implements IActTaskService {
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
return new TableDataInfo<>(taskList, page.getTotal());
return TableDataInfo.build(page);
}
private String getInParam(List<String> param) {
@@ -346,7 +343,10 @@ public class ActTaskServiceImpl implements IActTaskService {
WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
}
long count = query.count();
return new TableDataInfo<>(list, count);
TableDataInfo<TaskVo> build = TableDataInfo.build();
build.setRows(list);
build.setTotal(count);
return build;
}
/**
@@ -372,7 +372,7 @@ public class ActTaskServiceImpl implements IActTaskService {
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
return new TableDataInfo<>(taskList, page.getTotal());
return TableDataInfo.build(page);
}
/**
@@ -404,7 +404,7 @@ public class ActTaskServiceImpl implements IActTaskService {
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
return new TableDataInfo<>(taskList, page.getTotal());
return TableDataInfo.build(page);
}
/**
@@ -428,7 +428,7 @@ public class ActTaskServiceImpl implements IActTaskService {
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
return new TableDataInfo<>(taskList, page.getTotal());
return TableDataInfo.build(page);
}
/**