From ef327df373735b12450fb2e2eb107de29552d99a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 05 Jun 2026 18:13:12 +0800
Subject: [PATCH] fix(workorder): 修复工单和巡检任务查询的类型匹配问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 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 5ce3bf5..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,
@@ -115,7 +115,7 @@
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：过滤条件也进行类型对齐 */
--
Gitblit v1.9.3