From 30dc5b1fa3bb545cb1c2f2445f26cb033d8295b9 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 03 Jun 2026 14:13:49 +0800
Subject: [PATCH] test:  注释类型字段

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml |   68 ++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 32 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 a7462c7..5ce3bf5 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
@@ -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,
@@ -81,50 +81,54 @@
 
     <select id="selectGdWorkOrderPage" resultMap="gdWorkOrderResultMap">
         select
-            wo.id,
-            wo.work_order_name,
-            wo.work_order_code,
-            wo.work_order_type,
-            wo.device_load_demand,
-            wo.recommend_device_ids,
-            wo.work_order_status,
-            wo.execute_start_time,
-            wo.execute_end_time,
-            wo.service_party,
-            ST_AsText(wo.geom) geom,
-            wo.remark,
-            wo.area_code,
-            wo.create_user,
-            wo.create_dept,
-            wo.create_time,
-            wo.update_user,
-            wo.update_time,
-            wo.status,
-            wo.is_deleted,
-            bu.name create_user_name
+        wo.id,
+        wo.work_order_name,
+        wo.work_order_code,
+        wo.work_order_type,
+        wo.device_load_demand,
+        wo.recommend_device_ids,
+        wo.work_order_status,
+        wo.execute_start_time,
+        wo.execute_end_time,
+        wo.service_party,
+        public.st_astext(wo.geom) geom,
+        wo.remark,
+        wo.area_code,
+        wo.create_user,
+        wo.create_dept,
+        wo.create_time,
+        wo.update_user,
+        wo.update_time,
+        wo.status,
+        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::VARCHAR
+        /* 修改点1：关联两端全部转为 VARCHAR */
+        left join blade_user bu on wo.create_user::VARCHAR = bu.id::VARCHAR
         <where>
-                and wo.is_deleted = 0
+            /* 修正语法：去掉开头的 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 wo.create_user = #{param2.createUser}
+                /* 修改点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">
-                and wo.create_dept in
+                /* 修改点3：IN 查询内部元素类型转换 */
+                and wo.create_dept::VARCHAR in
                 <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
-                    #{deptId}
+                    #{deptId}::VARCHAR
                 </foreach>
             </if>
         </where>

--
Gitblit v1.9.3