From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/resources/mapper/HistoryMinutelyMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 85ee9b4..45e4746 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -163,8 +163,8 @@
and hm.time <![CDATA[<=]]> #{endTime}
</when>
<otherwise>
- and hm.time >= DATE_ADD(NOW(), INTERVAL -30 MINUTE)
- and hm.time <![CDATA[<=]]> now()
+ and hm.time >= date_add(now(), interval '-1 01:00:00' day_second)
+ and hm.time <![CDATA[<=]]> date_sub(now(),interval 1 day)
</otherwise>
</choose>
ORDER BY hm.time
--
Gitblit v1.8.0