Commit c07201511424187e0b4e74c3c234f23347c2887d

Authored by 廖磊
1 parent 75925811

新报表导出模板

src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -3714,7 +3714,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -3714,7 +3714,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
3714 List<ScheduleRealInfo> list3 = this.realScheduleList(line, date); 3714 List<ScheduleRealInfo> list3 = this.realScheduleList(line, date);
3715 3715
3716 Map<String, Object> nMap=new HashMap<String, Object>(); 3716 Map<String, Object> nMap=new HashMap<String, Object>();
3717 - nMap.put("date", date); 3717 + nMap.put("date", xlName+date);
3718 nMap.put("jls", list1.get(0).get("jls")); 3718 nMap.put("jls", list1.get(0).get("jls"));
3719 nMap.put("sjgl", list1.get(0).get("sjgl")); 3719 nMap.put("sjgl", list1.get(0).get("sjgl"));
3720 for (Map<String, Object> m : list1) { 3720 for (Map<String, Object> m : list1) {
src/main/resources/static/pages/forms/mould/countByBus1.xls 0 → 100644
No preview for this file type
src/main/resources/static/pages/forms/mould/countByBus2.xls 0 → 100644
No preview for this file type
src/main/resources/static/pages/forms/mould/countByLine.xls 0 → 100644
No preview for this file type
src/main/resources/static/pages/forms/statement/scheduleDaily.html
@@ -70,7 +70,7 @@ word-wrap: break-word; @@ -70,7 +70,7 @@ word-wrap: break-word;
70 <table class="table table-bordered table-hover table-checkable" id="forms"> 70 <table class="table table-bordered table-hover table-checkable" id="forms">
71 <thead> 71 <thead>
72 <tr> 72 <tr>
73 - <th colspan="40">线路调度日报</th> 73 + <th colspan="40"><lable id="xlmc"></lable>线路调度日报</th>
74 </tr> 74 </tr>
75 <tr> 75 <tr>
76 <td rowspan="3"><span >路线名</span></td> 76 <td rowspan="3"><span >路线名</span></td>
@@ -407,6 +407,7 @@ word-wrap: break-word; @@ -407,6 +407,7 @@ word-wrap: break-word;
407 layer.msg("请选择时间"); 407 layer.msg("请选择时间");
408 return; 408 return;
409 } 409 }
  410 + $("#xlmc").html(xlName);
410 $("#ddrbBody").height($(window).height()-100); 411 $("#ddrbBody").height($(window).height()-100);
411 $("c").html("全日"); 412 $("c").html("全日");
412 $("#export").removeAttr("disabled"); 413 $("#export").removeAttr("disabled");