From 074fe52e0ed01d4e303658dfc77f23d84fa984b6 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 03 Jun 2026 09:54:27 +0800
Subject: [PATCH] fix(workorder): 修复算法ID参数设置问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
index a1ec4b8..707cab7 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
@@ -61,7 +61,7 @@
and pt.work_order_id::VARCHAR = #{param2.workOrderId}::VARCHAR
</if>
<if test="param2.patrolTaskName != null and param2.patrolTaskName != ''">
- and pt.patrol_task_name like concat(#{param2.patrolTaskName},'%')
+ and pt.patrol_task_name like concat('%',#{param2.patrolTaskName},'%')
</if>
<if test="param2.patrolTaskType != null and param2.patrolTaskType != ''">
and pt.patrol_task_type::VARCHAR = #{param2.patrolTaskType}::VARCHAR
@@ -80,6 +80,7 @@
and pt.execute_time BETWEEN #{param2.startTime}::timestamp AND #{param2.endTime}::timestamp
</if>
</where>
+ order by pt.create_time desc, pt.execute_time asc
</select>
@@ -94,8 +95,8 @@
FROM
ja_gd_patrol_task pt
left join
- ja_gd_manage_device md on md.id = pt.device_id::VARCHAR
- WHERE pt.id = #{patrolTaskId}
+ ja_gd_manage_device md on md.id::VARCHAR = pt.device_id::VARCHAR
+ WHERE pt.id = #{patrolTaskId}::BIGINT
</select>
@@ -111,10 +112,10 @@
FROM
ja_gd_patrol_task pt
left join
- ja_gd_work_order wo on pt.work_order_id = wo.id::VARCHAR
+ ja_gd_work_order wo on pt.work_order_id::VARCHAR = wo.id::VARCHAR
left join
- ja_gd_manage_device md on md.id = pt.device_id::VARCHAR
- WHERE pt.id = #{id}
+ ja_gd_manage_device md on md.id::VARCHAR = pt.device_id::VARCHAR
+ WHERE pt.id = #{id}::BIGINT
</select>
<select id="getWorkOrderIdById" resultType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
@@ -143,4 +144,13 @@
WHERE id = #{workOrderParam.id}
</update>
+ <!-- 根据工单ID查询巡查任务列表（仅id和名称） -->
+ <select id="selectListByWorkOrderId" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskSimpleVO">
+ SELECT id, patrol_task_name AS patrolTaskName
+ FROM ja_gd_patrol_task
+ WHERE is_deleted = 0
+ AND work_order_id = #{workOrderId}::bigint
+ ORDER BY create_time DESC
+ </select>
+
</mapper>
--
Gitblit v1.9.3