From b7a64234f80f2c8196b39a7d3b5ecde58dbf266d Mon Sep 17 00:00:00 2001
From: shangguanyanfei <shangguan@zdjizhi.com>
Date: Wed, 27 Mar 2019 09:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E7=9A=84Scheduler=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/include/form/scheduleNew.jsp      | 50 ++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/scheduleNew.jsp b/src/main/webapp/WEB-INF/include/form/scheduleNew.jsp
index 0d98f8dc5..fb2909188 100644
--- a/src/main/webapp/WEB-INF/include/form/scheduleNew.jsp
+++ b/src/main/webapp/WEB-INF/include/form/scheduleNew.jsp
@@ -14,6 +14,44 @@
 
 <script>
 	$(function(){
+		//获取国际化文件
+		var  title=$.validator.messages.compareDate;
+		var  date="2019-03-25 ";
+		//day 时间验证
+		jQuery.validator.addMethod("dayDate",function(value,element){
+			var flagTypeSame=true;
+			var dayValid = $("#dayValid").val();
+			var dayInvalid = $("#dayInvalid").val();
+			if(dayValid !=null && dayValid !="" && dayInvalid !=null && dayInvalid !=""){
+				flagTypeSame=CompareDate(date+dayValid,date+dayInvalid);
+			}
+			return flagTypeSame;
+		},title);
+		//week 时间验证
+		jQuery.validator.addMethod("weekDate",function(value,element){
+			var flagTypeSame=true;
+			var weekValid = $("#weekValid").val();
+			var weekInvalid = $("#weekInvalid").val();
+			if(weekValid !=null && weekValid !="" && weekInvalid !=null && weekInvalid !=""){
+				flagTypeSame=CompareDate(date+weekValid,date+weekInvalid);
+			}
+			return flagTypeSame;
+		},title);
+		//month 时间验证
+		jQuery.validator.addMethod("monthDate",function(value,element){
+			var flagTypeSame=true;
+			var monthValid = $("#monthValid").val();
+			var monthInvalid = $("#monthInvalid").val();
+			if(monthValid !=null && monthValid !="" && monthInvalid !=null && monthInvalid !=""){
+				flagTypeSame=CompareDate(date+monthValid,date+monthInvalid);
+			}
+			return flagTypeSame;
+		},title);
+		
+		//比较两个时间的大小
+		function CompareDate(d1,d2){
+			  return ((new Date(d1.replace(/-/g,"\/"))) <= (new Date(d2.replace(/-/g,"\/"))));
+		} 
 		//day week 切换
 		function initDayWeek(){
 			var dayWeekCheck = $("input.dayWeek:checked");
@@ -171,14 +209,14 @@
 			<div class="form-group ">
 	            <label class="control-label col-md-2"><spring:message code="startTime"></spring:message></label>
 	            <div class="col-md-4">
-	            	<input name="schedule.cronValid" type="text" class="form-control Wdate required" readonly="readonly"  value="${_cfg.schedule.cronValid }" onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
+	            	<input name="schedule.cronValid" type="text"  id="dayValid" class="form-control Wdate required " readonly="readonly"  value="${_cfg.schedule.cronValid }" onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
 	            </div>
 	            <div for="schedule.cronValid"></div>
 	        </div>
 	        <div class="form-group ">
 	            <label class="control-label col-md-2"><spring:message code="endTime"/></label>
 	            <div class="col-md-4">
-	            	<input name="schedule.cronInvalid" type="text" class="form-control Wdate required" readonly="readonly" value="${_cfg.schedule.cronInvalid }" onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
+	            	<input name="schedule.cronInvalid" type="text" id="dayInvalid" class="form-control Wdate required dayDate" readonly="readonly" value="${_cfg.schedule.cronInvalid }" onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
 	            </div>
 	            <div for="schedule.cronInvalid"></div>
 	        </div>
@@ -211,14 +249,14 @@
 			<div class="form-group ">
 	            <label class="control-label col-md-2"><spring:message code="startTime"></spring:message></label>
 	            <div class="col-md-4">
-	            	<input name="schedule.cronValid" type="text" class="form-control Wdate required" readonly="readonly"  value="${_cfg.schedule.cronValid }" onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
+	            	<input name="schedule.cronValid" type="text" id="weekValid" class="form-control Wdate required" readonly="readonly"  value="${_cfg.schedule.cronValid }" onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
 	            </div>
 	            <div for="schedule.cronValid"></div>
 	        </div>
 	        <div class="form-group ">
 	            <label class="control-label col-md-2"><spring:message code="endTime"/></label>
 	            <div class="col-md-4">
-	            	<input name="schedule.cronInvalid" type="text" class="form-control Wdate required" readonly="readonly" value="${_cfg.schedule.cronInvalid }" onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
+	            	<input name="schedule.cronInvalid" type="text" id="weekInvalid" class="form-control Wdate required weekDate" readonly="readonly" value="${_cfg.schedule.cronInvalid }" onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
 	            </div>
 	            <div for="schedule.cronInvalid"></div>
 	        </div>
@@ -316,14 +354,14 @@
 	        <div class="form-group ">
 	            <label class="control-label col-md-2"><spring:message code="startTime"></spring:message></label>
 	            <div class="col-md-4">
-	            	<input name="schedule.cronValid" type="text" class="form-control Wdate required" readonly="readonly"  value='${_cfg.schedule.cronValid }' onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
+	            	<input name="schedule.cronValid" type="text" id="monthValid" class="form-control Wdate required" readonly="readonly"  value='${_cfg.schedule.cronValid }' onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
 	            </div>
 	            <div for="schedule.cronValid"></div>
 	        </div>
 	        <div class="form-group ">
 	            <label class="control-label col-md-2"><spring:message code="endTime"/></label>
 	            <div class="col-md-4">
-	            	<input name="schedule.cronInvalid" type="text" class="form-control Wdate required" readonly="readonly" value='${_cfg.schedule.cronInvalid }' onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
+	            	<input name="schedule.cronInvalid" type="text" id="monthInvalid" class="form-control Wdate required monthDate" readonly="readonly" value='${_cfg.schedule.cronInvalid }' onClick="WdatePicker({dateFmt:'H:mm:ss'})"/>
 	            </div>
 	            <div for="schedule.cronInvalid"></div>
 	        </div>