From fd370c8133638800f9b006b22e4d6abcf263ba89 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 13 May 2024 17:18:08 +0800
Subject: [PATCH] 场所数据处理调整

---
 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 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 af85965..55c4762 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -5,7 +5,7 @@
     <!--过滤网格数据-->
     <sql id="filterHouseGrid">
         <if test="houseParam.roleName!=null and houseParam.roleName!=''">
-            <if test="houseParam.roleName=='网格员' and houseParam.userId!='1726859808689696770'">
+            <if test="houseParam.roleName=='wgy' and houseParam.userId!='1726859808689696770'">
                 <choose>
                     <when test="list != null and list.size()>0">
                         and address_code in
@@ -26,7 +26,7 @@
     <!--过滤社区数据-->
     <sql id="filterCommunity">
         <if test="houseParam.roleName!=null and houseParam.roleName!=''">
-            <if test="houseParam.roleName=='民警' and houseParam.userId!='1726859808689696770'">
+            <if test="houseParam.roleName=='mj' and houseParam.userId!='1726859808689696770'">
                 <choose>
                     <when test="communityList != null and communityList.size()>0">
                         and nei_code in
@@ -572,6 +572,19 @@
         <if test="townName!=null and townName!=''">
             and jda.town_street_name like concat('%',#{townName},'%')
         </if>
+        limit 0,1000
+    </select>
+
+    <!--查询未入库的场所-->
+    <select id="getNotPlaceListCount" resultType="java.lang.Integer">
+        select count(*) from jczz_doorplate_address jda
+        left join jczz_place jp on jda.address_code=jp.house_code and jp.is_deleted = 0
+        where 1=1
+        and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
+        and jp.id is null
+        <if test="townName!=null and townName!=''">
+            and jda.town_street_name like concat('%',#{townName},'%')
+        </if>
     </select>
 
     <!--查询场所标准地址数据-->
@@ -780,4 +793,14 @@
         </if>
         limit 0,1000
     </select>
+
+    <!--查询所有未匹配的网格范围地址数据-->
+    <select id="getDoorplateAddressDetailByHouseId" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
+        select
+        jda.*
+        from jczz_doorplate_address jda
+        left join jczz_house jh on jh.house_code = jda.address_code and jh.is_deleted = 0
+        where 1=1
+        and jh.id = #{houseId}
+    </select>
 </mapper>

--
Gitblit v1.9.3