潘钊 / bsth_control · Commits

Commit 9ae68afc8f7643a69a03c644a1c501da62d11d86

Authored by zlz
1 parent c3521634
build: skipped

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

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