From b0b01b7302d2b9c6b2f5c6583d40b92b63e6b5f1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 06 Jun 2026 15:28:58 +0800
Subject: [PATCH] feat(workorder): 添加geojson字段支持并优化数据处理

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 2e7956d..f7f3972 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
@@ -7,7 +7,7 @@
         <result column="id" property="id"/>
         <result column="work_order_name" property="workOrderName"/>
         <result column="work_order_code" property="workOrderCode"/>
-        <result column="work_order_type" property="workOrderType"/>
+        <result column="work_order_type" property="workOrderType" typeHandler="org.sxkj.common.handler.GenericListTypeHandler"/>
         <result column="device_load_demand" property="deviceLoadDemand"/>
         <result column="recommend_device_ids" property="recommendDeviceIds"/>
         <result column="work_order_status" property="workOrderStatus"/>
@@ -26,7 +26,7 @@
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
-    <select id="getWorkOrderDetail" resultType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+    <select id="getWorkOrderDetail" resultMap="gdWorkOrderResultMap">
         select id,
                work_order_name,
                work_order_code,
@@ -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,
@@ -115,14 +115,14 @@
                 and wo.work_order_name like concat('%',#{param2.workOrderName},'%')
             </if>
             <if test="param2.workOrderType != null and param2.workOrderType != ''">
-                and wo.work_order_type::VARCHAR = #{param2.workOrderType}::VARCHAR
+                 and wo.work_order_type like concat('%',#{param2.workOrderType},'%')
             </if>
             <if test="param2.createUser != null ">
                 /* 修改点2：过滤条件也进行类型对齐 */
                 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 查询内部元素类型转换 */

--
Gitblit v1.9.3