商超导入调整

zhongrj

2024-03-07 606ca858db0ae1e0b44eecb4156782c32e2ab682

 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml

@@ -387,9 +387,6 @@
        <if test="place.doorplateNum!=null and place.doorplateNum!=''">
            and jpr.doorplate_num = #{place.doorplateNum}
        </if>
        <if test="place.placeName!=null and place.placeName!=''">
            and jp.place_name = #{place.placeName}
        </if>
        limit 1
    </select>

@@ -684,6 +681,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">
@@ -713,7 +711,8 @@
           update_user,
           update_time,
           remark,
           is_deleted
           is_deleted,

      from
           jczz_place
    </sql>
@@ -730,13 +729,13 @@
    <!--比对两点间的距离是否在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>