From 97ad7e7702c7dbcef19d8fc05b23b7357670c6d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 29 Feb 2024 13:26:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 31938d0..742ae96 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -743,13 +743,13 @@
 
     <!--比对两点间的距离是否在1km 范围内 (和采集的位置对比)-->
     <select id="comparisonPositionNotHouseCode" resultType="java.lang.Boolean">
-        select (
+        select IFNULL((
             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
+        ),2) &lt;= 1
     </select>
 
 
@@ -761,4 +761,10 @@
          and lng != ''
     </select>
 
+    <!--查询对应未的场所 house_code_binds 为空，source = 1 的-->
+    <select id="selectPlaceNotDoorBindList" resultType="org.springblade.modules.place.entity.PlaceEntity">
+        select * from jczz_place where is_deleted = 0
+         and source = 1 and house_code_binds is null
+    </select>
+
 </mapper>

--
Gitblit v1.9.3