From b5ec00de9084a220ed48be99a322971a9b202aa2 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sat, 29 Dec 2018 11:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86-=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E4=B8=8D=E8=B6=85?=
 =?UTF-8?q?=E8=BF=87=E5=BD=93=E5=89=8D=E7=B3=BB=E7=BB=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/com/nis/web/service/LogService.java b/src/main/java/com/nis/web/service/LogService.java
index ef1691366..7595f9350 100644
--- a/src/main/java/com/nis/web/service/LogService.java
+++ b/src/main/java/com/nis/web/service/LogService.java
@@ -15,27 +15,24 @@ public class LogService extends CrudService<SysLogDao, SysLog> {
 	@Autowired
 	protected SysLogDao sysLogDao;
 	public Page<SysLog> findPage(Page<SysLog> page, SysLog sysLog) {
-		
 		// 设置默认时间范围，默认当前月
-		if (sysLog.getBeginDate() == null){
-			sysLog.setBeginDate(DateUtils.setDays(DateUtils.parseDate(DateUtils.getDate()), 1));
-		}
 		if (sysLog.getEndDate() == null){
-			sysLog.setEndDate(DateUtils.addMonths(sysLog.getBeginDate(), 1));
+			sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDateTime()));
+		}
+		if (sysLog.getBeginDate() == null){
+			sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));
 		}
-		
 		return super.findPage(page, sysLog);
 		
 	}
 
 	public Page<SysLog> findCfgOperationLogPage(Page<SysLog> page, SysLog sysLog) {
-		
 		// 设置默认时间范围，默认当前月
-		if (sysLog.getBeginDate() == null){
-			sysLog.setBeginDate(DateUtils.setDays(DateUtils.parseDate(DateUtils.getDate()), 1));
-		}
 		if (sysLog.getEndDate() == null){
-			sysLog.setEndDate(DateUtils.addMonths(sysLog.getBeginDate(), 1));
+			sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDateTime()));
+		}
+		if (sysLog.getBeginDate() == null){
+			sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));
 		}
 		sysLog.setPage(page);
 		List<SysLog> list = sysLogDao.findCfgOperationLogList(sysLog);
diff --git a/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp b/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
index 38dbafaea..896e2b12c 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"/>"
-											onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
+											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\')}'});" />
 									</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"/>"
-											onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
+											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'});" />
 									</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 4d8a3676a..fdc9c610d 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"/>"
-													onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
+													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\')}'});" />
 										</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"/>"
-													onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
+													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'});" />
 											</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>