From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 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 84d4e34..06d6ebc 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -700,4 +700,40 @@
         </if>
         limit 0,1000
     </select>
+
+    <!--查询网格范围表未绑定的地址表信息数量-->
+    <select id="getNotBindGridRangeDoorListCount" resultType="java.lang.Integer">
+        select count(*) from jczz_doorplate_address jda
+        left join jczz_grid_range jgr on jgr.house_code = jda.address_code
+        where 1=1
+        and jgr.house_code is null
+        <if test="townName!=null and townName!=''">
+            and jda.town_street_name like concat('%',#{townName},'%')
+        </if>
+        <if test="communityName!=null and communityName!=''">
+            and jda.nei_name like concat('%',#{communityName},'%')
+        </if>
+        limit 0,1000
+    </select>
+
+    <!--查询所有未匹配的网格范围地址数据-->
+    <select id="getNotBindGridRangeDoorList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
+        select
+        jda.address_code,
+        jda.aoi_code,
+        jda.building_code,
+        jda.x,
+        jda.y
+        from jczz_doorplate_address jda
+        left join jczz_grid_range jgr on jgr.house_code = jda.address_code
+        where 1=1
+        and jgr.house_code is null
+        <if test="townName!=null and townName!=''">
+            and jda.town_street_name like concat('%',#{townName},'%')
+        </if>
+        <if test="communityName!=null and communityName!=''">
+            and jda.nei_name like concat('%',#{communityName},'%')
+        </if>
+        limit 0,1000
+    </select>
 </mapper>

--
Gitblit v1.9.3