From b954d7a119eb635394bf4ff3619a9ab4b4978e48 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 09:33:34 +0800
Subject: [PATCH] sql改造首页
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 26 ++++++++++++++++++--------
1 files changed, 18 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 677412f..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,8 +53,9 @@
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 != ''">
and pt.work_order_id = #{param2.workOrderId}
</if>
@@ -91,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>
@@ -108,12 +109,21 @@
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>
+ <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