gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://192.168.10.125/galaxy/galaxy-service.git into develop

Browse Source
This commit is contained in:
renkaige
2018-12-15 16:00:27 +06:00
parent 4a436cdb74 01ddc362c4
commit 68e37c8f56
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/dao/NtcReportDao.xml
View File

@@ -618,7 +618,7 @@
<![CDATA[AND REPORT_TIME >= STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s') AND REPORT_TIME < STR_TO_DATE(#{searchReportEndTime},'%Y-%m-%d %H:%i:%s')]]> <![CDATA[AND REPORT_TIME >= STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s') AND REPORT_TIME < STR_TO_DATE(#{searchReportEndTime},'%Y-%m-%d %H:%i:%s')]]>
</when> </when>
<otherwise> <otherwise>
and REPORT_TIME>=DATE_SUB(now(), INTERVAL 1 DAY) and REPORT_TIME>=DATE_SUB(now(), INTERVAL 1 HOUR)
</otherwise> </otherwise>
</choose> </choose>
@@ -634,7 +634,7 @@
<![CDATA[AND REPORT_TIME >= STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s') AND REPORT_TIME < STR_TO_DATE(#{searchReportEndTime},'%Y-%m-%d %H:%i:%s')]]> <![CDATA[AND REPORT_TIME >= STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s') AND REPORT_TIME < STR_TO_DATE(#{searchReportEndTime},'%Y-%m-%d %H:%i:%s')]]>
</when> </when>
<otherwise> <otherwise>
and REPORT_TIME>DATE_SUB(now(), INTERVAL 1 DAY) and REPORT_TIME>DATE_SUB(now(), INTERVAL 1 HOUR)
</otherwise> </otherwise>
</choose> </choose>
@@ -659,7 +659,7 @@
<![CDATA[AND REPORT_TIME >= STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s') AND REPORT_TIME < STR_TO_DATE(#{searchReportEndTime},'%Y-%m-%d %H:%i:%s')]]> <![CDATA[AND REPORT_TIME >= STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s') AND REPORT_TIME < STR_TO_DATE(#{searchReportEndTime},'%Y-%m-%d %H:%i:%s')]]>
</when> </when>
<otherwise> <otherwise>
<![CDATA[AND REPORT_TIME>DATE_SUB(now(), INTERVAL 1 DAY) ]]> <![CDATA[AND REPORT_TIME>DATE_SUB(now(), INTERVAL 1 HOUR) ]]>
</otherwise> </otherwise>
</choose> </choose>
</where> </where>