From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 62 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 27 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 d9511a9..96c2113 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -18,15 +18,13 @@
jp.*,
jpe.id as placeExtId,
bu.real_name as username,bu.phone as phone,
- bx.real_name as createUserName,
br.town_name as townStreetName,br.name as neiName,
- jpe.confirm_flag confirmFlag
+ jpe.confirm_flag confirmFlag,
+ jg.grid_name as gridName
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_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 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 (
select a.* from jczz_place_poi_label a inner join
@@ -35,12 +33,7 @@
) b on a.id = b.id
) jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jp.source!=3
- <if test="houseCodeList != null and houseCodeList.size()>0">
- and jp.house_code in
- <foreach collection="houseCodeList" item="houseCode" separator ="," open="(" close=")">
- #{houseCode}
- </foreach>
- </if>
+ and jp.place_name != ''
<if test="place.placeName!=null and place.placeName!=''">
and jp.place_name like concat('%',#{place.placeName},'%')
</if>
@@ -51,7 +44,7 @@
and jp.principal_phone like concat('%',#{place.principalPhone},'%')
</if>
<if test="place.houseCode!=null and place.houseCode!=''">
- and jp.house_code = #{place.houseCode}
+ and jp.house_code like concat('%',#{place.houseCode},'%')
</if>
<if test="place.townStreetName!=null and place.townStreetName!=''">
and br.town_name like concat('%',#{place.townStreetName},'%')
@@ -66,13 +59,29 @@
and jp.source = #{place.source}
</if>
<if test="place.isPerfect==1">
- and jpe.confirm_flag = 4
+ and jp.status = 1
</if>
<if test="place.isPerfect==2">
- and jpe.confirm_flag >= 1 and jpe.confirm_flag < 4
+ and jp.status = 2
</if>
- <if test="place.regionCode != null and place.regionCode !='' ">
- and jg.community_code like concat('%',#{place.regionCode},'%')
+ <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>
+ <otherwise>
+ and jg.grid_code in ('')
+ </otherwise>
+ </choose>
</if>
order by jp.create_time desc,jp.id desc
</select>
@@ -82,11 +91,11 @@
SELECT jp.id,
jp.house_code houseCode,
jp.place_name AS NAME,
+ jp.is_nine AS isNine,
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 jczz_grid jg on jp.grid_code = jg.grid_code and jg.is_deleted = 0
LEFT JOIN blade_region br on br.code = jg.community_code
where 1 = 1
and jp.is_deleted = 0
@@ -129,17 +138,16 @@
jppl.color,
jppl.remark as cremark,
jc.category_name as labelName,
- br.code as neiCode,jg.id as gridId
+ br.code as neiCode
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 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 jczz_grid jg on jp.grid_code = jg.grid_code 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}
+ and jp.house_code like concat('%',#{place.houseCode},'%')
</if>
<if test="place.id!=null">
and jp.id = #{place.id}
@@ -197,7 +205,7 @@
select jp.*,jppl.poi_code as label from jczz_place jp
left join jczz_place_poi_label jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jppl.type = 3
- and jppl.color = '#30D17C'
+ and jppl.color = 'green'
and jp.principal_user_id is not null
and jp.house_code != ''
and jp.id in (
@@ -219,7 +227,7 @@
select jp.*,jppl.poi_code as label from jczz_place jp
left join jczz_place_poi_label jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jppl.type = 3
- and jppl.color = '#FFB42B'
+ and jppl.color = 'yellow'
and jp.principal_user_id is not null
and jp.house_code != ''
and jp.id in (
@@ -242,7 +250,7 @@
select jp.*,jppl.poi_code as label from jczz_place jp
left join jczz_place_poi_label jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jppl.type = 3
- and jppl.color = '#EA1F1F'
+ and jppl.color = 'red'
and jp.principal_user_id is not null
and jp.house_code != ''
and jp.id in (
@@ -267,7 +275,7 @@
where jp.is_deleted = 0 and jppl.type = 3
and jp.principal_user_id is not null
and jp.house_code != ''
- and (jppl.color = '#30D17C' or jppl.color = '#FFB42B' or jppl.color = '#EA1F1F')
+ and (jppl.color = 'green' or jppl.color = 'yellow' or jppl.color = 'red')
and jp.id not in (
select place_id from ${tableName} where is_deleted = 0 and source = 2 and place_id is not null group by place_id
)
--
Gitblit v1.9.3