diff --git a/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java b/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java index c01081af..25c5f3f5 100644 --- a/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java +++ b/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java @@ -27,11 +27,6 @@ public class FormContentVO { */ private Map> chnMap; - /** - * 选中的第几次 - */ - private Integer checkNum; - /** * 有多少次波形录制 */ diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index 9c76bf75..958024e0 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -1569,8 +1569,10 @@ public class ResultServiceImpl implements IResultService { List adTypeList = childDictTreeList.stream().map(DictTree::getId).collect(Collectors.toList()); List allResultList = new ArrayList<>(); - List contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList); - List contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList); + List contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, queryParam.getDeviceId(), adTypeList); + contrastNonHarmonicResults.addAll(contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList)); + List contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, queryParam.getDeviceId(), adTypeList); + contrastHarmonicResults.addAll(contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList)); allResultList.addAll(contrastHarmonicResults); allResultList.addAll(contrastNonHarmonicResults); @@ -1583,19 +1585,6 @@ public class ResultServiceImpl implements IResultService { chnMap.put(split[1], numList); }); - if (ObjectUtil.isNull(queryParam.getNum())) { - if (StrUtil.isNotBlank(queryParam.getChnNum())) { - List integers = chnMap.get(queryParam.getChnNum()); - formContentVO.setCheckNum(integers.get(integers.size() - 1)); - } else { - List keyList = chnMap.keySet().stream().collect(Collectors.toList()); - List integers = chnMap.get(keyList.get(0)); - formContentVO.setCheckNum(integers.get(integers.size() - 1)); - } - } else { - formContentVO.setCheckNum(queryParam.getNum()); - } - AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(queryParam.getPlanId()); formContentVO.setWaveNumTotal(adPlanTestConfig.getWaveRecord());