From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 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 356ef35..d34ab7d 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -15,22 +15,25 @@
<select id="selectPlacePage" resultType="org.springblade.modules.place.vo.PlaceVO">
select
jp.*,
+ jpe.id as placeExtId,
bu.real_name as username,bu.phone as phone,
bx.real_name as createUserName,
- jda.town_street_name as townStreetName,jda.nei_name as neiName,
+ br.town_name as townStreetName,br.name as neiName,
jpe.confirm_flag confirmFlag
from jczz_place jp
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
left join blade_user bx on bx.id = jp.create_user and bx.is_deleted = 0
- left join jczz_doorplate_address jda on jda.address_code = jp.house_code
LEFT JOIN jczz_place_ext jpe on jpe.place_id=jp.id
+ left join jczz_grid_range jgr on jgr.house_code = jp.house_code
+ left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ left join blade_region br on br.code = jg.community_code
left join (
select a.* from jczz_place_poi_label a inner join
(
select place_id,max(id) as id from jczz_place_poi_label b group by place_id
) b on a.id = b.id
) jppl on jppl.place_id = jp.id
- where jp.is_deleted = 0
+ where jp.is_deleted = 0 and jp.source!=3
<if test="place.roleName!=null and place.roleName!='' and place.createUser!=null">
<choose>
<when test="place.roleName=='网格员'">
@@ -63,13 +66,16 @@
and jp.house_code = #{place.houseCode}
</if>
<if test="place.townStreetName!=null and place.townStreetName!=''">
- and jda.town_street_name like concat('%',#{place.townStreetName},'%')
+ and br.town_name like concat('%',#{place.townStreetName},'%')
</if>
<if test="place.neiName!=null and place.neiName!=''">
- and jda.nei_name like concat('%',#{place.neiName},'%')
+ and br.name like concat('%',#{place.neiName},'%')
</if>
<if test="place.id!=null">
and jp.id = #{place.id}
+ </if>
+ <if test="place.source!=null">
+ and jp.source = #{place.source}
</if>
<if test="place.isPerfect==1">
and
@@ -88,20 +94,23 @@
and bu.real_name != ""
and bu.phone != ""
</if>
- order by jpe.create_time desc
+ <if test="place.regionCode != null and place.regionCode !='' ">
+ and jg.community_code like concat('%',#{place.regionCode},'%')
+ </if>
+ order by jp.create_time desc,jp.id desc
</select>
<!--查询场所集合信息-->
<select id="selectPlaceNodeList" resultType="org.springblade.common.node.TreeStringNode" >
- select jp.id,
+ SELECT jp.id,
jp.house_code houseCode,
- jp.place_name as name,
- jda.doorplate_type doorplateType,
- jda.address_level addressLevel,
- jda.nei_name neiName,
- false as hasChildren
- from jczz_place jp
- left join jczz_doorplate_address jda on jp.house_code = jda.address_code
+ jp.place_name AS NAME,
+ br.name neiName,
+ FALSE AS hasChildren
+ FROM jczz_place jp
+ LEFT JOIN jczz_grid_range jgr ON jp.house_code = jgr.house_code
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
+ LEFT JOIN blade_region br on br.code = jg.community_code
where 1 = 1
and jp.is_deleted = 0
and jp.principal_user_id = #{userId}
@@ -136,11 +145,15 @@
select
jp.*,
bu.real_name as username,bu.phone as phone,
- jppl.id as plid,jppl.*,jcl.category_name as labelName
+ jppl.id as plid,jppl.*,jc.category_name as labelName,
+ br.code as neiCode,jg.id as gridId
from jczz_place jp
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
left join jczz_place_poi_label jppl on jppl.place_id = jp.id
- left join jczz_category_label jcl on jcl.category_no = jppl.poi_code
+ left join jczz_category jc on jc.category_no = jppl.poi_code
+ left join jczz_grid_range jgr on jgr.house_code = jp.house_code
+ left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ left join blade_region br on br.code = jg.community_code
where jp.is_deleted = 0
<if test="place.houseCode!=null and place.houseCode!=''">
and jp.house_code = #{place.houseCode}
@@ -177,4 +190,22 @@
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
where jp.is_deleted = 0 and jp.principal_user_id is not null
</select>
+
+ <!--查询所有的场所数据（除去详情表已有的）-->
+ <select id="getPlaceListByNoExt" resultType="org.springblade.modules.place.entity.PlaceEntity">
+ select
+ jp.*
+ from jczz_place jp
+ LEFT JOIN jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
+ where jp.is_deleted = 0 and jpe.id is null
+ </select>
+
+ <!--商超数据处理-->
+ <select id="placeAndRelHandle" resultType="org.springblade.modules.place.entity.PlaceEntity">
+ select jp.* from jczz_place jp
+ left join jczz_place_rel jpr on jp.id = jpr.place_id and jpr.is_deleted =0
+ where jpr.id is not null
+ and jp.is_deleted = 0
+ and jp.source !=3
+ </select>
</mapper>
--
Gitblit v1.9.3