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

fix(办公管理): 修复 办公管理流程搜索方法

Browse Source
This commit is contained in:
konbai
2022-12-18 18:19:12 +08:00
parent 209606e913
commit 81648374f2
9 changed files with 151 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java
View File

@@ -41,8 +41,8 @@ public class WfProcessController extends BaseController {
*/
@GetMapping(value = "/list")
@SaCheckPermission("workflow:process:startList")
public TableDataInfo<WfDefinitionVo> list(PageQuery pageQuery) {
return processService.processList(pageQuery);
public TableDataInfo<WfDefinitionVo> list(ProcessQuery processQuery, PageQuery pageQuery) {
return processService.processList(processQuery, pageQuery);
}
/**
@@ -96,24 +96,20 @@ public class WfProcessController extends BaseController {
/**
* 我拥有的流程
*
* @param pageQuery 分页参数
*/
@SaCheckPermission("workflow:process:ownList")
@GetMapping(value = "/ownList")
public TableDataInfo<WfTaskVo> ownProcess(PageQuery pageQuery) {
return processService.queryPageOwnProcessList(pageQuery);
public TableDataInfo<WfTaskVo> ownProcess(ProcessQuery processQuery, PageQuery pageQuery) {
return processService.queryPageOwnProcessList(processQuery, pageQuery);
}
/**
* 获取待办列表
*
* @param pageQuery 分页参数
*/
@SaCheckPermission("workflow:process:todoList")
@GetMapping(value = "/todoList")
public TableDataInfo<WfTaskVo> todoProcess(PageQuery pageQuery) {
return processService.queryPageTodoProcessList(pageQuery);
public TableDataInfo<WfTaskVo> todoProcess(ProcessQuery processQuery, PageQuery pageQuery) {
return processService.queryPageTodoProcessList(processQuery, pageQuery);
}
/**
@@ -135,8 +131,8 @@ public class WfProcessController extends BaseController {
*/
@SaCheckPermission("workflow:process:finishedList")
@GetMapping(value = "/finishedList")
public TableDataInfo<WfTaskVo> finishedProcess(PageQuery pageQuery) {
return processService.queryPageFinishedProcessList(pageQuery);
public TableDataInfo<WfTaskVo> finishedProcess(ProcessQuery processQuery, PageQuery pageQuery) {
return processService.queryPageFinishedProcessList(processQuery, pageQuery);
}
/**