From af2b080ff561b931ca7bd8e2123b7cfd32f94b1c Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Fri, 11 Jul 2025 09:23:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E7=89=88=E6=9C=AC=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gather/event/devcie/mapper/mapping/PqLineMapper.xml     | 6 +++++-
 .../gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java     | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml
index 2d68e329..792e3c02 100644
--- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml
+++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml
@@ -31,6 +31,8 @@
 
   <select id="getBaseLineInfo" resultType="com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO">
     select
+        PQ_GDINFORMATION.name gdName,
+        pq_line.GD_INDEX gdIndex,
         pq_line.line_index lineId,
         pq_line.name lineName,
         PQ_LINEDETAIL.objname objName,
@@ -46,11 +48,13 @@
                        PQ_LINEDETAIL,
                        PQ_SUBVOLTAGE,
                        pq_device,
-                       PQ_SUBSTATION
+                       PQ_SUBSTATION,
+                        PQ_GDINFORMATION
     where pq_line.line_index = PQ_LINEDETAIL.line_index
       and pq_line.SUBV_INDEX = PQ_SUBVOLTAGE.SUBV_INDEX
       and PQ_SUBVOLTAGE.DEV_INDEX = pq_device.DEV_INDEX
       and pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
+      and pq_line.GD_INDEX =PQ_GDINFORMATION.GD_INDEX
     and pq_line.line_index in
     <foreach collection="ids" item="item" open="(" close=")" separator=",">
         #{item}
diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java
index 04997b08..703fb53b 100644
--- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java
+++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java
@@ -9,6 +9,8 @@ import lombok.Data;
  */
 @Data
 public class LedgerBaseInfoDTO {
+    private String gdName;
+    private String gdIndex;
 
     private Integer lineId;