From cb6efdef55c77da2bcc8dbd99a74e7e49c5ec067 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 05 Mar 2024 18:06:34 +0800
Subject: [PATCH] 邮件收件+bug修复+流程优化

---
 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 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 2fee25d..b429b06 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -323,6 +323,7 @@
         select
         jp.id,
         jp.house_code,
+        jp.house_code_binds,
         jp.building_code,
         jp.principal_user_id,
         jp.principal,
@@ -361,7 +362,12 @@
         left join jczz_doorplate_address jda on jda.address_code = jp.house_code
         where jp.is_deleted = 0
         <if test="place.houseCode!=null and place.houseCode!=''">
-            and jp.house_code like concat('%',#{place.houseCode},'%')
+            and
+            (
+            jp.house_code = #{place.houseCode}
+            or
+            jp.house_code_binds like concat('%',#{place.houseCode},'%')
+            )
         </if>
         <if test="place.id!=null">
             and jp.id = #{place.id}
@@ -678,6 +684,7 @@
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="isDeleted"    column="is_deleted"    />
+        <result property="aoiCode"    column="aoi_code"    />
     </resultMap>
 
     <sql id="selectPlace">
@@ -707,7 +714,8 @@
 	        update_user,
 	        update_time,
 	        remark,
-	        is_deleted
+	        is_deleted,
+
 		from
         	jczz_place
     </sql>
@@ -724,26 +732,26 @@
     <!--比对两点间的距离是否在1km 范围内(和地址总表位置对比)-->
     <select id="comparisonPosition" resultType="java.lang.Integer">
         select count(1) from jczz_doorplate_address where 1=1
-        and (
+        and IFNULL((
             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
+        ),2) &lt;= 1
         and address_code = #{place.houseCode}
     </select>
 
 
     <!--比对两点间的距离是否在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>
 
 
@@ -755,4 +763,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