Merge remote-tracking branch 'origin/master'

lin

2024-03-12 02f3b2a577143724b09a70cd13cd3e9256f5fc21

 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>

@@ -660,17 +657,20 @@
    <resultMap type="org.springblade.modules.place.dto.PlaceDTO" id="PlaceDTOResult">
        <result property="id"    column="id"    />
        <result property="houseCode"    column="house_code"    />
        <result property="houseCodeBinds"    column="house_code_binds"    />
        <result property="buildingCode"    column="building_code"    />
        <result property="principalUserId"    column="principal_user_id"    />
        <result property="principal"    column="principal"    />
        <result property="principalIdCard"    column="principal_id_card"    />
        <result property="principalPhone"    column="principal_phone"    />
        <result property="principalIdCard"    column="principal_id_card"    />
        <result property="placeName"    column="place_name"    />
        <result property="lng"    column="lng"    />
        <result property="lat"    column="lat"    />
        <result property="location"    column="location"    />
        <result property="imageUrls"    column="image_urls"    />
        <result property="gridId"    column="grid_id"    />
        <result property="gridCode"    column="grid_code"    />
        <result property="jwGridCode"    column="jw_grid_code"    />
        <result property="source"    column="source"    />
        <result property="status"    column="status"    />
        <result property="isScene"    column="is_scene"    />
@@ -684,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">
@@ -713,7 +714,8 @@
           update_user,
           update_time,
           remark,
           is_deleted
           is_deleted,

      from
           jczz_place
    </sql>
@@ -730,13 +732,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>

@@ -767,4 +769,21 @@
         and source = 1 and house_code_binds is null
    </select>

    <!--查询绑定的房屋-->
    <select id="getHouseBindMap" resultType="java.util.Map">
        select address_code as addressCode,address_name addressName from jczz_doorplate_address
        where
        <choose>
            <when test="houseCodeBinds!=null and houseCodeBinds!=''">
                address_code in
                <foreach collection="houseCodeBinds.split(',')" item="houseCode" separator="," open="(" close=")">
                    #{houseCode}
                </foreach>
            </when>
            <otherwise>
                address_code in ('')
            </otherwise>
        </choose>
    </select>

</mapper>