潘钊 / bsth_control · Commits

Commit 7c9978b258ef8fba4efb7467b1a17d1aeaa4f361

Authored by 徐烜
2 parents 96a975d0 6dcb6255
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 2 changed files with 7 additions and 4 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @7c9978b
@@ -4197,6 +4197,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -4197,6 +4197,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
4197 4197
4198 4198
4199 if (type.equals("export")) { 4199 if (type.equals("export")) {
  4200 + String lineName = map.get("lineName").toString();
4200 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), 4201 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
4201 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 4202 sdfSimple = new SimpleDateFormat("yyyyMMdd");
4202 Map<String, Object> m = new HashMap<String, Object>(); 4203 Map<String, Object> m = new HashMap<String, Object>();
@@ -4214,7 +4215,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -4214,7 +4215,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4214 sourcePath = path + "mould/scheduleDaily_m.xls"; 4215 sourcePath = path + "mould/scheduleDaily_m.xls";
4215 } 4216 }
4216 ee.excelReplace(listI, new Object[]{nMap}, sourcePath, 4217 ee.excelReplace(listI, new Object[]{nMap}, sourcePath,
4217 - path + "export/调度日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); 4218 + path + "export/调度日报-"+ lineName + "-" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
4218 } catch (Exception e) { 4219 } catch (Exception e) {
4219 // TODO: handle exception 4220 // TODO: handle exception
4220 e.printStackTrace(); 4221 e.printStackTrace();
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @7c9978b
@@ -47,8 +47,8 @@ @@ -47,8 +47,8 @@
47 <span class="item-label" style="width: 80px;margin-left: 33px;">线路: </span> 47 <span class="item-label" style="width: 80px;margin-left: 33px;">线路: </span>
48 <select class="form-control" name="line" id="line" style="width: 180px;"></select> 48 <select class="form-control" name="line" id="line" style="width: 180px;"></select>
49 </div> 49 </div>
50 - <div style="display: inline-block;margin-left: 24px;">  
51 - <span class="item-label" style="width: 80px;">&nbsp;&nbsp;&nbsp;时间: </span> 50 + <div style="display: inline-block;margin-left: 38px;">
  51 + <span class="item-label" style="width: 80px;">时间: </span>
52 <input class="form-control" type="text" id="date" style="width: 180px;"/> 52 <input class="form-control" type="text" id="date" style="width: 180px;"/>
53 </div> 53 </div>
54 <div class="form-group"> 54 <div class="form-group">
@@ -481,14 +481,16 @@ @@ -481,14 +481,16 @@
481 layer.msg("请选择时间"); 481 layer.msg("请选择时间");
482 return; 482 return;
483 } 483 }
  484 + var lineName = $('#line option:selected').text();
484 params['line'] = line; 485 params['line'] = line;
  486 + params['lineName'] = lineName;
485 params['date'] = date; 487 params['date'] = date;
486 params['xlName'] = xlName; 488 params['xlName'] = xlName;
487 params['type'] = "export"; 489 params['type'] = "export";
488 params['state'] = '2'; 490 params['state'] = '2';
489 $get('/realSchedule/scheduleDailyExport', params, function(result){ 491 $get('/realSchedule/scheduleDailyExport', params, function(result){
490 if(date.length == 10) 492 if(date.length == 10)
491 - window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMMDD")); 493 + window.open("/downloadFile/download?fileName=调度日报-"+lineName+"-"+moment(date).format("YYYYMMDD"));
492 else 494 else
493 window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMM")); 495 window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMM"));
494 }); 496 });