From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 3356754..f5a5cc6 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
@@ -32,7 +32,7 @@
<select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
select
pt.*,
- md.nickname as deviceName,
+ md.nickname as device_name,
wo.work_order_name,
IFNULL(tr.result_count, 0) as result_count,
IFNULL(tr.issue_event_count, 0) as issue_event_count
@@ -67,9 +67,9 @@
<if test="param2.taskStatus != null and param2.taskStatus != ''">
and pt.task_status = #{param2.taskStatus}
</if>
- <if test="param3 != null and param3.size > 0">
+ <if test="param2.deptList != null and param2.deptList.size > 0">
and pt.create_dept in
- <foreach collection="param3" item="deptId" open="(" separator="," close=")">
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
@@ -83,6 +83,16 @@
<select id="exportGdPatrolTask" resultType="org.sxkj.gd.workorder.excel.GdPatrolTaskExcel">
SELECT * FROM ja_gd_patrol_task ${ew.customSqlSegment}
</select>
+ <select id="getPatrolTaskIdById" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
+ SELECT
+ pt.*,
+ md.airport_id as airport_id
+ FROM
+ ja_gd_patrol_task pt
+ left join
+ ja_gd_manage_device md on md.id = pt.device_id
+ WHERE pt.id = #{patrolTaskId}
+ </select>
<!-- 自定义更新工单状态语句 -->
<update id="updateWorkOrderById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
--
Gitblit v1.9.3