From 495fad8166b5952c013aea275243cb9ee6e7fa2a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 10 Oct 2023 13:43:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
index cda70d3..ce67a21 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
@@ -15,6 +15,7 @@
SELECT history_second_uav.time,`value`
FROM history_second_uav WHERE mac = #{mac}
AND batch = #{batch}
- HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height}
+ HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height1}
+ and abs(`value`->>'$.flyhig') <![CDATA[<=]]> #{height2}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0