From 348b2464bb5e500cb92c4e2d2819ed7ceb74c831 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 11 Mar 2024 15:40:44 +0800
Subject: [PATCH] 场所详细查询返回绑定多个房屋的二维码编号和标准地址修改

---
 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index 8674027..1eebc43 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -568,12 +568,18 @@
         from jczz_doorplate_address jda
         left join jczz_grid_range jgr on jda.address_code = jgr.house_code
         where 1=1
-        and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
+--         and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
         <if test="doorplateAddress.addressName!=null and doorplateAddress.addressName!=''">
             and jda.address_name like concat('%',#{doorplateAddress.addressName},'%')
         </if>
         <if test="doorplateAddress.poi!=null and doorplateAddress.poi!=''">
             and jda.poi like concat('%',#{doorplateAddress.poi},'%')
+        </if>
+        <if test="doorplateAddress.addressCode!=null and doorplateAddress.addressCode!=''">
+            and jda.address_code in
+            <foreach collection="addressCode.split(',')" item="addressCode" open="(" close=")" separator=",">
+                #{addressCode}
+            </foreach>
         </if>
         <if test="isAdministrator==2">
             <choose>
@@ -654,4 +660,20 @@
             jda.nei_name,
             jda.town_street_code
     </select>
+
+
+    <select id="getHouseBuildingCode"
+            resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
+
+        SELECT DISTINCT
+            jda.building_code,
+            jda.building_name
+        FROM
+            jczz_doorplate_address jda
+                LEFT JOIN jczz_district jd ON jd.aoi_code = jda.aoi_code
+        WHERE
+            jd.id = #{districtId}
+          and jda.building_code is not null
+
+    </select>
 </mapper>

--
Gitblit v1.9.3