时刻模板上传添加是否启用选项

zlz
1 parent c3521634
Showing 3 changed files with 20 additions and 11 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/resources/static/pages/trafficManage/js/timeTempletUpload.js
src/main/resources/static/pages/trafficManage/timeTempletUpload.html
@@ -530,7 +530,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			try {
 				//发送邮件
 				EmailBean mail = new EmailBean();
-				mail.setSubject("路单日志数据"+date);
+				mail.setSubject("浦东路单日志数据"+date);
 				mail.setContent(logSuccess+"<br/>成功数："+countSuccess+"<br/>" +logFailure+"<br/>失败数："+countFailure);
 				sendEmailController.sendMail(emailSendToAddress, mail);
 				logger.info("setLD-sendMail:邮件发送成功！");
@@ -1030,13 +1030,13 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					}
 					sBufferC.append("</BCList>");
 					sBufferC.append("</SKB>");
+					sBufferA = new StringBuffer();
+					sBufferA.append("<JHZLC>").append(df.format(zlc)).append("</JHZLC>");
+					sBufferA.append("<JHYYLC>").append(df.format(yylc)).append("</JHYYLC>");
+					sBuffer.append(sBufferA).append(sBufferB).append(sBufferC);
 				}
 			}
-
-			sBufferA = new StringBuffer();
-			sBufferA.append("<JHZLC>").append(df.format(zlc)).append("</JHZLC>");
-			sBufferA.append("<JHYYLC>").append(df.format(yylc)).append("</JHYYLC>");
-			sBuffer.append(sBufferA).append(sBufferB).append(sBufferC).append("</SKBs>");
+			sBuffer.append("</SKBs>");
 			if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
 				result = "success";
 				SKBUploadLogger skbUploadLogger ;
@@ -79,10 +79,16 @@
 		// 取得输入框的值
 		var inputs = $(".param input,select");
 		// 遍历数组
-		$.each(inputs, function(i, element) {
-			params[$(element).attr("name")] = $(element).val();
-		});
-        params["isCancel_ne"] = true;// 过滤作废时刻表
+        $.each(inputs, function(i, element) {
+            if($(element).attr("type") == 'checkbox'){
+                if($(element).is(':checked')){
+                    params[$(element).attr("name")] = $(element).val();
+                }
+            }else{
+                params[$(element).attr("name")] = $(element).val();
+            }
+        });
+        //params["isCancel_ne"] = true;// 过滤作废时刻表
 		var i = layer.load(2);
 		$get('/tic_ec', params, function(data) {
 			var content = data.data.content;
@@ -10,12 +10,15 @@
 		<form class="form-inline" action="">
 			<div style="display: inline-block;" class="param">
 				<span class="item-label" style="width: 80px;">线路: </span>
-				<select class="form-control" name="xl.id_eq" id="line" style="width: 180px;"></select>
+				<select class="form-control" name="xl.lineCode_like" id="line" style="width: 180px;"></select>
 			</div>
 			<div style="display: inline-block;margin-left: 15px;" class="param">
 				<span class="item-label" style="width: 80px;">模板名称（关键字）： </span>
 				<input class="form-control" type="text" id="tempName" name="name_like" style="width: 180px;"/>
 			</div>
+			<div style="display: inline-block;margin-left: 15px;" class="param">
+				<input type="checkbox" class="group-checkable icheck" name="isEnableDisTemplate_eq" value="true" checked> 是否启用
+			</div>
 			<div class="form-group" style="display: inline-block;margin-left: 15px;">
 				<input class="btn btn-default" type="button" id="search" value="查询"/>
 				<input class="btn btn-default" type="button" id="upload" value="上传"/>