ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化部分代码

Browse Source
This commit is contained in:
hongawen
2025-06-12 15:47:22 +08:00
parent b1a2ccd018
commit e05403bfa7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
View File

@@ -863,7 +863,12 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
prefixCode = scriptCode; prefixCode = scriptCode;
if (PowerConstant.TIME.contains(scriptCode)) { if (PowerConstant.TIME.contains(scriptCode)) {
// 谐波类，以scriptIndex区分 // 谐波类，以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()) { for (List<PqScriptDtlDataVO> scriptDtlDataItem : scriptIndexMap.values()) {
singleTestResult = resultService.getFinalContent(scriptDtlDataItem, devReportParam.getPlanCode(), pqDevVO.getId(), lineNo, tableKeys); singleTestResult = resultService.getFinalContent(scriptDtlDataItem, devReportParam.getPlanCode(), pqDevVO.getId(), lineNo, tableKeys);