From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 193 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 160 insertions(+), 33 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 27451bb..fbff911 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -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>
@@ -344,6 +344,7 @@
jp.is_front,
jp.front_type,
jp.remark,
+ jp.three_fire_protection,
bu.real_name as username,bu.phone as phone,
jppl.id as plid,
jppl.place_id,
@@ -643,7 +644,7 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in in ('')
+ jg.grid_code in ('') or jpag.community_code in ('')
)
</otherwise>
</choose>
@@ -657,17 +658,20 @@
<resultMap type="org.springblade.modules.place.dto.PlaceDTO" id="PlaceDTOResult">
<result property="id" column="id" />
<result property="houseCode" column="house_code" />
+ <result property="houseCodeBinds" column="house_code_binds" />
<result property="buildingCode" column="building_code" />
<result property="principalUserId" column="principal_user_id" />
<result property="principal" column="principal" />
- <result property="principalIdCard" column="principal_id_card" />
<result property="principalPhone" column="principal_phone" />
+ <result property="principalIdCard" column="principal_id_card" />
<result property="placeName" column="place_name" />
<result property="lng" column="lng" />
<result property="lat" column="lat" />
<result property="location" column="location" />
<result property="imageUrls" column="image_urls" />
+ <result property="gridId" column="grid_id" />
<result property="gridCode" column="grid_code" />
+ <result property="jwGridCode" column="jw_grid_code" />
<result property="source" column="source" />
<result property="status" column="status" />
<result property="isScene" column="is_scene" />
@@ -682,39 +686,44 @@
<result property="remark" column="remark" />
<result property="isDeleted" column="is_deleted" />
<result property="aoiCode" column="aoi_code" />
+ <result property="threeFireProtection" column="three_fire_protection" />
</resultMap>
<sql id="selectPlace">
- select
- id,
- house_code,
- building_code,
- principal_user_id,
- principal,
- principal_id_card,
- principal_phone,
- place_name,
- lng,
- lat,
- location,
- image_urls,
- grid_code,
- source,
- status,
- is_scene,
- is_nine,
- nine_type,
- is_front,
- front_type,
- create_user,
- create_time,
- update_user,
- update_time,
- remark,
- is_deleted,
-
- from
- jczz_place
+ select
+ id,
+ house_code,
+ house_code_binds,
+ building_code,
+ principal_user_id,
+ principal,
+ principal_phone,
+ principal_id_card,
+ place_name,
+ lng,
+ lat,
+ location,
+ image_urls,
+ grid_id,
+ grid_code,
+ jw_grid_code,
+ source,
+ status,
+ is_scene,
+ is_nine,
+ nine_type,
+ is_front,
+ front_type,
+ create_user,
+ create_time,
+ update_user,
+ update_time,
+ remark,
+ is_deleted,
+ aoi_code,
+ three_fire_protection
+ from
+ jczz_place
</sql>
@@ -783,4 +792,122 @@
</choose>
</select>
+ <!--企业商超列表分页查询-->
+ <select id="selectMallPage" resultType="org.springblade.modules.place.vo.PlaceVO">
+ select
+ jp.*,
+ jpe.id as placeExtId,
+ br.town_name as townStreetName,
+ br.name as neiName,
+ jg.grid_name as gridName,
+ 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_place_rel jpr on jpr.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 jpr.community_code= jpag.jw_grid_code
+ left join blade_region br on br.code = jpr.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 and jp.source=3
+ and jp.place_name != ''
+ <if test="place.placeName!=null and place.placeName!=''">
+ and jp.place_name like concat('%',#{place.placeName},'%')
+ </if>
+ <if test="place.principal!=null and place.principal!=''">
+ and jp.principal like concat('%',#{place.principal},'%')
+ </if>
+ <if test="place.principalPhone!=null and place.principalPhone!=''">
+ and jp.principal_phone like concat('%',#{place.principalPhone},'%')
+ </if>
+ <if test="place.houseCode!=null and 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},'%')
+ </if>
+ <if test="place.neiName!=null and place.neiName!=''">
+ and br.name like concat('%',#{place.neiName},'%')
+ </if>
+ <if test="place.id!=null">
+ and jp.id = #{place.id}
+ </if>
+
+ <if test="place.isNine!=null">
+ and jp.is_nine = #{place.isNine}
+ </if>
+
+ <if test="place.source!=null">
+ and jp.source = #{place.source}
+ </if>
+ <if test="place.isPerfect==1">
+ and jp.status = 1
+ </if>
+ <if test="place.isPerfect==2">
+ and jp.status = 2
+ </if>
+ <if test="isAdministrator==2">
+ <choose>
+ <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 jpr.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 ('')
+ )
+ </otherwise>
+ </choose>
+ </otherwise>
+ </choose>
+ </if>
+ order by jp.create_time desc,jp.id desc
+ </select>
+
</mapper>
--
Gitblit v1.9.3