From 0b5742177d3a663435da88c77f21c9a2649b4967 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 15:19:24 +0800
Subject: [PATCH] 机构导入优化

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 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 74482e0..cf677f4 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
@@ -52,6 +52,32 @@
         where id = #{id}
     </select>
 
+    <select id="getWorkOrderByIdWithoutGeom" resultType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+        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,
+               remark,
+               ST_AsText(geom) geom,
+               reject_reason,
+               area_code,
+               create_user,
+               create_dept,
+               create_time,
+               update_user,
+               update_time,
+               status,
+               is_deleted
+        from ja_gd_work_order
+        where id = #{id}
+    </select>
+
 
     <select id="selectGdWorkOrderPage" resultMap="gdWorkOrderResultMap">
         select
@@ -141,7 +167,7 @@
         VALUES ( #{workOrderParam.workOrderName}, #{workOrderParam.workOrderCode}, #{workOrderParam.workOrderType},
                 #{workOrderParam.deviceLoadDemand}, #{workOrderParam.recommendDeviceIds}, #{workOrderParam.workOrderStatus},
                 #{workOrderParam.executeStartTime}, #{workOrderParam.executeEndTime}, #{workOrderParam.serviceParty},
-                ST_GeomFromText(#{workOrderParam.geom}), #{workOrderParam.remark}, #{workOrderParam.areaCode},
+                ST_GeomFromText(#{workOrderParam.geom}, 4326), #{workOrderParam.remark}, #{workOrderParam.areaCode},
                 #{workOrderParam.createUser}, #{workOrderParam.createDept}, #{workOrderParam.createTime},
                 #{workOrderParam.updateUser}, #{workOrderParam.updateTime}, #{workOrderParam.status}, #{workOrderParam.isDeleted})
     </insert>
@@ -178,7 +204,7 @@
                 service_party = #{workOrderParam.serviceParty},
             </if>
             <if test="workOrderParam.geom != null and workOrderParam.geom != ''">
-                geom = ST_GeomFromText(#{workOrderParam.geom}),
+                geom = ST_GeomFromText(#{workOrderParam.geom}, 4326),
             </if>
             <if test="workOrderParam.remark != null and workOrderParam.remark != ''">
                 remark = #{workOrderParam.remark},

--
Gitblit v1.9.3