From 8e24ac4b714bbee8127909114725ef5907f4850a Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Thu, 22 Jan 2026 15:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=8D=95=E7=8B=AC=E9=85=8D?= =?UTF-8?q?=E7=BD=AEBC=E6=9A=82=E6=80=81=E6=97=B6=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E6=A0=91=E5=BD=A2=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/service/impl/ResultServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index 6ebd0849..b47e36de 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -341,10 +341,19 @@ public class ResultServiceImpl implements IResultService { private void dipScriptTypeName(List subValue, List subTypeList, Map> finalResultMap, Boolean isValueType, String name, Integer start, Integer end) { List info = new ArrayList<>(); List dip = subValue.stream() - .filter(x -> "Dip".equals(x.getValueType()) && "A".equals(x.getPhase())) +// .filter(x -> "Dip".equals(x.getValueType()) && "A".equals(x.getPhase())) + .filter(x -> "Dip".equals(x.getValueType())) .filter(x -> x.getTransValue() >= start && x.getTransValue() <= end) .sorted(Comparator.comparing(PqScriptDtls::getScriptIndex)) .collect(Collectors.toList()); + LinkedHashMap> idxDipMap = dip.stream().collect(Collectors.groupingBy(d -> d.getScriptIndex(), LinkedHashMap::new, Collectors.toList())); + + dip.clear(); + idxDipMap.forEach((idx, scriptDtlList) -> { + scriptDtlList.sort(Comparator.comparing(PqScriptDtls::getPhase)); + dip.add(scriptDtlList.get(0)); + }); + TreeDataVO vo = new TreeDataVO(); vo.setScriptTypeName(name); vo.setScriptTypeCode("Base_" + start + "_" + end); @@ -1883,7 +1892,7 @@ public class ResultServiceImpl implements IResultService { } @Override - public List getCheckItem(String planId, String devId, String chnNum, Integer num,String code) { + public List getCheckItem(String planId, String devId, String chnNum, Integer num, String code) { // PqDev dev = pqDevService.getById(devId); AdPlan plan = adPlanService.getById(planId); // String code = String.valueOf(plan.getCode());