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-09-24 16:44:41 +08:00
parent e42121ba4c
commit 81df650d09
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -926,8 +926,6 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
// 第一次调用时获取数据并保存到resultMap // 第一次调用时获取数据并保存到resultMap
if (resultMap == null) { if (resultMap == null) {
resultMap = resultService.getContrastResultForReport(devReportParam, pqDevVO); resultMap = resultService.getContrastResultForReport(devReportParam, pqDevVO);
List<ContrastTestResult> contrastTestResults = resultMap.get(2);
resultMap.put(3, contrastTestResults);
} }
todoInsertList = dealDataLineContrast(detailDocumentPart, devReportParam, pqDevVO, resultMap); todoInsertList = dealDataLineContrast(detailDocumentPart, devReportParam, pqDevVO, resultMap);
if (Objects.nonNull(bookmarkInfo) && CollectionUtil.isNotEmpty(todoInsertList)) { if (Objects.nonNull(bookmarkInfo) && CollectionUtil.isNotEmpty(todoInsertList)) {

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

@@ -1819,7 +1819,6 @@ public class ResultServiceImpl implements IResultService {
@Override @Override
public Map<Integer, List<ContrastTestResult>> getContrastResultForReport(DevReportParam devReportParam, PqDevVO pqDevVO) { public Map<Integer, List<ContrastTestResult>> getContrastResultForReport(DevReportParam devReportParam, PqDevVO pqDevVO) {
Map<Integer/*回路号*/, List<ContrastTestResult>> finalContent = new LinkedHashMap<>(); Map<Integer/*回路号*/, List<ContrastTestResult>> finalContent = new LinkedHashMap<>();
List<ContrastTestResult> contrastTestResults = new ArrayList<>();
// 获取该设备下参与测试的回路（已有检测结论的） // 获取该设备下参与测试的回路（已有检测结论的）
List<MonitorResultVO> monitorResultVOS = this.getMonitorResult(devReportParam.getDevId()); List<MonitorResultVO> monitorResultVOS = this.getMonitorResult(devReportParam.getDevId());
if (CollectionUtil.isNotEmpty(monitorResultVOS)) { if (CollectionUtil.isNotEmpty(monitorResultVOS)) {
@@ -1828,10 +1827,10 @@ public class ResultServiceImpl implements IResultService {
List<String> scriptList = adPlanService.getScriptListContrast(devReportParam.getPlanId()); List<String> scriptList = adPlanService.getScriptListContrast(devReportParam.getPlanId());
// 对测试项按字典表排个序 // 对测试项按字典表排个序
scriptList = dictTreeService.sort(scriptList); scriptList = dictTreeService.sort(scriptList);
AdPlan adPlan = adPlanService.getById(devReportParam.getPlanId()); AdPlan adPlan = adPlanService.getById(devReportParam.getPlanId());
if (CollectionUtil.isNotEmpty(scriptList)) { if (CollectionUtil.isNotEmpty(scriptList)) {
for (MonitorResultVO monitorResultVO : monitorResultVOS) { for (MonitorResultVO monitorResultVO : monitorResultVOS) {
List<ContrastTestResult> contrastTestResults = new ArrayList<>();
int monitorNum = monitorResultVO.getMonitorNum(); int monitorNum = monitorResultVO.getMonitorNum();
// 看看当前这个回路结论的来源，可能是某次的实时数据、某次的测试下的某次录波数据、某次统计数据 // 看看当前这个回路结论的来源，可能是某次的实时数据、某次的测试下的某次录波数据、某次统计数据
for (String scriptId : scriptList) { for (String scriptId : scriptList) {