From ebeb43ea497fafc448c827d1de6796bcaa4e0b52 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jun 2026 13:59:46 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
index 0895772..bc09b5d 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
@@ -74,6 +74,8 @@
and d2.device_type = '0'
<where>
md.is_deleted = 0
+ AND md.child_sn IS NOT NULL
+ AND trim(md.child_sn) != ''
<if test="deviceIds != null and deviceIds.size() > 0">
and md.id::text in
<foreach item="item" collection="deviceIds" index="index" open="(" close=")" separator=",">
@@ -84,8 +86,7 @@
and md.device_payload like concat('%', #{devicePayload}, '%')
</if>
<if test="geom != null and geom != ''">
- /* 确保这里是第一个条件时，and 能被 MyBatis 正确处理，或者直接去掉这个 and */
- AND ST_Intersects ( ST_SetSRID ( md.geom, 4326 ), ST_SetSRID ( ST_GeomFromText ( CONCAT( '\'', #{geom} ,'\'') ), 4326 ) )
+ AND public.st_intersects ( md.geom, public.st_geomfromtext(#{geom}::text, 4326))
</if>
<if test="deviceType != null and deviceType != '' ">
and md.device_type::text = #{deviceType}::text
--
Gitblit v1.9.3