From ebd41b7b2e44dc8b96f177d7bf88d2f5f997b75c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 28 Apr 2024 14:30:07 +0800
Subject: [PATCH] 民警导入修改

---
 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index e2d80b1..d09d944 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -29,7 +29,7 @@
         left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
         left join jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
         left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
-        LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
+        LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
         left join blade_region br on br.code = jpag.community_code
         LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
         left join (
@@ -266,7 +266,7 @@
                         <otherwise>
                             and
                             (
-                            jg.grid_code in ('') or jpag.community_code in in ('')
+                            jg.grid_code in ('') or jpag.community_code in ('')
                             )
                         </otherwise>
                     </choose>
@@ -283,7 +283,9 @@
                jp.place_name AS   NAME,
                jp.is_nine AS isNine,
                jp.is_front AS isFront,
+               jp.no_explosion_category AS noExplosionCategory,
                br.name neiName,
+               jg.community_code neiCode,
                FALSE         AS   hasChildren
         FROM jczz_place jp
                  LEFT JOIN jczz_grid jg on jp.grid_code = jg.grid_code and jg.is_deleted = 0
@@ -344,6 +346,8 @@
         jp.is_front,
         jp.front_type,
         jp.remark,
+        jp.no_explosion_category,
+        jp.three_fire_protection,
         bu.real_name as username,bu.phone as phone,
         jppl.id as plid,
         jppl.place_id,
@@ -643,7 +647,7 @@
                         <otherwise>
                             and
                             (
-                            jg.grid_code in ('') or jpag.community_code in in ('')
+                            jg.grid_code in ('') or jpag.community_code in ('')
                             )
                         </otherwise>
                     </choose>
@@ -909,4 +913,33 @@
         order by jp.create_time desc,jp.id desc
     </select>
 
+    <!--查询所有场所数据-->
+    <select id="getAllList" resultType="org.springblade.modules.place.vo.PlaceVO">
+        select
+        jp.*,
+        jpag.community_code
+        from jczz_place jp
+        left join jczz_police_affairs_grid jpag on jp.jw_grid_code = jpag.jw_grid_code and jpag.is_deleted =0
+        where jp.is_deleted = 0
+        limit #{i},#{size}
+    </select>
+
+    <!--查询所有场所数据-->
+    <select id="getAllListTotal" resultType="java.lang.Integer">
+        select
+        count(*)
+        from jczz_place jp
+        where jp.is_deleted = 0
+    </select>
+
+    <!--查询对应的社区编号-->
+    <select id="getCommunityCode" resultType="java.lang.String">
+        select
+        jpag.community_code
+        from jczz_place jp
+        left join jczz_police_affairs_grid jpag on jp.jw_grid_code = jpag.jw_grid_code and jpag.is_deleted =0
+        where jp.is_deleted = 0
+        and jp.id = #{id}
+    </select>
+
 </mapper>

--
Gitblit v1.9.3