From aa89745fe575f876d474b4bb85e01e7a999ebd22 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 05 九月 2026 01:37:44 +0800
Subject: [PATCH] 接入电池组与测试配置DTO边界
---
ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
index 11e314d..115e96e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
@@ -403,7 +403,8 @@
sample.energy_wh energy, channel.adapter_id adapterId, channel.adapter_code adapterCode,
channel.devtype devtype, channel.devid deviceId, channel.subdevid subdevid, channel.chlid channelId
from t_test_sample sample
- join t_test_battery battery on battery.test_battery_id = sample.binding_id and battery.del_flag = 0
+ join t_test_channel_binding binding on binding.binding_id = sample.binding_id
+ join t_test_battery battery on battery.test_battery_id = binding.test_battery_id and battery.del_flag = 0
join t_detection_channel channel on channel.channel_id = sample.channel_id and channel.del_flag = 0
where sample.test_id = #{testId}
order by sample.device_time_utc desc, sample.seq_id desc, sample.sample_id desc
@@ -458,7 +459,8 @@
channel.adapter_id adapterId, channel.adapter_code adapterCode, channel.devtype devtype,
channel.devid deviceId, channel.subdevid subdevid, channel.chlid channelId
from t_test_sample sample
- join t_test_battery battery on battery.test_battery_id = sample.binding_id and battery.del_flag = 0
+ join t_test_channel_binding binding on binding.binding_id = sample.binding_id
+ join t_test_battery battery on battery.test_battery_id = binding.test_battery_id and battery.del_flag = 0
join t_detection_channel channel on channel.channel_id = sample.channel_id and channel.del_flag = 0
where sample.test_id = #{testId}
group by sample.binding_id, battery.battery_no, channel.adapter_id, channel.adapter_code, channel.devtype,
@@ -483,7 +485,8 @@
channel.adapter_id adapterId, channel.adapter_code adapterCode, channel.devtype devtype,
channel.devid deviceId, channel.subdevid subdevid, channel.chlid channelId
from t_test_sample sample
- join t_test_battery battery on battery.test_battery_id = sample.binding_id and battery.del_flag = 0
+ join t_test_channel_binding binding on binding.binding_id = sample.binding_id
+ join t_test_battery battery on battery.test_battery_id = binding.test_battery_id and battery.del_flag = 0
join t_detection_channel channel on channel.channel_id = sample.channel_id and channel.del_flag = 0
where sample.test_id = #{testId}
group by sample.binding_id, battery.battery_no, channel.adapter_id, channel.adapter_code, channel.devtype,
--
Gitblit v1.7.1