From 7f85ff7e882ed4d3d39c3261bc996af9cf656aa1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 28 Feb 2024 14:26:19 +0800
Subject: [PATCH] 消息管理
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 242 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 190 insertions(+), 52 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 7da6da5..2fee25d 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -17,18 +17,20 @@
select
jp.*,
jpe.id as placeExtId,
- bu.real_name as username,bu.phone as phone,
- br.town_name as townStreetName,br.name as neiName,
- jpe.confirm_flag confirmFlag,
+ bu.real_name as username,
+ bu.phone as phone,
+ br.town_name as townStreetName,
+ br.name as neiName,
jg.grid_name as gridName,
bus.`name` AS policeName,
- bu.phone AS policePhone
+ bus.phone AS policePhone,
+ 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 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 blade_region br on br.code = jg.community_code
LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
+ 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 (
select a.* from jczz_place_poi_label a inner join
@@ -73,22 +75,59 @@
<if test="place.isPerfect==2">
and jp.status = 2
</if>
- <if test="houseCodeList != null and houseCodeList.size()>0">
- and jp.house_code in
- <foreach collection="houseCodeList" item="houseCode" separator ="," open="(" close=")">
- #{houseCode}
- </foreach>
- </if>
<if test="isAdministrator==2">
<choose>
- <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
- and jg.grid_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
- #{code}
- </foreach>
+ <when test="place.roleName != null and place.roleName != ''">
+ <if test="place.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jp.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jp.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="place.roleName=='mj'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jpag.community_code in ('')
+ </otherwise>
+ </choose>
+ </if>
</when>
<otherwise>
- and jg.grid_code in ('')
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and
+ (
+ jg.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ or
+ jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+ and
+ (
+ jg.grid_code in ('') or jpag.community_code in ('')
+ )
+ </otherwise>
+ </choose>
</otherwise>
</choose>
</if>
@@ -105,15 +144,15 @@
jpe.confirm_flag confirmFlag,
bus.`name` AS policeName,
bus.phone AS policePhone,
- IFNULL(jda.address_name,jp.location) addressName,
+ jp.location as addressName,
jpag.pcs_name deptName
from jczz_place jp
+ left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
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_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
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 jczz_doorplate_address jda on jda.address_code=jp.house_code
left join (
select a.* from jczz_place_poi_label a inner join
(
@@ -144,13 +183,18 @@
<if test="place.policeName!=null and place.policeName!=''">
and bus.name like concat('%',#{place.policeName},'%')
</if>
-
- <if test="place.nineType!=null and place.nineType!=''">
- and jp.nine_type = #{place.nineType}
+ <if test="nineTypeList!=null and nineTypeList.size()>0">
+ and jp.nine_type in
+ <foreach collection="nineTypeList" separator="," open="(" close=")" item="nineType">
+ #{nineType}
+ </foreach>
</if>
-
<if test="place.isFront!=null and place.isFront!=''">
and jp.is_front = #{place.isFront}
+ </if>
+
+ <if test="place.frontType!=null and place.frontType!=''">
+ and jp.front_type = #{place.frontType}
</if>
<if test="place.neiName!=null and place.neiName!=''">
@@ -173,20 +217,60 @@
<if test="place.isPerfect==2">
and jp.status = 2
</if>
- <if test="houseCodeList != null and houseCodeList.size()>0">
- and jp.house_code in
- <foreach collection="houseCodeList" item="houseCode" separator ="," open="(" close=")">
- #{houseCode}
- </foreach>
- </if>
<if test="isAdministrator==2">
<choose>
- <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
- and jg.grid_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
- #{code}
- </foreach>
+ <when test="place.roleName != null and place.roleName != ''">
+ <if test="place.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jp.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jp.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="place.roleName=='mj'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jpag.community_code in ('')
+ </otherwise>
+ </choose>
+ </if>
</when>
+ <otherwise>
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and
+ (
+ jg.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ or
+ jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+ and
+ (
+ jg.grid_code in ('') or jpag.community_code in in ('')
+ )
+ </otherwise>
+ </choose>
+ </otherwise>
</choose>
</if>
order by jp.create_time desc,jp.id desc
@@ -249,7 +333,6 @@
if(jp.source=1,jda.y,jp.lat) as lat,
if(jp.source=1,jda.address_name,jp.location) as location,
jp.image_urls,
- jp.grid_id,
jp.grid_code,
jp.jw_grid_code,
jp.source,
@@ -435,15 +518,15 @@
jpe.confirm_flag confirmFlag,
bus.`name` AS policeName,
bus.phone AS policePhone,
- IFNULL(jda.address_name,jp.location) addressName,
+ jp.location as addressName,
jpag.pcs_name deptName
from jczz_place jp
+ left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
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_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
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 jczz_doorplate_address jda on jda.address_code=jp.house_code
left join (
select a.* from jczz_place_poi_label a inner join
(
@@ -474,13 +557,18 @@
<if test="place.policeName!=null and place.policeName!=''">
and bus.name like concat('%',#{place.policeName},'%')
</if>
-
- <if test="place.nineType!=null and place.nineType!=''">
- and jp.nine_type = #{place.nineType}
+ <if test="nineTypeList!=null and nineTypeList.size()>0">
+ and jp.nine_type in
+ <foreach collection="nineTypeList" separator="," open="(" close=")" item="nineType">
+ #{nineType}
+ </foreach>
</if>
-
<if test="place.isFront!=null and place.isFront!=''">
and jp.is_front = #{place.isFront}
+ </if>
+
+ <if test="place.frontType!=null and place.frontType!=''">
+ and jp.front_type = #{place.frontType}
</if>
<if test="place.neiName!=null and place.neiName!=''">
@@ -503,20 +591,60 @@
<if test="place.isPerfect==2">
and jp.status = 2
</if>
- <if test="houseCodeList != null and houseCodeList.size()>0">
- and jp.house_code in
- <foreach collection="houseCodeList" item="houseCode" separator ="," open="(" close=")">
- #{houseCode}
- </foreach>
- </if>
<if test="isAdministrator==2">
<choose>
- <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
- and jg.grid_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
- #{code}
- </foreach>
+ <when test="place.roleName != null and place.roleName != ''">
+ <if test="place.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jp.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jp.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="place.roleName=='mj'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jpag.community_code in ('')
+ </otherwise>
+ </choose>
+ </if>
</when>
+ <otherwise>
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and
+ (
+ jg.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ or
+ jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+ and
+ (
+ jg.grid_code in ('') or jpag.community_code in in ('')
+ )
+ </otherwise>
+ </choose>
+ </otherwise>
</choose>
</if>
order by jp.create_time desc,jp.id desc
@@ -590,6 +718,7 @@
select id,lng,lat from jczz_place where is_deleted = 0
and source != 3
and jw_grid_code is null
+ and lng != ''
</select>
<!--比对两点间的距离是否在1km 范围内(和地址总表位置对比)-->
@@ -617,4 +746,13 @@
) <= 1
</select>
+
+ <!--查询 综治网格为空的数据-->
+ <select id="getPlaceNotGridCode" resultType="org.springblade.modules.place.entity.PlaceEntity">
+ select id,lng,lat from jczz_place where is_deleted = 0
+ and source != 3
+ and grid_code is null
+ and lng != ''
+ </select>
+
</mapper>
--
Gitblit v1.9.3