Merge remote-tracking branch 'origin/master'

linwei

2026-01-20 cdb2e3a30d1b3b246bb62310926a3e2d2c70ac2c

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml

@@ -10,7 +10,8 @@
        <result column="result_url" property="resultUrl"/>
        <result column="shoot_time" property="shootTime"/>
        <result column="photo_data" property="photoData"/>
        <result column="location" property="location"/>
        <result column="longitude" property="longitude"/>
        <result column="latitude" property="latitude"/>
        <result column="distribute_status" property="distributeStatus"/>
        <result column="area_code" property="areaCode"/>
        <result column="create_user" property="createUser"/>
@@ -22,6 +23,19 @@
        <result column="is_deleted" property="isDeleted"/>
        <result column="distribute_user_name" property="distributeUserName"/>
        <result column="distribute_dept_name" property="distributeDeptName"/>
    </resultMap>

    <resultMap id="gdTaskResultExcelResultMap" type="org.sxkj.gd.workorder.excel.GdTaskResultExcel">
        <result column="patrol_task_id" property="patrolTaskId"/>
        <result column="result_code" property="resultCode"/>
        <result column="result_url" property="resultUrl"/>
        <result column="shoot_time" property="shootTime"/>
        <result column="photo_data" property="photoData"/>
        <result column="longitude" property="longitude"/>
        <result column="latitude" property="latitude"/>
        <result column="distribute_status" property="distributeStatus"/>
        <result column="area_code" property="areaCode"/>
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>


@@ -42,7 +56,7 @@
    </select>


    <select id="exportGdTaskResult" resultType="org.sxkj.gd.workorder.excel.GdTaskResultExcel">
    <select id="exportGdTaskResult" resultMap="gdTaskResultExcelResultMap">
        SELECT * FROM ja_gd_task_result ${ew.customSqlSegment}
    </select>