Merge remote-tracking branch 'origin/master'

rain

2026-01-21 939a99e2b94ca9dc96cf88b1ec403fc357f50e8a

 drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml

@@ -13,6 +13,8 @@
        <result column="skilled_uav_type" property="skilledUavType"/>
        <result column="skilled_task_type" property="skilledTaskType"/>
        <result column="area_code" property="areaCode"/>
        <result column="flyer_address" property="flyerAddress"/>
        <result column="certification" property="certification" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
        <result column="create_user" property="createUser"/>
        <result column="create_dept" property="createDept"/>
        <result column="create_time" property="createTime"/>
@@ -24,7 +26,24 @@


    <select id="selectGdFlyerPage" resultMap="gdFlyerResultMap">
        select * from ja_gd_flyer where is_deleted = 0
        select * from ja_gd_flyer
        <where>
            <if test="param2.flyerName != null and param2.flyerName != ''">
                and flyer_name like concat('%',#{param2.flyerName},'%')
            </if>
            <if test="param2.flyerPhone != null and param2.flyerPhone != ''">
                and flyer_phone like concat('%',#{param2.flyerPhone},'%')
            </if>
            <if test="param2.technicalStrength != null and param2.technicalStrength != ''">
                and technical_strength = #{param2.technicalStrength}
            </if>
            <if test="param2.skilledUavType != null and param2.skilledUavType != ''">
                and skilled_uav_type = #{param2.skilledUavType}
            </if>
            <if test="param2.skilledTaskType != null and param2.skilledTaskType != ''">
                and skilled_task_type = #{param2.skilledTaskType}
            </if>
        </where>
    </select>