From 7596e473c8ccafe615d956e0e6b66effb46d0c86 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Mon, 16 Dec 2024 17:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/controller/ProcessInstanceController.java | 7 ++++--- .../com/wflow/workflow/service/ProcessInstanceService.java | 2 +- .../workflow/service/impl/ProcessInstanceServiceImpl.java | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/wflow/workflow/controller/ProcessInstanceController.java b/src/main/java/com/wflow/workflow/controller/ProcessInstanceController.java index c815564..dd5d003 100644 --- a/src/main/java/com/wflow/workflow/controller/ProcessInstanceController.java +++ b/src/main/java/com/wflow/workflow/controller/ProcessInstanceController.java @@ -73,7 +73,7 @@ public class ProcessInstanceController { @RequestParam(required = false) String fieldId, @RequestParam(required = false) String fieldVal, @RequestParam(required = false) String key) { - return R.ok(processService.getUserSubmittedList(pageSize, pageNo, UserUtil.getLoginUserId(), code, + return R.ok(processService.getUserSubmittedList(pageSize, pageNo, UserUtil.getLoginUserId(), null, code, finished, startTimes, keyword, fieldId, fieldVal, key)); } @@ -96,8 +96,9 @@ public class ProcessInstanceController { @RequestParam(required = false) String fieldId, @RequestParam(required = false) String fieldVal, @RequestParam(required = false) String startUser, - @RequestParam(required = false) String key) { - return R.ok(processService.getUserSubmittedList(pageSize, pageNo, startUser, code, + @RequestParam(required = false) String key, + @RequestParam(required = false) String processInstanceId) { + return R.ok(processService.getUserSubmittedList(pageSize, pageNo, processInstanceId, startUser, code, finished, startTimes, keyword, fieldId, fieldVal, key)); } diff --git a/src/main/java/com/wflow/workflow/service/ProcessInstanceService.java b/src/main/java/com/wflow/workflow/service/ProcessInstanceService.java index e9d5227..b9318e9 100644 --- a/src/main/java/com/wflow/workflow/service/ProcessInstanceService.java +++ b/src/main/java/com/wflow/workflow/service/ProcessInstanceService.java @@ -23,7 +23,7 @@ public interface ProcessInstanceService { List getProcessInstanceTaskList(String instanceId); - Page getUserSubmittedList(Integer pageSize, Integer pageNo, String startUser, String code, + Page getUserSubmittedList(Integer pageSize, Integer pageNo, String processInstanceId, String startUser, String code, Boolean finished, String[] startTimes, String keyword, String fieldId, String fieldVal, String key); diff --git a/src/main/java/com/wflow/workflow/service/impl/ProcessInstanceServiceImpl.java b/src/main/java/com/wflow/workflow/service/impl/ProcessInstanceServiceImpl.java index b81387e..6e50ee5 100644 --- a/src/main/java/com/wflow/workflow/service/impl/ProcessInstanceServiceImpl.java +++ b/src/main/java/com/wflow/workflow/service/impl/ProcessInstanceServiceImpl.java @@ -426,12 +426,13 @@ public class ProcessInstanceServiceImpl implements ProcessInstanceService { } @Override - public Page getUserSubmittedList(Integer pageSize, Integer pageNo, String startUser, String code, + public Page getUserSubmittedList(Integer pageSize, Integer pageNo, String processInstanceId, String startUser, String code, Boolean finished, String[] startTimes, String keyword, String fieldId, String fieldVal, String key) { HistoricProcessInstanceQuery instanceQuery = historyService.createHistoricProcessInstanceQuery(); //TODO 多租户 instanceQuery.processInstanceTenantId(TenantContextHolder.getTenantId()); Executor.builder() + .ifNotBlankNext(processInstanceId, instanceQuery::processInstanceId) .ifNotBlankNext(startUser, instanceQuery::startedBy) .ifNotBlankNext(code, instanceQuery::processDefinitionKey) .ifTrueNext(null != startTimes && startTimes.length > 1, () -> {