From 70223b3ef4df02622869425fed4ba9b290e1aa74 Mon Sep 17 00:00:00 2001 From: fei.wang <wf18701153496@163.com> Date: 星期二, 16 四月 2024 14:07:59 +0800 Subject: [PATCH] V定制1.0 1:对讲功能 2:计算经纬度控制器systemcontrollen --- src/main/java/com/hxzk/mapper/KaoQinDao.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hxzk/mapper/KaoQinDao.java b/src/main/java/com/hxzk/mapper/KaoQinDao.java index 99ba89c..24e4f37 100644 --- a/src/main/java/com/hxzk/mapper/KaoQinDao.java +++ b/src/main/java/com/hxzk/mapper/KaoQinDao.java @@ -13,9 +13,10 @@ @Select("select * from tb_kaoqing_${nyr}") public List<TbKaoqing> findAllKaoQin(String nyr); - @Select("select * from tb_kaoqing_${name} where intime >= #{intime} and outtime <= #{outtime} UNION select * from tb_kaoqing_${bumen} where intime >= #{intime} and outtime <= #{outtime}") + @Select("select * from tb_kaoqing_${name} WHERE intime >= #{intime} ${bumen} where outtime <= #{outtime}") public List<TbKaoqing> findSearchTime(TbKaoqing kaoqing); - @Select("SELECT * FROM tb_kaoqing_${name} WHERE name = #{tagid} or tagid = #{tagid} and intime >= #{intime} and outtime <= #{outtime} UNION SELECT * FROM tb_kaoqing_${bumen} WHERE name = #{tagid} or tagid = #{tagid} and intime >= #{intime} and outtime <= #{outtime}") + @Select("select * from tb_kaoqing_${name} WHERE name = #{tagid} or tagid = #{tagid} and intime >= #{intime} ${bumen} and outtime <= #{outtime}") +// @Select("SELECT * FROM tb_kaoqing_${name} WHERE name = #{tagid} or tagid = #{tagid} and intime >= #{intime} and outtime <= #{outtime} UNION SELECT * FROM tb_kaoqing_${bumen} WHERE name = #{tagid} or tagid = #{tagid} and intime >= #{intime} and outtime <= #{outtime}") public List<TbKaoqing> findSearch(TbKaoqing kaoqing); } -- Gitblit v1.9.3