From 1ecdb3c0a96ca995473a0d60dd003197636d87fe Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 15:13:14 +0800
Subject: [PATCH] 取水口综合信息-基本信息中增加地址属性

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeBase.java |    5 +++++
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml                      |    4 ++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeBase.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeBase.java
index 798ae3f..7538ee1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeBase.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeBase.java
@@ -35,6 +35,11 @@
     public Double lat;
 
     /**
+     * 鍦板潃(鍘�+闀�+鏉�)
+     */
+    public String address ;
+
+    /**
      * 鐗囧尯
      */
     public String blockName;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml
index 1ce7bb8..5406643 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml
@@ -8,11 +8,15 @@
         itb.name as num,
         itb.lng  as lng,
         itb.lat  as lat,
+        CONCAT(county.name, town.name, village.name) as address,
         bb.name  as blockName,
         pc.rtuAddr as rtuAddr
         from pr_intake itb
         LEFT JOIN ba_block bb on itb.blockId = bb.id
         LEFT JOIN pr_controller pc on itb.id = pc.intakeId
+        LEFT JOIN ba_district county on itb.countyId = county.id
+        LEFT JOIN ba_district town on itb.townId = town.id
+        LEFT JOIN ba_district village on itb.villageId = village.id
         where itb.id = #{intakeId,jdbcType=BIGINT}
     </select>
 

--
Gitblit v1.8.0