From 8536616ae005ac025e23b9cf61bba5b49c89cb3a Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 2 Jul 2024 11:32:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmgl/modules/xz/controller/XzFlowController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzFlowController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzFlowController.java index c7851b1c9..7fb1a7a33 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzFlowController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzFlowController.java @@ -197,14 +197,12 @@ public class XzFlowController { total.put("running", processInstanceVos.stream().filter(l -> l.getFinishTime() == null).count()); total.put("complete", processInstanceVos.stream().filter(l -> l.getFinishTime() != null).count()); resultMap.put("total", total); - List formIds = wflowModels.stream().map(p -> p.getFormId()).collect(Collectors.toList()); List> resultList = new ArrayList<>(); - for (String formId : formIds) { + for (WflowModels wflowModel : wflowModels) { Map map = new HashMap<>(); - List collect = wflowModelHistorys.stream().filter(w -> w.getFormId().equals(formId)).collect(Collectors.toList()); - map.put("name", collect.get(collect.size() - 1).getFormName()); - List typeList = processInstanceVos.stream().filter(p -> p.getFormId().equals(formId)).collect(Collectors.toList()); - long count = processInstanceVos.stream().filter(p -> p.getFormId().equals(formId)).count(); + map.put("name", wflowModel.getFormName()); + List typeList = processInstanceVos.stream().filter(p -> p.getFormId().equals(wflowModel.getFormId())).collect(Collectors.toList()); + long count = processInstanceVos.stream().filter(p -> p.getFormId().equals(wflowModel.getFormId())).count(); int number = (int) count; map.put("num", number); map.put("ratio", processInstanceVos.size() == 0 ? 0 : new BigDecimal(number).divide(new BigDecimal(processInstanceVos.size()), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)));