From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 677412f..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>
@@ -114,6 +115,15 @@
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>
+
<!-- 自定义更新工单状态语句 -->
<update id="updateWorkOrderById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
UPDATE ja_gd_work_order
--
Gitblit v1.9.3