From 0a79e4295745bc59c0f8b8624218df7a226d14b9 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 26 Feb 2026 18:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 5 +++--
1 files changed, 3 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 1ade68b..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>
--
Gitblit v1.9.3