From f6ddf25a007e2c668025c9f679af12ec69f5da1c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 21 Mar 2022 09:49:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/business_activiti/task/TaskController.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index e35459f9..47b514d0 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -88,8 +88,16 @@ public class TaskController { queryWrapper.eq("PRC_NUM",prcNum); BusProcessName one = iBusProcessNameService.getOne(queryWrapper); HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() - .processInstanceId(one.getPrcId()).orderByTaskCreateTime().asc(); + .processInstanceId(one.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); List list2 = historicTaskInstanceQuery.list(); + List middle =new ArrayList<>(); + list2.forEach(historicTaskInstance -> { + if (null==historicTaskInstance.getEndTime()){ + middle.add(historicTaskInstance); + } + }); + list2.removeAll(middle); + list2.addAll(middle); List> list = ActivitiTools.turnHistoricTaskInstance(list2); for (Map historicTaskInstance : list) { // if(ChkUtil.isNull(historicTaskInstance.get("assignee"))) {