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"))) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java index 947c748e..86d2602a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java @@ -86,7 +86,7 @@ public class Step5After implements TaskListener { sarStandUnqualified.setProductLine(object.getString("productLine")); sarStandUnqualified.setProductId(object.getString("projectNumber")); sarStandUnqualified.setItemsNum(jsonObject.getString("itemsNum")); - sarStandUnqualified.setStandName(jsonObject.getString("itemsName")); + sarStandUnqualified.setItemsName(jsonObject.getString("itemsName")); standUnqualifieds.add(sarStandUnqualified); } if (null!=jsonObject.getString("remarks") || null!=jsonObject.getString("complianceReasons") || null!= jsonObject.getString("noCompliance")) {