From bd959da23dfa97c60fee8c4818384e99d45fc879 Mon Sep 17 00:00:00 2001
From: zhitong.yu <xynz17@163.com>
Date: 星期四, 18 四月 2024 16:51:25 +0800
Subject: [PATCH] 版本：航锦化工 更新日志 1：聚集离开建筑后取消闪烁，2：聚集后产生大屏告警提示，聚集人员离开后大屏不显示告警提示，后台可查询到。
---
src/main/java/com/hxzk/mapper/KaoQinDao.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/hxzk/mapper/KaoQinDao.java b/src/main/java/com/hxzk/mapper/KaoQinDao.java
index 24e4f37..99c4b07 100644
--- a/src/main/java/com/hxzk/mapper/KaoQinDao.java
+++ b/src/main/java/com/hxzk/mapper/KaoQinDao.java
@@ -13,10 +13,9 @@
@Select("select * from tb_kaoqing_${nyr}")
public List<TbKaoqing> findAllKaoQin(String nyr);
- @Select("select * from tb_kaoqing_${name} WHERE intime >= #{intime} ${bumen} where 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} ${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}")
+ @Select("SELECT * FROM tb_kaoqing_${name} WHERE name = #{tagid} or tagid = #{tagid} 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