From 3ff3de60e9274da9601fba4d2165fe46be4d7f07 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 22 Jun 2026 16:31:37 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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 d35b67e..ce5500c 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
@@ -160,4 +160,45 @@
ORDER BY create_time DESC
</select>
+ <!-- 查询待验收状态的巡查任务列表（对外接口） -->
+ <select id="selectPendingAcceptanceTasks" resultMap="gdPatrolTaskResultMap">
+ SELECT
+ pt.*,
+ md.nickname as device_name,
+ wo.work_order_name,
+ wo.work_order_status,
+ 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::VARCHAR = wo.id::VARCHAR
+ LEFT JOIN
+ ja_gd_manage_device md ON md.id::VARCHAR = pt.device_id::VARCHAR
+ 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::VARCHAR = pt.id::VARCHAR
+ <where>
+ pt.is_deleted = 0
+ AND wo.is_deleted = 0
+ AND wo.work_order_status::VARCHAR <= '40'::VARCHAR
+ <if test="queryParam.patrolTaskName != null and queryParam.patrolTaskName != ''">
+ AND pt.patrol_task_name LIKE CONCAT('%',#{queryParam.patrolTaskName},'%')
+ </if>
+ <if test="queryParam.startTime != null and queryParam.startTime != '' and queryParam.endTime != null and queryParam.endTime != ''">
+ AND pt.execute_time BETWEEN #{queryParam.startTime}::timestamp AND #{queryParam.endTime}::timestamp
+ </if>
+ </where>
+ ORDER BY pt.create_time DESC, pt.execute_time ASC
+ </select>
+
</mapper>
--
Gitblit v1.9.3