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

代码微调

Browse Source
This commit is contained in:
wr
2025-01-06 20:24:21 +08:00
parent b13d34dcfc
commit a5e4baeb16
2 changed files with 54 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
View File

@@ -168,7 +168,6 @@ public class ResultServiceImpl implements IResultService {
.sorted(Comparator.comparing(PqScriptDtls::getIndex))
.collect(Collectors.groupingBy(PqScriptDtls::getIndex, LinkedHashMap::new, Collectors.toList()));
List<TreeDataVO> subTypeList = new ArrayList<>();
indexMap.forEach((index, scriptDtlIndexList) -> {
if (finalResultMap.containsKey(index)) {
TreeDataVO dtlType = new TreeDataVO();
@@ -179,8 +178,10 @@ public class ResultServiceImpl implements IResultService {
subTypeList.add(dtlType);
}
});
subType.setChildren(subTypeList);
scriptSubList.add(subType);
if (CollUtil.isNotEmpty(subTypeList)) {
subType.setChildren(subTypeList);
scriptSubList.add(subType);
}
} else {
dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压暂降测量准确度测试", 20, 85);
dipScriptTypeName(subValue, scriptSubList, finalResultMap, isValueType, "电压暂升测量准确度测试", 110, 180);
@@ -227,14 +228,20 @@ public class ResultServiceImpl implements IResultService {
}
});
treeDataVO.setChildren(subTypeList);
subSingleList.add(treeDataVO);
if (CollUtil.isNotEmpty(subTypeList)) {
treeDataVO.setChildren(subTypeList);
subSingleList.add(treeDataVO);
}
});
subType.setChildren(subSingleList);
scriptSubList.add(subType);
if (CollUtil.isNotEmpty(subSingleList)) {
subType.setChildren(subSingleList);
scriptSubList.add(subType);
}
}
if (CollUtil.isNotEmpty(scriptSubList)) {
infoVO.setChildren(scriptSubList);
infoVOS.add(infoVO);
}
infoVO.setChildren(scriptSubList);
infoVOS.add(infoVO);
}
});
return infoVOS;
@@ -263,8 +270,10 @@ public class ResultServiceImpl implements IResultService {
}
}
vo.setChildren(info);
subTypeList.add(vo);
if (CollUtil.isNotEmpty(info)) {
vo.setChildren(info);
subTypeList.add(vo);
}
}
private void ratedScriptTypeName(List<PqScriptDtls> scriptDtlIndexList, Boolean isValueType, TreeDataVO dtlType, DictTree dictTree) {