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

脚本单独配置BC暂态时左侧树形列表展示不全问题

Browse Source
This commit is contained in:
caozehui
2026-01-22 15:09:02 +08:00
parent 3eb2736edb
commit 8e24ac4b71
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,10 +341,19 @@ public class ResultServiceImpl implements IResultService {
private void dipScriptTypeName(List<PqScriptDtls> subValue, List<TreeDataVO> subTypeList, Map<Integer, Set<Integer>> finalResultMap, Boolean isValueType, String name, Integer start, Integer end) { private void dipScriptTypeName(List<PqScriptDtls> subValue, List<TreeDataVO> subTypeList, Map<Integer, Set<Integer>> finalResultMap, Boolean isValueType, String name, Integer start, Integer end) {
List<TreeDataVO> info = new ArrayList<>(); List<TreeDataVO> info = new ArrayList<>();
List<PqScriptDtls> dip = subValue.stream() List<PqScriptDtls> 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) .filter(x -> x.getTransValue() >= start && x.getTransValue() <= end)
.sorted(Comparator.comparing(PqScriptDtls::getScriptIndex)) .sorted(Comparator.comparing(PqScriptDtls::getScriptIndex))
.collect(Collectors.toList()); .collect(Collectors.toList());
LinkedHashMap<Integer, List<PqScriptDtls>> 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(); TreeDataVO vo = new TreeDataVO();
vo.setScriptTypeName(name); vo.setScriptTypeName(name);
vo.setScriptTypeCode("Base_" + start + "_" + end); vo.setScriptTypeCode("Base_" + start + "_" + end);
@@ -1883,7 +1892,7 @@ public class ResultServiceImpl implements IResultService {
} }
@Override @Override
public List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num,String code) { public List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num, String code) {
// PqDev dev = pqDevService.getById(devId); // PqDev dev = pqDevService.getById(devId);
AdPlan plan = adPlanService.getById(planId); AdPlan plan = adPlanService.getById(planId);
// String code = String.valueOf(plan.getCode()); // String code = String.valueOf(plan.getCode());