From 077cedddebbfae2d740e259e9e16b0eb363f3a02 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 15:23:10 +0800
Subject: [PATCH] 巡查任务

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml |   81 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
index 36b88af..887c599 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
@@ -28,12 +28,89 @@
 
 
     <select id="selectGdWorkOrderPage" resultMap="gdWorkOrderResultMap">
-        select * from ja_gd_work_order where is_deleted = 0
+        select
+        id,
+        work_order_name,
+        work_order_code,
+        work_order_type,
+        device_load_demand,
+        recommend_device_ids,
+        work_order_status,
+        execute_start_time,
+        execute_end_time,
+        service_party,
+        ST_AsText(geom) geom,
+        remark,
+        area_code,
+        create_user,
+        create_dept,
+        create_time,
+        update_user,
+        update_time,
+        status,
+        is_deleted
+        from ja_gd_work_order
+        <where>
+            <if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
+                and work_order_status like concat(#{param2.workOrderStatus},'%')
+            </if>
+            <if test="param2.workOrderName != null and param2.workOrderName != ''">
+                and work_order_name like concat('%',#{param2.workOrderName},'%')
+            </if>
+            <if test="param2.workOrderType != null and param2.workOrderType != ''">
+                and work_order_type = #{param2.workOrderType}
+            </if>
+            <if test="param2.createUser != null and param2.createUser != ''">
+                and create_user = #{param2.createUser}
+            </if>
+
+        </where>
     </select>
 
 
     <select id="exportGdWorkOrder" resultType="org.sxkj.gd.workorder.excel.GdWorkOrderExcel">
-        SELECT * FROM ja_gd_work_order ${ew.customSqlSegment}
+        SELECT id, work_order_name, work_order_code, work_order_type, device_load_demand, recommend_device_ids,
+               work_order_status, execute_start_time, execute_end_time, service_party, geom, remark, area_code,
+               create_user, create_dept, create_time, update_user, update_time, status, is_deleted
+        FROM ja_gd_work_order ${ew.customSqlSegment}
     </select>
 
+    <!-- 自定义插入语句,使用ST_GeomFromText处理几何数据 -->
+    <insert id="insert" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+        INSERT INTO ja_gd_work_order (id, work_order_name, work_order_code, work_order_type,
+                                      device_load_demand, recommend_device_ids, work_order_status,
+                                      execute_start_time, execute_end_time, service_party,
+                                      geom, remark, area_code,
+                                      create_user, create_dept, create_time,
+                                      update_user, update_time, status, is_deleted)
+        VALUES (#{id}, #{workOrderName}, #{workOrderCode}, #{workOrderType},
+                #{deviceLoadDemand}, #{recommendDeviceIds}, #{workOrderStatus},
+                #{executeStartTime}, #{executeEndTime}, #{serviceParty},
+                ST_GeomFromText(#{geom}), #{remark}, #{areaCode},
+                #{createUser}, #{createDept}, #{createTime},
+                #{updateUser}, #{updateTime}, #{status}, #{isDeleted})
+    </insert>
+
+    <!-- 自定义更新语句,使用ST_GeomFromText处理几何数据 -->
+    <update id="updateById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+        UPDATE ja_gd_work_order
+        SET work_order_name      = #{workOrderName},
+            work_order_code      = #{workOrderCode},
+            work_order_type      = #{workOrderType},
+            device_load_demand   = #{deviceLoadDemand},
+            recommend_device_ids = #{recommendDeviceIds},
+            work_order_status    = #{workOrderStatus},
+            execute_start_time   = #{executeStartTime},
+            execute_end_time     = #{executeEndTime},
+            service_party        = #{serviceParty},
+            geom                 = ST_GeomFromText(#{geom}),
+            remark               = #{remark},
+            area_code            = #{areaCode},
+            update_user          = #{updateUser},
+            update_time          = #{updateTime},
+            status               = #{status},
+            is_deleted           = #{isDeleted}
+        WHERE id = #{id}
+    </update>
+
 </mapper>

--
Gitblit v1.9.3