From 63f3ebc0b64b68fa5b57485cf27e0644831356ac Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sat, 29 Dec 2018 13:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86-=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E6=97=B6=E9=97=B4=E5=8E=BB=E9=99=A4=E6=97=B6=E5=88=86?=
 =?UTF-8?q?=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/service/LogService.java         | 4 ++--
 src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp | 8 ++++----
 src/main/webapp/WEB-INF/views/sys/logList.jsp             | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/web/service/LogService.java b/src/main/java/com/nis/web/service/LogService.java
index 7595f9350..87216ef73 100644
--- a/src/main/java/com/nis/web/service/LogService.java
+++ b/src/main/java/com/nis/web/service/LogService.java
@@ -17,7 +17,7 @@ public class LogService extends CrudService<SysLogDao, SysLog> {
 	public Page<SysLog> findPage(Page<SysLog> page, SysLog sysLog) {
 		// 设置默认时间范围，默认当前月
 		if (sysLog.getEndDate() == null){
-			sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDateTime()));
+			sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate()));
 		}
 		if (sysLog.getBeginDate() == null){
 			sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));
@@ -29,7 +29,7 @@ public class LogService extends CrudService<SysLogDao, SysLog> {
 	public Page<SysLog> findCfgOperationLogPage(Page<SysLog> page, SysLog sysLog) {
 		// 设置默认时间范围，默认当前月
 		if (sysLog.getEndDate() == null){
-			sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDateTime()));
+			sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate()));
 		}
 		if (sysLog.getBeginDate() == null){
 			sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));
diff --git a/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp b/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
index 896e2b12c..f460f31cc 100644
--- a/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
@@ -65,15 +65,15 @@
 											id="beginDate" name="beginDate" type="text"
 											readonly="readonly" maxlength="20"
 											class="form-control Wdate"
-											value="<fmt:formatDate value="${sysLog.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-											onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false,maxDate:'#F{$dp.$D(\'endDate\')}'});" />
+											value="<fmt:formatDate value="${sysLog.beginDate}" pattern="yyyy-MM-dd"/>"
+											onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false,maxDate:'#F{$dp.$D(\'endDate\')}'});" />
 									</div>
 									<div class="pull-left">
 										<label><spring:message code="" />&nbsp;</label> <input
 											id="endDate" name="endDate" type="text" readonly="readonly"
 											maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${sysLog.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-											onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'%y-%M-%d %H:%m:%s'});" />
+											value="<fmt:formatDate value="${sysLog.endDate}" pattern="yyyy-MM-dd"/>"
+											onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'%y-%M-%d'});" />
 									</div>
 									<div class="pull-left">
 										<label>&nbsp;</label>
diff --git a/src/main/webapp/WEB-INF/views/sys/logList.jsp b/src/main/webapp/WEB-INF/views/sys/logList.jsp
index fdc9c610d..578ecd6ad 100644
--- a/src/main/webapp/WEB-INF/views/sys/logList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/logList.jsp
@@ -54,15 +54,15 @@
 													id="beginDate" name="beginDate" type="text"
 													readonly="readonly" maxlength="20"
 													class="form-control Wdate"
-													value="<fmt:formatDate value="${sysLog.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-													onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false,maxDate:'#F{$dp.$D(\'endDate\')}'});" />
+													value="<fmt:formatDate value="${sysLog.beginDate}" pattern="yyyy-MM-dd"/>"
+													onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false,maxDate:'#F{$dp.$D(\'endDate\')}'});" />
 										</div>
 											<div class="pull-left">
 												<label><spring:message code="" />&nbsp;</label> <input
 													id="endDate" name="endDate" type="text" readonly="readonly"
 													maxlength="20" class="form-control Wdate"
-													value="<fmt:formatDate value="${sysLog.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-													onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'%y-%M-%d'});" />
+													value="<fmt:formatDate value="${sysLog.endDate}" pattern="yyyy-MM-dd"/>"
+													onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'%y-%M-%d'});" />
 											</div>
 											<div class="pull-left">
 												<label for="exception"><input id="exception" name="exception" type="checkbox" ${sysLog.exception eq '1'?' checked':''} value="1" /> <spring:message code="log_exception" /></label>