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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
贾同学
2025-09-15 08:33:49 +08:00
parent 44738f2878 3f12758d1b
commit 9deaea9e81
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java
View File

@@ -27,11 +27,6 @@ public class FormContentVO {
*/
private Map<String, List<Integer>> chnMap;
/**
* 选中的第几次
*/
private Integer checkNum;
/**
* 有多少次波形录制
*/

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

@@ -1576,8 +1576,10 @@ public class ResultServiceImpl implements IResultService {
List<String> adTypeList = childDictTreeList.stream().map(DictTree::getId).collect(Collectors.toList());
List<ContrastBaseResult> allResultList = new ArrayList<>();
List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList);
List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList);
List<ContrastNonHarmonicResult> 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<ContrastHarmonicResult> 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);
@@ -1590,19 +1592,6 @@ public class ResultServiceImpl implements IResultService {
chnMap.put(split[1], numList);
});
if (ObjectUtil.isNull(queryParam.getNum())) {
if (StrUtil.isNotBlank(queryParam.getChnNum())) {
List<Integer> integers = chnMap.get(queryParam.getChnNum());
formContentVO.setCheckNum(integers.get(integers.size() - 1));
} else {
List<String> keyList = chnMap.keySet().stream().collect(Collectors.toList());
List<Integer> 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());