From a48221b7377fc843f3e9fd9afadcc9e0db3e0394 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Jan 2026 14:44:22 +0800
Subject: [PATCH] 机构和区划接口优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 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 baf5370..e5aa178 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
@@ -13,6 +13,7 @@
<result column="patrol_route_url" property="patrolRouteUrl"/>
<result column="recommend_flyer_name" property="recommendFlyerName"/>
<result column="device_id" property="deviceId"/>
+ <result column="device_name" property="deviceName"/>
<result column="task_desc" property="taskDesc"/>
<result column="task_status" property="taskStatus"/>
<result column="area_code" property="areaCode"/>
@@ -29,20 +30,30 @@
<select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
- select pt.*,
- wo.work_order_name,
- IFNULL(tr.result_count, 0) as result_count,
- IFNULL(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
- left join (
- select patrol_task_id,
- count(*) as result_count,
- sum(case when distribute_status in (1,2) then 1 else 0 end) as issue_event_count
- from ja_gd_task_result
- where is_deleted = 0
- group by patrol_task_id
- ) tr on tr.patrol_task_id = pt.id
+ select
+ pt.*,
+ md.device_name,
+ wo.work_order_name,
+ IFNULL(tr.result_count, 0) as result_count,
+ IFNULL(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
+ left join
+ ja_gd_manage_device md on md.id = pt.device_id
+ left join
+ (
+ select patrol_task_id,
+ count(*) as result_count,
+ sum(case when distribute_status in (1,2) then 1 else 0 end) as issue_event_count
+ from
+ ja_gd_task_result
+ where
+ is_deleted = 0
+ group by
+ patrol_task_id
+ ) tr on tr.patrol_task_id = pt.id
<where>
<if test="param2.workOrderId != null and param2.workOrderId != ''">
and pt.work_order_id = #{param2.workOrderId}
--
Gitblit v1.9.3