From 0b5742177d3a663435da88c77f21c9a2649b4967 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 15:19:24 +0800
Subject: [PATCH] 机构导入优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 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 b77312a..b0b6fd9 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
@@ -34,8 +34,8 @@
pt.*,
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
+ COALESCE(tr.result_count, 0) as result_count,
+ COALESCE(tr.issue_event_count, 0) as issue_event_count
from
ja_gd_patrol_task pt
left join
@@ -55,6 +55,7 @@
patrol_task_id
) tr on tr.patrol_task_id = pt.id
<where>
+ pt.is_deleted = 0
<if test="param2.workOrderId != null and param2.workOrderId != ''">
and pt.work_order_id = #{param2.workOrderId}
</if>
@@ -83,6 +84,7 @@
<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.*,
@@ -91,7 +93,35 @@
ja_gd_patrol_task pt
left join
ja_gd_manage_device md on md.id = pt.device_id
- WHERE id = #{patrolTaskId}
+ WHERE pt.id = #{patrolTaskId}
+ </select>
+
+
+ <select id="getPatrolTaskDetail" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
+ SELECT
+ pt.*,
+ md.airport_id as airport_id,
+ md.height,
+ md.longitude,
+ md.latitude,
+ md.nickname as device_name,
+ wo.work_order_name
+ FROM
+ ja_gd_patrol_task pt
+ left join
+ ja_gd_work_order wo on pt.work_order_id = wo.id
+ left join
+ ja_gd_manage_device md on md.id = pt.device_id
+ WHERE pt.id = #{id}
+ </select>
+
+ <select id="getWorkOrderIdById" resultType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
+ SELECT
+ *
+ FROM
+ ja_gd_work_order
+ WHERE id = #{id}
+ AND work_order_status = #{code}
</select>
<!-- 自定义更新工单状态语句 -->
--
Gitblit v1.9.3