From e68dabeb961dfff38543f7d76e445fcbcb345fcb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 09 Apr 2026 09:56:09 +0800
Subject: [PATCH] opt:优化

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml |   57 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 10 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 450bd28..bbd703f 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
@@ -3,7 +3,7 @@
 <mapper namespace="org.sxkj.gd.workorder.mapper.GdWorkOrderMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="gdWorkOrderResultMap" type="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+    <resultMap id="gdWorkOrderResultMap" type="org.sxkj.gd.workorder.vo.GdWorkOrderVO">
         <result column="id" property="id"/>
         <result column="work_order_name" property="workOrderName"/>
         <result column="work_order_code" property="workOrderCode"/>
@@ -37,8 +37,35 @@
                execute_start_time,
                execute_end_time,
                service_party,
-               ST_AsText(geom) geom,
+               public.st_astext(geom) geom,
                remark,
+               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}::BIGINT
+    </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,
+               public.st_astext(geom) geom,
+               reject_reason,
                area_code,
                create_user,
                create_dept,
@@ -64,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,
@@ -76,24 +103,34 @@
         wo.is_deleted,
         bu.name create_user_name
         from ja_gd_work_order wo
-            left join blade_user bu on wo.create_user = bu.id
+        /* 修改点1：关联两端全部转为 VARCHAR */
+        left join blade_user bu on wo.create_user::VARCHAR = bu.id::VARCHAR
         <where>
+            /* 修正语法：去掉开头的 and */
+            wo.is_deleted = 0
             <if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
-                and wo.work_order_status like concat(#{param2.workOrderStatus},'%')
+                and wo.work_order_status::VARCHAR like concat(#{param2.workOrderStatus},'%')
             </if>
             <if test="param2.workOrderName != null and param2.workOrderName != ''">
                 and wo.work_order_name like concat('%',#{param2.workOrderName},'%')
             </if>
             <if test="param2.workOrderType != null and param2.workOrderType != ''">
-                and wo.work_order_type = #{param2.workOrderType}
+                and wo.work_order_type::VARCHAR = #{param2.workOrderType}::VARCHAR
             </if>
-            <if test="param2.createUser != null and param2.createUser != ''">
-                and wo.create_user = #{param2.createUser}
+            <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 &gt;= #{param2.startTime}::timestamp AND wo.execute_end_time &lt;= #{param2.endTime}::timestamp
             </if>
-            and wo.is_deleted = 0
+            <if test="param2.deptList != null and param2.deptList.size > 0">
+                /* 修改点3：IN 查询内部元素类型转换 */
+                and wo.create_dept::VARCHAR in
+                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+                    #{deptId}::VARCHAR
+                </foreach>
+            </if>
         </where>
     </select>
 

--
Gitblit v1.9.3