From ae935b68e75e7c90e27aecedefa971106927c38d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 08 Jan 2024 20:49:46 +0800
Subject: [PATCH] 上传接口link地址修改
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 61 ++++++++++++++++++------------
1 files changed, 36 insertions(+), 25 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 979b556..209c32d 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -15,6 +15,7 @@
<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,
br.town_name as townStreetName,br.name as neiName,
@@ -32,25 +33,12 @@
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
- <if test="place.roleName!=null and place.roleName!='' and place.createUser!=null">
- <choose>
- <when test="place.roleName=='网格员'">
- and
- (
- jp.create_user = #{place.createUser}
- <if test="houseCodeList != null and houseCodeList.size()>0">
- or jp.house_code in
- <foreach collection="houseCodeList" item="houseCode" separator ="," open="(" close=")">
- #{houseCode}
- </foreach>
- </if>
- )
- </when>
- <otherwise>
- and jp.principal_user_id = #{place.createUser}
- </otherwise>
- </choose>
+ 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>
<if test="place.placeName!=null and place.placeName!=''">
and jp.place_name like concat('%',#{place.placeName},'%')
@@ -73,6 +61,9 @@
<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
(
@@ -90,7 +81,10 @@
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>
<!--查询场所集合信息-->
@@ -98,13 +92,12 @@
SELECT jp.id,
jp.house_code houseCode,
jp.place_name AS NAME,
- jpr.doorplate_num doorplateType,
- jda.address_level addressLevel,
- jpr.community_name neiName,
+ br.name neiName,
FALSE AS hasChildren
FROM jczz_place jp
- LEFT JOIN jczz_place_rel jpr ON jp.id = jpr.place_id
- LEFT JOIN jczz_doorplate_address jda on jp.house_code = jda.address_code
+ 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}
@@ -184,4 +177,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