From 471010df16ccbc1bc5f79170ffc6398298258892 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期二, 08 九月 2026 15:03:42 +0800
Subject: [PATCH] 集成 Ticket03 对比报表详情来源
---
battery-business/src/main/java/com/battery/business/report/CompareReportService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/battery-business/src/main/java/com/battery/business/report/CompareReportService.java b/battery-business/src/main/java/com/battery/business/report/CompareReportService.java
index c9ee39f..bdc2305 100644
--- a/battery-business/src/main/java/com/battery/business/report/CompareReportService.java
+++ b/battery-business/src/main/java/com/battery/business/report/CompareReportService.java
@@ -15,6 +15,7 @@
import com.battery.business.domain.TTest;
import com.battery.business.domain.TTestBattery;
import com.battery.business.domain.TTestLogicStepMapping;
+import com.battery.business.domain.TTestConsoleDetail;
import com.battery.business.report.CompareReportRequest.Selection;
import com.battery.business.service.ITTestService;
import com.battery.business.service.ITestDataQueryService;
@@ -34,7 +35,8 @@
{ this.tests = tests; this.data = data; this.reports = reports; }
public record Candidate(Selection selection, String name, String type, long groupId,
- String batteryGroup, String batteryNo, String process) { }
+ String batteryGroup, String batteryNo, String process, String experimentName,
+ TTestConsoleDetail consoleDetail) { }
public record Item(Candidate source, Long zeroTime, List<Map<String, Object>> records,
TTestLogicStepMapping logicalMapping, List<CurrentBatteryField> businessFields) { }
@@ -230,7 +232,8 @@
private Candidate candidate(TTest test, TTestBattery battery, int cycle, Integer step, Integer logical, String process)
{
return new Candidate(new Selection(test.getTestId(), battery.getTestBatteryId(), cycle, step, logical),
- test.getTestName(), test.getTestTypeName(), battery.getGroupId(), battery.getGroupName(), battery.getBatteryNo(), process);
+ test.getTestName(), test.getTestTypeName(), battery.getGroupId(), battery.getGroupName(), battery.getBatteryNo(), process,
+ test.getConsoleDetail() == null ? null : test.getConsoleDetail().getExperimentName(), test.getConsoleDetail());
}
private int number(Map<String, Object> row, String key) { return row.get(key) instanceof Number value ? value.intValue() : 0; }
--
Gitblit v1.7.1