From ecc14b8398e4b7072a3e4b6096e084fadd4a51d8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 11:29:51 +0800
Subject: [PATCH] opt: sql改造其他模块改造3

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 50ef8f3..65c5416 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,14 +34,14 @@
             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
-            ja_gd_work_order wo on pt.work_order_id = wo.id
+            ja_gd_work_order wo on pt.work_order_id = wo.id::VARCHAR
         left join
-                ja_gd_manage_device md on md.id = pt.device_id
+                ja_gd_manage_device md on md.id = pt.device_id::VARCHAR
         left join
             (
             select patrol_task_id,
@@ -53,7 +53,7 @@
                 is_deleted = 0
             group by
                 patrol_task_id
-            ) tr on tr.patrol_task_id = pt.id
+            ) tr on tr.patrol_task_id = pt.id::VARCHAR
         <where>
                 pt.is_deleted = 0
             <if test="param2.workOrderId != null and param2.workOrderId != ''">
@@ -92,7 +92,7 @@
         FROM
             ja_gd_patrol_task pt
         left join
-                ja_gd_manage_device md on md.id = pt.device_id
+                ja_gd_manage_device md on md.id = pt.device_id::VARCHAR
         WHERE pt.id = #{patrolTaskId}
     </select>
 
@@ -109,9 +109,9 @@
         FROM
             ja_gd_patrol_task pt
         left join
-            ja_gd_work_order wo on pt.work_order_id = wo.id
+            ja_gd_work_order wo on pt.work_order_id = wo.id::VARCHAR
         left join
-            ja_gd_manage_device md on md.id = pt.device_id
+            ja_gd_manage_device md on md.id = pt.device_id::VARCHAR
         WHERE pt.id = #{id}
     </select>
 

--
Gitblit v1.9.3