diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java index 9da87e0c..774cab9a 100644 --- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java @@ -863,7 +863,12 @@ public class PqReportServiceImpl extends ServiceImpl i prefixCode = scriptCode; if (PowerConstant.TIME.contains(scriptCode)) { // 谐波类,以scriptIndex区分 - Map> scriptIndexMap = dtlScriptItemList.stream().collect(Collectors.groupingBy(PqScriptDtlDataVO::getScriptIndex)); + Map> scriptIndexMap = dtlScriptItemList.stream() + .collect(Collectors.groupingBy( + PqScriptDtlDataVO::getScriptIndex, + TreeMap::new, + Collectors.toList() + )); // 谐波类针对是否第一次还要额外做个处理,因为每个测点需要单独表示 for (List scriptDtlDataItem : scriptIndexMap.values()) { singleTestResult = resultService.getFinalContent(scriptDtlDataItem, devReportParam.getPlanCode(), pqDevVO.getId(), lineNo, tableKeys);