From fc951e913c20b017534767c31ce1825284614104 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Tue, 10 Feb 2026 16:32:34 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/line/mapper/mapping/LineMapper.xml     | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
index d586af670..9a29458b4 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
@@ -1512,17 +1512,9 @@
     <select id="getCustomDetailByLineId" resultType="map">
         SELECT
             line.id AS lineId,
-            CONCAT(sub.NAME, '_', vo.NAME, '_', line.NAME) AS lineName,
-            CONCAT(
-                    IFNULL(CAST(detail.pt1 AS VARCHAR), 'N/A'),
-                    ':',
-                    IFNULL(CAST(detail.pt2 AS VARCHAR), 'N/A')
-            ) AS pt,
-            CONCAT(
-                    IFNULL(CAST(detail.ct1 AS VARCHAR), 'N/A'),
-                    ':',
-                    IFNULL(CAST(detail.ct2 AS VARCHAR), 'N/A')
-            ) AS ct,
+            CONCAT(CONCAT(CONCAT(sub.NAME, '_'), vo.NAME), CONCAT('_', line.NAME)) AS lineName,
+            CONCAT(CONCAT(COALESCE(detail.pt1, 'N/A'), ':'), COALESCE(detail.pt2, 'N/A')) AS pt,
+            CONCAT(CONCAT(COALESCE(detail.ct1, 'N/A'), ':'), COALESCE(detail.ct2, 'N/A')) AS ct,
             detail.Dev_Capacity AS Dev_Capacity,
             detail.Short_Capacity AS Short_Capacity,
             detail.Standard_Capacity AS Standard_Capacity,
@@ -1541,6 +1533,7 @@
         WHERE
             line.id = #{lineId}
     </select>
+
     <select id="selectByIds" resultType="com.njcn.device.pq.pojo.vo.LineDetailVO$Detail">
         SELECT DISTINCT
             line.id as lineId,