From d7c3b9b16a893788793624d5762508a9ece82935 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 07 Feb 2024 09:24:33 +0800
Subject: [PATCH] 九小数据未关联导入
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 597f649..2389e24 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -28,8 +28,8 @@
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_community jc on jc.`code`=jg.community_code
- LEFT JOIN blade_user bus on bus.id = jc.res_police_user_id
+ LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_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
(
@@ -105,17 +105,16 @@
jpe.confirm_flag confirmFlag,
jg.grid_name as gridName,
bus.`name` AS policeName,
- bu.phone AS policePhone,
- jda.address_name,
+ bus.phone AS policePhone,
+ IFNULL(jda.address_name,jp.location) addressName,
jpag.pcs_name deptName
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_community jc on jc.`code`=jg.community_code
- LEFT JOIN blade_user bus on bus.id = jc.res_police_user_id
- LEFT JOIN jczz_police_affairs_grid jpag on jpag.community_code= jg.community_code
+ LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_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
@@ -141,7 +140,7 @@
and br.town_name like concat('%',#{place.townStreetName},'%')
</if>
<if test="place.deptName!=null and place.deptName!=''">
- and bd.dept_name like concat('%',#{place.deptName},'%')
+ and jpag.pcs_name like concat('%',#{place.deptName},'%')
</if>
<if test="place.policeName!=null and place.policeName!=''">
@@ -150,6 +149,10 @@
<if test="place.nineType!=null and place.nineType!=''">
and jp.nine_type = #{place.nineType}
+ </if>
+
+ <if test="place.isFront!=null and place.isFront!=''">
+ and jp.is_front = #{place.isFront}
</if>
<if test="place.neiName!=null and place.neiName!=''">
@@ -197,6 +200,7 @@
jp.house_code houseCode,
jp.place_name AS NAME,
jp.is_nine AS isNine,
+ jp.is_front AS isFront,
br.name neiName,
FALSE AS hasChildren
FROM jczz_place jp
@@ -433,7 +437,7 @@
jpe.confirm_flag confirmFlag,
jg.grid_name as gridName,
bus.`name` AS policeName,
- bu.phone AS policePhone,
+ bus.phone AS policePhone,
jda.address_name,
jpag.pcs_name deptName
from jczz_place jp
@@ -441,9 +445,8 @@
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_community jc on jc.`code`=jg.community_code
- LEFT JOIN blade_user bus on bus.id = jc.res_police_user_id
- LEFT JOIN jczz_police_affairs_grid jpag on jpag.community_code= jg.community_code
+ LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_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
--
Gitblit v1.9.3