From 9217ec61bae4e02be35f26c84b4993d3d9f97d86 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 05 Feb 2024 17:34:24 +0800
Subject: [PATCH] 消防自查优化

---
 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml |   41 ++++++++++++++++++++++++++++++++---------
 1 files changed, 32 insertions(+), 9 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 187979f..af299fc 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -105,7 +105,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
@@ -115,7 +115,7 @@
         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 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 +141,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!=''">
@@ -197,6 +197,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,9 +434,9 @@
         jpe.confirm_flag confirmFlag,
         jg.grid_name as gridName,
         bus.`name` AS policeName,
-        bu.phone AS policePhone,
+        bus.phone AS policePhone,
         jda.address_name,
-        bd.dept_name
+        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
@@ -443,7 +444,7 @@
         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 blade_dept bd on bd.id = bus.dept_id
+        LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
         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
@@ -514,9 +515,6 @@
                         #{code}
                     </foreach>
                 </when>
-                <otherwise>
-                    and jg.grid_code in ('')
-                </otherwise>
             </choose>
         </if>
         order by jp.create_time desc,jp.id desc
@@ -592,4 +590,29 @@
          and jw_grid_code is null
     </select>
 
+    <!--比对两点间的距离是否在1km 范围内(和地址总表位置对比)-->
+    <select id="comparisonPosition" resultType="java.lang.Integer">
+        select count(1) from jczz_doorplate_address where 1=1
+        and (
+            ACOS(
+            SIN(
+            ( #{place.y} * 3.1415 )/ 180 ) * SIN(( y * 3.1415 )/ 180 )
+             + COS(( #{place.y} * 3.1415 )/ 180 ) * COS(( y * 3.1415 )/ 180 ) * COS(( #{place.x} * 3.1415 )/ 180
+             - ( x * 3.1415 )/ 180 ))* 6370.996
+        ) &lt;= 1
+        and address_code = #{place.houseCode}
+    </select>
+
+
+    <!--比对两点间的距离是否在1km 范围内 (和采集的位置对比)-->
+    <select id="comparisonPositionNotHouseCode" resultType="java.lang.Boolean">
+        select (
+            ACOS(
+            SIN(
+            ( #{place.y} * 3.1415 )/ 180 ) * SIN(( #{place.lat} * 3.1415 )/ 180 )
+             + COS(( #{place.y} * 3.1415 )/ 180 ) * COS(( #{place.lat} * 3.1415 )/ 180 ) * COS(( #{place.x} * 3.1415 )/ 180
+             - ( #{place.lng} * 3.1415 )/ 180 ))* 6370.996
+        ) &lt;= 1
+    </select>
+
 </mapper>

--
Gitblit v1.9.3