优化部分代码

This commit is contained in:
2025-06-12 15:47:22 +08:00
parent b1a2ccd018
commit e05403bfa7

View File

@@ -863,7 +863,12 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
prefixCode = scriptCode;
if (PowerConstant.TIME.contains(scriptCode)) {
// 谐波类以scriptIndex区分
Map<Integer, List<PqScriptDtlDataVO>> scriptIndexMap = dtlScriptItemList.stream().collect(Collectors.groupingBy(PqScriptDtlDataVO::getScriptIndex));
Map<Integer, List<PqScriptDtlDataVO>> scriptIndexMap = dtlScriptItemList.stream()
.collect(Collectors.groupingBy(
PqScriptDtlDataVO::getScriptIndex,
TreeMap::new,
Collectors.toList()
));
// 谐波类针对是否第一次还要额外做个处理,因为每个测点需要单独表示
for (List<PqScriptDtlDataVO> scriptDtlDataItem : scriptIndexMap.values()) {
singleTestResult = resultService.getFinalContent(scriptDtlDataItem, devReportParam.getPlanCode(), pqDevVO.getId(), lineNo, tableKeys);