区域划分调整

rain

2026-01-29 5b23a8cb9294506d88330f0750f39b9a2cbabbdc

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml

@@ -14,6 +14,10 @@
        <result column="fly_date_start" property="flyDateStart"/>
        <result column="fly_date_end" property="flyDateEnd"/>
        <result column="area_code" property="areaCode"/>
        <result column="area_type_keys" property="areaTypeKeys"/>
        <result column="police_station_name" property="policeStationName"/>
        <result column="police_station_contact_person" property="policeStationContactPerson"/>
        <result column="police_station_contact_phone" property="policeStationContactPhone"/>
    </resultMap>

    <resultMap id="fwAreaDivideStatisticsResultMap" type="org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO">
@@ -31,7 +35,10 @@

    <select id="selectFwAreaDividePage" resultMap="fwAreaDivideResultMap">
        select
            ad.*
            ad.*,
            ps.station_name as police_station_name,
            ps.contact_person as police_station_contact_person,
            ps.contact_phone as police_station_contact_phone
        from
            ja_fw_area_divide ad
        left join
@@ -79,7 +86,10 @@

    <select id="selectFwAreaDivideList" resultMap="fwAreaDivideResultMap">
        select
            ad.*
            ad.*,
            ps.station_name as police_station_name,
            ps.contact_person as police_station_contact_person,
            ps.contact_phone as police_station_contact_phone
        from ja_fw_area_divide ad
        left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
        <where>
@@ -397,6 +407,7 @@
            fly_date_start,
            fly_date_end,
            area_code,
            area_type_keys,
            create_user,
            create_dept,
            create_time,
@@ -415,6 +426,7 @@
            #{flyDateStart},
            #{flyDateEnd},
            #{areaCode},
            #{areaTypeKeys},
            #{createUser},
            #{createDept},
            #{createTime},
@@ -437,6 +449,7 @@
            <if test="flyDateStart != null">fly_date_start = #{flyDateStart},</if>
            <if test="flyDateEnd != null">fly_date_end = #{flyDateEnd},</if>
            <if test="areaCode != null">area_code = #{areaCode},</if>
            <if test="areaTypeKeys != null">area_type_keys = #{areaTypeKeys},</if>
            <if test="createUser != null">create_user = #{createUser},</if>
            <if test="createDept != null">create_dept = #{createDept},</if>
            <if test="createTime != null">create_time = #{createTime},</if>