refactor(workorder): 修改巡查任务数据传输结构

linwei

2026-06-03 926c4e010eae5ed33fce7ebd9ac8a430e1155894

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

@@ -37,7 +37,7 @@
               execute_start_time,
               execute_end_time,
               service_party,
               ST_AsText(geom) geom,
               public.st_astext(geom) geom,
               remark,
               reject_reason,
               area_code,
@@ -49,7 +49,7 @@
               status,
               is_deleted
        from ja_gd_work_order
        where id = #{id}
        where id = #{id}::BIGINT
    </select>

    <select id="getWorkOrderByIdWithoutGeom" resultType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
@@ -64,7 +64,7 @@
               execute_end_time,
               service_party,
               remark,
               ST_AsText(geom) geom,
               public.st_astext(geom) geom,
               reject_reason,
               area_code,
               create_user,
@@ -91,7 +91,7 @@
        wo.execute_start_time,
        wo.execute_end_time,
        wo.service_party,
        ST_AsText(wo.geom) geom,
        public.st_astext(wo.geom) geom,
        wo.remark,
        wo.area_code,
        wo.create_user,
@@ -122,7 +122,7 @@
                and wo.create_user::VARCHAR = #{param2.createUser}::VARCHAR
            </if>
            <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
                and wo.create_time BETWEEN #{param2.startTime} AND #{param2.endTime}
                and wo.execute_start_time &lt;= #{param2.endTime}::timestamp AND wo.execute_end_time &gt;= #{param2.startTime}::timestamp
            </if>
            <if test="param2.deptList != null and param2.deptList.size > 0">
                /* 修改点3：IN 查询内部元素类型转换 */
@@ -160,7 +160,7 @@
    </select>


    <!-- 自定义插入语句，使用ST_GeometryFromText处理几何数据 -->
    <!-- 自定义插入语句，使用ST_GeomFromText处理几何数据 -->
    <insert id="saveWorkOrder" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
        INSERT INTO ja_gd_work_order ( work_order_name, work_order_code, work_order_type,
                                      device_load_demand, recommend_device_ids, work_order_status,
@@ -171,12 +171,12 @@
        VALUES ( #{workOrderParam.workOrderName}, #{workOrderParam.workOrderCode}, #{workOrderParam.workOrderType},
                #{workOrderParam.deviceLoadDemand}, #{workOrderParam.recommendDeviceIds}, #{workOrderParam.workOrderStatus},
                #{workOrderParam.executeStartTime}, #{workOrderParam.executeEndTime}, #{workOrderParam.serviceParty},
                ST_GeometryFromText(#{workOrderParam.geom}), #{workOrderParam.remark}, #{workOrderParam.areaCode},
                ST_GeomFromText(#{workOrderParam.geom}), #{workOrderParam.remark}, #{workOrderParam.areaCode},
                #{workOrderParam.createUser}, #{workOrderParam.createDept}, #{workOrderParam.createTime},
                #{workOrderParam.updateUser}, #{workOrderParam.updateTime}, #{workOrderParam.status}, #{workOrderParam.isDeleted})
    </insert>

    <!-- 自定义更新语句，使用ST_GeometryFromText处理几何数据 -->
    <!-- 自定义更新语句，使用ST_GeomFromText处理几何数据 -->
    <update id="updateWorkOrderById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
        UPDATE ja_gd_work_order
        <set>
@@ -208,7 +208,7 @@
                service_party = #{workOrderParam.serviceParty},
            </if>
            <if test="workOrderParam.geom != null and workOrderParam.geom != ''">
                geom = ST_GeometryFromText(#{workOrderParam.geom}),
                geom = ST_GeomFromText(#{workOrderParam.geom}),
            </if>
            <if test="workOrderParam.remark != null and workOrderParam.remark != ''">
                remark = #{workOrderParam.remark},