潘钊 / bsth_control · Commits

Commit 94821ebe6fd78dd9b4eb30a94719e78a3880cd85

Authored by 娄高锋
1 parent 52dd1a82

LGF

Inline Side-by-side
Showing 3 changed files with 27 additions and 27 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @94821eb
@@ -526,9 +526,9 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -526,9 +526,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
526 ReportUtils ee = new ReportUtils(); 526 ReportUtils ee = new ReportUtils();
527 try { 527 try {
528 listI.add(resList.iterator()); 528 listI.add(resList.iterator());
529 - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";  
530 - ee.excelReplace(listI, new Object[] { m }, path+"mould\\busInterval"+statu+".xls",  
531 - path+"export\\班次间隔统计表" + sdfSimple.format(sdfMonth.parse(startDate)) 529 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  530 + ee.excelReplace(listI, new Object[] { m }, path+"mould/busInterval"+statu+".xls",
  531 + path+"export/班次间隔统计表" + sdfSimple.format(sdfMonth.parse(startDate))
532 + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls"); 532 + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
533 } catch (Exception e) { 533 } catch (Exception e) {
534 // TODO: handle exception 534 // TODO: handle exception
@@ -1076,9 +1076,9 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -1076,9 +1076,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1076 modelMap.put("lpType", "路牌名"); 1076 modelMap.put("lpType", "路牌名");
1077 try { 1077 try {
1078 listI.add(((List<Map<String, Object>>)modelMap.get("dataList")).iterator()); 1078 listI.add(((List<Map<String, Object>>)modelMap.get("dataList")).iterator());
1079 - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";  
1080 - ee.excelReplace(listI, new Object[] { modelMap }, path+"mould\\timeAndSpeed.xls",  
1081 - path+"export\\行驶时间及车速统计表" + sdfSimple.format(sdfMonth.parse(startDate)) 1079 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  1080 + ee.excelReplace(listI, new Object[] { modelMap }, path+"mould/timeAndSpeed.xls",
  1081 + path+"export/行驶时间及车速统计表" + sdfSimple.format(sdfMonth.parse(startDate))
1082 + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls"); 1082 + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
1083 } catch (Exception e) { 1083 } catch (Exception e) {
1084 // TODO: handle exception 1084 // TODO: handle exception
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
  View file @94821eb
@@ -259,9 +259,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -259,9 +259,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
259 ReportUtils ee = new ReportUtils(); 259 ReportUtils ee = new ReportUtils();
260 try { 260 try {
261 listI.add(resList.iterator()); 261 listI.add(resList.iterator());
262 - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";  
263 - ee.excelReplace(listI, new Object[] { m }, path+"mould\\peoCarPlan.xls",  
264 - path+"export\\计划车辆班次人员" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); 262 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  263 + ee.excelReplace(listI, new Object[] { m }, path+"mould/peoCarPlan.xls",
  264 + path+"export/计划车辆班次人员" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
265 } catch (Exception e) { 265 } catch (Exception e) {
266 // TODO: handle exception 266 // TODO: handle exception
267 e.printStackTrace(); 267 e.printStackTrace();
@@ -463,9 +463,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -463,9 +463,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
463 ReportUtils ee = new ReportUtils(); 463 ReportUtils ee = new ReportUtils();
464 try { 464 try {
465 listI.add(resList.iterator()); 465 listI.add(resList.iterator());
466 - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";  
467 - ee.excelReplace(listI, new Object[] { m }, path+"mould\\workDaily.xls",  
468 - path+"export\\营运服务日报表"+ sdfSimple.format(sdfMonth.parse(date))+".xls"); 466 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  467 + ee.excelReplace(listI, new Object[] { m }, path+"mould/workDaily.xls",
  468 + path+"export/营运服务日报表"+ sdfSimple.format(sdfMonth.parse(date))+".xls");
469 } catch (Exception e) { 469 } catch (Exception e) {
470 // TODO: handle exception 470 // TODO: handle exception
471 e.printStackTrace(); 471 e.printStackTrace();
@@ -735,9 +735,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -735,9 +735,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
735 ReportUtils ee = new ReportUtils(); 735 ReportUtils ee = new ReportUtils();
736 try { 736 try {
737 listI.add(resList.iterator()); 737 listI.add(resList.iterator());
738 - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";  
739 - ee.excelReplace(listI, new Object[] { m }, path+"mould\\scheduleAnaly.xls",  
740 - path+"export\\时刻表分析" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls"); 738 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  739 + ee.excelReplace(listI, new Object[] { m }, path+"mould/scheduleAnaly.xls",
  740 + path+"export/时刻表分析" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
741 } catch (Exception e) { 741 } catch (Exception e) {
742 // TODO: handle exception 742 // TODO: handle exception
743 e.printStackTrace(); 743 e.printStackTrace();
@@ -989,9 +989,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -989,9 +989,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
989 ReportUtils ee = new ReportUtils(); 989 ReportUtils ee = new ReportUtils();
990 try { 990 try {
991 listI.add(resList.iterator()); 991 listI.add(resList.iterator());
992 - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";  
993 - ee.excelReplace(listI, new Object[] { m }, path+"mould\\firstAndLastBus.xls",  
994 - path+"export\\线路首末班" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); 992 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  993 + ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus.xls",
  994 + path+"export/线路首末班" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
995 } catch (Exception e) { 995 } catch (Exception e) {
996 // TODO: handle exception 996 // TODO: handle exception
997 e.printStackTrace(); 997 e.printStackTrace();
@@ -1146,9 +1146,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1146,9 +1146,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1146 ReportUtils ee = new ReportUtils(); 1146 ReportUtils ee = new ReportUtils();
1147 try { 1147 try {
1148 listI.add(resList.iterator()); 1148 listI.add(resList.iterator());
1149 - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";  
1150 - ee.excelReplace(listI, new Object[] { m }, path+"mould\\commandState.xls",  
1151 - path+"export\\指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); 1149 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  1150 + ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState.xls",
  1151 + path+"export/指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
1152 } catch (Exception e) { 1152 } catch (Exception e) {
1153 // TODO: handle exception 1153 // TODO: handle exception
1154 e.printStackTrace(); 1154 e.printStackTrace();
@@ -1172,9 +1172,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1172,9 +1172,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1172 + " 车辆：" + map1.get("clZbh") + " 人员：" + map1.get("jsy")); 1172 + " 车辆：" + map1.get("clZbh") + " 人员：" + map1.get("jsy"));
1173 } 1173 }
1174 } 1174 }
1175 - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";  
1176 - ee.excelReplace(listI, new Object[] { m }, path+"mould\\commandState1.xls",  
1177 - path+"export\\指令状态明细" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); 1175 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  1176 + ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState1.xls",
  1177 + path+"export/指令状态明细" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
1178 } catch (Exception e) { 1178 } catch (Exception e) {
1179 // TODO: handle exception 1179 // TODO: handle exception
1180 e.printStackTrace(); 1180 e.printStackTrace();
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @94821eb
@@ -277,16 +277,16 @@ @@ -277,16 +277,16 @@
277 var line = $("#line").val(); 277 var line = $("#line").val();
278 var xlName = $("#select2-line-container").html(); 278 var xlName = $("#select2-line-container").html();
279 var date = $("#date").val(); 279 var date = $("#date").val();
280 - $get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName},function(result){ 280 + $get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
281 var scheduleDaily_1 = template('scheduleDaily_1',{list:result}); 281 var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
282 $('#forms .scheduleDaily_1').html(scheduleDaily_1); 282 $('#forms .scheduleDaily_1').html(scheduleDaily_1);
283 }); 283 });
284 - $.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){ 284 + $.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){
285 console.log(result); 285 console.log(result);
286 var scheduleDaily_2 = template('scheduleDaily_2',{list:result}); 286 var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
287 $('#forms .scheduleDaily_2').html(scheduleDaily_2); 287 $('#forms .scheduleDaily_2').html(scheduleDaily_2);
288 }); 288 });
289 - $.get('/realSchedule/realScheduleList',{line:line,date:date},function(result){ 289 + $.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query"},function(result){
290 var scheduleDaily_3 = template('scheduleDaily_3',{list:result}); 290 var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
291 $('#forms .scheduleDaily_3').html(scheduleDaily_3); 291 $('#forms .scheduleDaily_3').html(scheduleDaily_3);
292 }); 292 });