From d1aefa92d80c30d2344c14479d152b2f9fe2e74d Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Tue, 10 Dec 2024 16:39:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95=E9=A1=B9?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mapping/WlRecordMapper.xml         | 46 ++++++++++++++++---
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml
index 4677f7b..0546865 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml
@@ -96,17 +96,51 @@
 
     <select id="getWlAssByWlId" resultType="com.njcn.csdevice.pojo.po.WlRecord">
         SELECT
-            a.id,a.start_time,a.end_time,a.line_id,a.type,c.data_level as dataLevel,b.ct_ratio as ct,b.pt_ratio as pt
+            a.id,
+            a.start_time,
+            a.end_time,
+            a.line_id,
+            a.type,
+            c.data_level AS dataLevel,
+            b.ct_ratio AS ct,
+            b.pt_ratio AS pt,
+            NULL AS itemName,
+            NULL AS voltageLevel,
+            NULL AS capacitySscb,
+            NULL AS capacitySscmin,
+            NULL AS capacitySt,
+            NULL AS capacitySi
         FROM
             wl_record a
-            inner join cs_line b on a.line_id = b.line_id
-            inner join cs_data_set c on b.data_set_id = c.id
+                INNER JOIN cs_line b ON a.line_id = b.line_id
+                INNER JOIN cs_data_set c ON b.data_set_id = c.id
         WHERE
-            a.type = 1 and
-            a.id IN (SELECT data_id FROM wl_record_test_data WHERE test_item_id = #{wlId} )
+            a.type = 1
+          AND a.id IN (
+            SELECT
+                data_id
+            FROM
+                wl_record_test_data
+            WHERE
+                test_item_id = #{wlId} )
         UNION
         SELECT
-            a.id,a.start_time,a.end_time,a.line_id,a.type,null as dataLevel,(a.pt/a.pt1) as pt,(a.ct/a.ct1) as ct
+            a.id,
+            a.start_time,
+            a.end_time,
+            a.line_id,
+            a.type,
+            NULL AS dataLevel,(
+                a.pt / a.pt1
+                ) AS pt,(
+                a.ct / a.ct1
+                ) AS ct,
+            a.item_name,
+            a.voltage_level,
+            a.capacity_sscb,
+            a.capacity_sscmin,
+            a.capacity_st,
+            a.capacity_si
         FROM
             wl_record a
         WHERE