From 4dbd2e0a473ef33ecf8a7200f62b61d4dbd87f25 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 06 八月 2024 10:31:45 +0800
Subject: [PATCH] 电磁锁主动操控记录查询提交

---
 ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
index 97f4d7d..65a9bc3 100644
--- a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
@@ -310,14 +310,6 @@
     </select>
 
     <select id="getArdAlarmpointsWellByDeptIdAndDistance" resultMap="ArdAlarmpointsWellOnlyResult">
-        /*select * from ard_alarmpoints_well aaw
-        where aaw.dept_id in (
-            with recursive rsd as (
-                select sd.dept_id from sys_dept sd where sd.dept_id = #{deptId}
-                union
-                select csd.dept_id from sys_dept csd inner join rsd on rsd.dept_id = csd.parent_id
-            )
-            select * from rsd)*/
         select * from ard_alarmpoints_well aaw
         where aaw.dept_id in (
         with recursive rsd as (
@@ -325,14 +317,14 @@
         union
         select csd.dept_id from sys_dept csd inner join rsd on rsd.dept_id = csd.parent_id
         )
-        select * from rsd) and f_compute_distance(aaw.longitude,aaw.latitude,#{lonM},#{latM}) &lt;= (select max(t.distance) from (
-        select f_compute_distance(#{lonM},#{latM},#{lonA},#{latA}) as distance
+        select * from rsd) and f_compute_distance(aaw.longitude,aaw.latitude,cast(#{lonM} as numeric),cast(#{latM} as numeric)) &lt;= (select max(t.distance) from (
+        select f_compute_distance(cast(#{lonM} as numeric),cast(#{latM} as numeric),cast(#{lonA} as numeric),cast(#{latA} as numeric)) as distance
         union
-        select f_compute_distance(#{lonM},#{latM},#{lonB},#{latB}) as distance
+        select f_compute_distance(cast(#{lonM} as numeric),cast(#{latM} as numeric),cast(#{lonB} as numeric),cast(#{latB} as numeric)) as distance
         union
-        select f_compute_distance(#{lonM},#{latM},#{lonC,#{latC}) as distance
+        select f_compute_distance(cast(#{lonM} as numeric),cast(#{latM} as numeric),cast(#{lonC} as numeric),cast(#{latC} as numeric)) as distance
         union
-        select f_compute_distance(#{lonM},#{latM},#{lonD},#{latD}) as distance
+        select f_compute_distance(cast(#{lonM} as numeric),cast(#{latM} as numeric),cast(#{lonD} as numeric),cast(#{latD} as numeric)) as distance
         )t)
     </select>
 </mapper>

--
Gitblit v1.9.3