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

徐烜
2 parents 3258c46a 832c3a08
Showing 30 changed files with 252 additions and 7 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/account.xls
src/main/resources/static/pages/forms/mould/busInterval0.xls
src/main/resources/static/pages/forms/mould/busInterval1.xls
src/main/resources/static/pages/forms/mould/changetochange.xls
src/main/resources/static/pages/forms/mould/commandState.xls
src/main/resources/static/pages/forms/mould/commandState1.xls
src/main/resources/static/pages/forms/mould/correctForm.xls
src/main/resources/static/pages/forms/mould/firstAndLastBus.xls
src/main/resources/static/pages/forms/mould/historyMessage.xls
src/main/resources/static/pages/forms/mould/lbStatuAnaly.xls
src/main/resources/static/pages/forms/mould/linepasswengerflow.xls
src/main/resources/static/pages/forms/mould/list.xls
src/main/resources/static/pages/forms/mould/message.xls
src/main/resources/static/pages/forms/mould/operationservice.xls
src/main/resources/static/pages/forms/mould/peoCarPlan.xls
src/main/resources/static/pages/forms/mould/scheduleAnaly.xls
src/main/resources/static/pages/forms/mould/scheduleDaily.xls
@@ -429,4 +429,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.scheduleDailyQp(line,date);
 	}
+
+	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.scheduleDailyExport(map);
+	}
 }
@@ -144,4 +144,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> addRemarks(Long id, String remarks);
  
 	List<Map<String, Object>> scheduleDailyQp(String line ,String date);
+	
+	List<Map<String, Object>> scheduleDailyExport(Map<String, Object> map);
 }
@@ -1393,6 +1393,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double jhlc = 0, tempJhlc = 0, childMileage = 0;
         float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
         //班次
+        int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0;
         int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60;
         int jhbc = 0, jhbc_m = 0, jhbc_a = 0;
         int sjbc = 0, sjbc_m = 0, sjbc_a = 0;
@@ -1406,6 +1407,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         		ssgl_gzZ = 0f, ssgl_jfZ = 0f, ssgl_zsZ = 0f, ssgl_qrZ = 0f, ssgl_qcZ = 0f, 
         		ssgl_kxZ = 0f, ssgl_qhZ = 0f, ssgl_ywZ = 0f, ssgl_otherZ = 0f, ljglZ = 0f;
         //班次
+        int ssbcZ = 0, ssbc_lzZ = 0, ssbc_dmZ = 0, ssbc_gzZ = 0, ssbc_jfZ = 0, ssbc_zsZ = 0, ssbc_qrZ = 0, ssbc_qcZ = 0, ssbc_kxZ = 0, ssbc_qhZ = 0, ssbc_ywZ = 0, ssbc_otherZ = 0;
         int jhbcZ = 0, jhbc_mZ = 0, jhbc_aZ = 0;
         int sjbcZ = 0, sjbc_mZ = 0, sjbc_aZ = 0;
         int ljbcZ = 0, ljbc_mZ = 0, ljbc_aZ = 0;
@@ -1431,39 +1433,63 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                      if (scheduleRealInfo.getStatus() == -1) {
                         ssgl += tempJhlc;
                         ssglZ += tempJhlc;
+                        ssbc++;
+                        ssbcZ++;
                         if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) {
                             ssgl_lz += tempJhlc;
                             ssgl_lzZ += tempJhlc;
+                            ssbc_lz++;
+                            ssbc_lzZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) {
                             ssgl_dm += tempJhlc;
                             ssgl_dmZ += tempJhlc;
+                            ssbc_dm++;
+                            ssbc_dmZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) {
                             ssgl_gz += tempJhlc;
                             ssgl_gzZ += tempJhlc;
+                            ssbc_gz++;
+                            ssbc_gzZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) {
                             ssgl_jf += tempJhlc;
                             ssgl_jfZ += tempJhlc;
+                            ssbc_jf++;
+                            ssbc_jfZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) {
                             ssgl_zs += tempJhlc;
                             ssgl_zsZ += tempJhlc;
+                            ssbc_zs++;
+                            ssbc_zsZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) {
                             ssgl_qr += tempJhlc;
                             ssgl_qrZ += tempJhlc;
+                            ssbc_qr++;
+                            ssbc_qrZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) {
                             ssgl_qc += tempJhlc;
                             ssgl_qcZ += tempJhlc;
+                            ssbc_qc++;
+                            ssbc_qcZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) {
                             ssgl_kx += tempJhlc;
                             ssgl_kxZ += tempJhlc;
+                            ssbc_kx++;
+                            ssbc_kxZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) {
                             ssgl_qh += tempJhlc;
                             ssgl_qhZ += tempJhlc;
+                            ssbc_qh++;
+                            ssbc_qhZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) {
                             ssgl_yw += tempJhlc;
                             ssgl_ywZ += tempJhlc;
+                            ssbc_yw++;
+                            ssbc_ywZ++;
                         } else {
                             ssgl_other += tempJhlc;
                             ssgl_otherZ += tempJhlc;
+                            ssbc_other++;
+                            ssbc_otherZ++;
                         }
                     }else {
                         sjgl += tempJhlc;
@@ -1479,39 +1505,63 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         if (childTaskPlan.isDestroy()) {
                             ssgl += childMileage;
                             ssglZ += childMileage;
+                            ssbc++;
+                            ssbcZ++;
                             if (childTaskPlan.getDestroyReason().equals("路阻")) {
                                 ssgl_lz += childTaskPlan.getMileage();
                                 ssgl_lzZ += childTaskPlan.getMileage();
+                                ssbc_lzZ++;
+                                ssbc_lzZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("吊慢")) {
                                 ssgl_dm += childTaskPlan.getMileage();
                                 ssgl_dmZ += childTaskPlan.getMileage();
+                                ssbc_dm++;
+                                ssbc_dmZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("故障")) {
                                 ssgl_gz += childTaskPlan.getMileage();
                                 ssgl_gzZ += childTaskPlan.getMileage();
+                                ssbc_gz++;
+                                ssbc_gzZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("纠纷")) {
                                 ssgl_jf += childTaskPlan.getMileage();
                                 ssgl_jfZ += childTaskPlan.getMileage();
+                                ssbc_jf++;
+                                ssbc_jfZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("肇事")) {
                                 ssgl_zs += childTaskPlan.getMileage();
                                 ssgl_zsZ += childTaskPlan.getMileage();
+                                ssbc_zs++;
+                                ssbc_zsZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("缺人")) {
                                 ssgl_qr += childTaskPlan.getMileage();
                                 ssgl_qrZ += childTaskPlan.getMileage();
+                                ssbc_qr++;
+                                ssbc_qrZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("缺车")) {
                                 ssgl_qc += childTaskPlan.getMileage();
                                 ssgl_qcZ += childTaskPlan.getMileage();
+                                ssbc_qc++;
+                                ssbc_qcZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("客稀")) {
                                 ssgl_kx += childTaskPlan.getMileage();
                                 ssgl_kxZ += childTaskPlan.getMileage();
+                                ssbc_kx++;
+                                ssbc_kxZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("气候")) {
                                 ssgl_qh += childTaskPlan.getMileage();
                                 ssgl_qhZ += childTaskPlan.getMileage();
+                                ssbc_qh++;
+                                ssbc_qhZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("援外")) {
                                 ssgl_yw += childTaskPlan.getMileage();
                                 ssgl_ywZ += childTaskPlan.getMileage();
+                                ssbc_yw++;
+                                ssbc_ywZ++;
                             } else {
                                 ssgl_other += childTaskPlan.getMileage();
                                 ssgl_otherZ += childTaskPlan.getMileage();
+                                ssbc_other++;
+                                ssbc_otherZ++;
                             }
                         } else {
                             sjgl += childMileage;
@@ -1522,6 +1572,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
                 //班次
                 jhbc++;
+                jhbcZ++;
                 String[] fcsj = scheduleRealInfo.getFcsj().split(":");
                 String[] fcsjActual = (scheduleRealInfo.getFcsjActual() == null ? "0:00" : scheduleRealInfo.getFcsjActual()).split(":");
                 if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_1) {
@@ -1584,6 +1635,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
                         map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
                         map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+                        map.put("ssbc", ssbc);
+                        map.put("ssbc_lz", ssbc_lz);
+                        map.put("ssbc_dm", ssbc_dm);
+                        map.put("ssbc_gz", ssbc_gz);
+                        map.put("ssbc_jf", ssbc_jf);
+                        map.put("ssbc_zs", ssbc_zs);
+                        map.put("ssbc_qr", ssbc_qr);
+                        map.put("ssbc_qc", ssbc_qc);
+                        map.put("ssbc_kx", ssbc_kx);
+                        map.put("ssbc_qh", ssbc_qh);
+                        map.put("ssbc_yw", ssbc_yw);
+                        map.put("ssbc_other", ssbc_other);
                         map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
                         map.put("jhbc", jhbc);
                         map.put("jhbc_m", jhbc_m);
@@ -1634,6 +1697,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
                     map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
                     map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+                    map.put("ssbc", ssbc);
+                    map.put("ssbc_lz", ssbc_lz);
+                    map.put("ssbc_dm", ssbc_dm);
+                    map.put("ssbc_gz", ssbc_gz);
+                    map.put("ssbc_jf", ssbc_jf);
+                    map.put("ssbc_zs", ssbc_zs);
+                    map.put("ssbc_qr", ssbc_qr);
+                    map.put("ssbc_qc", ssbc_qc);
+                    map.put("ssbc_kx", ssbc_kx);
+                    map.put("ssbc_qh", ssbc_qh);
+                    map.put("ssbc_yw", ssbc_yw);
+                    map.put("ssbc_other", ssbc_other);
                     map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
                     map.put("jhbc", jhbc);
                     map.put("jhbc_m", jhbc_m);
@@ -1685,6 +1760,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ssgl_qh", ssgl_qhZ == 0 ? 0 : format.format(ssgl_qhZ));
         map.put("ssgl_yw", ssgl_ywZ == 0 ? 0 : format.format(ssgl_ywZ));
         map.put("ssgl_other", ssgl_otherZ == 0 ? 0 : format.format(ssgl_otherZ));
+        map.put("ssbc", ssbcZ);
+        map.put("ssbc_lz", ssbc_lzZ);
+        map.put("ssbc_dm", ssbc_lzZ);
+        map.put("ssbc_gz", ssbc_gzZ);
+        map.put("ssbc_jf", ssbc_jfZ);
+        map.put("ssbc_zs", ssbc_zsZ);
+        map.put("ssbc_qr", ssbc_qrZ);
+        map.put("ssbc_qc", ssbc_qcZ);
+        map.put("ssbc_kx", ssbc_qcZ);
+        map.put("ssbc_qh", ssbc_qhZ);
+        map.put("ssbc_yw", ssbc_ywZ);
+        map.put("ssbc_other", ssbc_otherZ);
         map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ));
         map.put("jhbc", jhbcZ);
         map.put("jhbc_m", jhbc_mZ);
@@ -2646,13 +2733,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		}
 		map.put("jhlc", format.format(jhlc+jcclc));
 		map.put("yygljh", format.format(jhlc));
-		map.put("ssgl", format.format(remgl));
+		map.put("ssgl", format.format(remMileage));
 		map.put("ksgl", format.format(ksgl));
 		map.put("yyglsj", format.format(yygl));
 		map.put("jhbc", jhbc);
 		map.put("jcclc", jcclc);
  
-		map.put("ljgl", format.format(addgl));
+		map.put("ljgl", format.format(addMileage));
 		map.put("ssbc", cjbc);
 		map.put("ysgl", format.format(yygl));
 		map.put("sjbc", jhbc-cjbc+ljbc);
@@ -2913,4 +3000,129 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		return list;
 	}
  
+
+	@Override
+	public List<Map<String, Object>> scheduleDailyExport(Map<String, Object> map){
+		String line = map.get("line").toString();
+		String date = map.get("date").toString();
+		String xlName = map.get("xlName").toString();
+		String state = map.get("state").toString();
+		String type = map.get("type").toString();
+		
+		List<Map<String, Object>> dataList2 = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> dataList3 = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> list1 = this.statisticsDaily(line, date, xlName, null);
+		List<ScheduleRealInfo> list2 = this.queryUserInfo(line, date, state);
+		List<ScheduleRealInfo> list3 = this.realScheduleList(line, date);
+		
+		for(Map<String, Object> m : list1){
+//			m.put("ssgl", m.get("ssgl"));
+//			m.put("ssbc", m.get("ssbc"));
+//			m.put("ssgl_lz", m.get("ssgl_lz") + " / " + m.get("ssbc_lz"));
+//			m.put("ssgl_dm", m.get("ssgl_dm") + " / " + m.get("ssbc_dm"));
+//			m.put("ssgl_gz", m.get("ssgl_gz") + " / " + m.get("ssbc_gz"));
+//			m.put("ssgl_jf", m.get("ssgl_jf") + " / " + m.get("ssbc_jf"));
+//			m.put("ssgl_zs", m.get("ssgl_zs") + " / " + m.get("ssbc_zs"));
+//			m.put("ssgl_qr", m.get("ssgl_qr") + " / " + m.get("ssbc_qr"));
+//			m.put("ssgl_qc", m.get("ssgl_qc") + " / " + m.get("ssbc_qc"));
+//			m.put("ssgl_kx", m.get("ssgl_kx") + " / " + m.get("ssbc_kx"));
+//			m.put("ssgl_qh", m.get("ssgl_qh") + " / " + m.get("ssbc_qh"));
+//			m.put("ssgl_yw", m.get("ssgl_yw") + " / " + m.get("ssbc_yw"));
+//			m.put("ssgl_other", m.get("ssgl_other") + " / " + m.get("ssbc_other"));
+		}
+		
+		int size = 0;
+		Map<String, Object> tempMap = new HashMap<String, Object>();
+		for(int i = 0; i < list2.size(); i++){
+			Object obj = (Object)list2.get(i);
+			Object[] objs = (Object[])obj;
+			if(size == 5){
+				size = 0;
+				dataList2.add(tempMap);
+				tempMap = new HashMap<String, Object>();
+			}
+			tempMap.put("lp" + size, objs[3]);
+			tempMap.put("ch" + size, objs[2]);
+			tempMap.put("jz" + size, objs[1] + "/" + objs[4]);
+			tempMap.put("sz" + size, "");
+			tempMap.put("jw" + size, "");
+			tempMap.put("sw" + size, "");
+			
+			size++;
+		}
+		if(size < 5){
+			for(;size < 5; size++){
+				tempMap.put("lp" + size, "");
+				tempMap.put("ch" + size, "");
+				tempMap.put("jz" + size, "");
+				tempMap.put("sz" + size, "");
+				tempMap.put("jw" + size, "");
+				tempMap.put("sw" + size, "");
+			}
+		}
+		
+		dataList2.add(tempMap);
+		
+		size = 0;
+		tempMap = new HashMap<String, Object>();
+		for(ScheduleRealInfo schedule : list3){
+			if(size == 3){
+				size = 0;
+				dataList3.add(tempMap);
+				tempMap = new HashMap<String, Object>();
+			}
+			tempMap.put("lpName" + size, schedule.getLpName());
+			tempMap.put("qdzName" + size, schedule.getQdzName());
+			tempMap.put("zdsj" + size, schedule.getZdsj());
+			tempMap.put("zdsjActual" + size, schedule.getZdsjActual()!=null?schedule.getZdsjActual():"");
+			tempMap.put("zdsjk" + size, "");
+			tempMap.put("zdsjm" + size, "");
+			tempMap.put("fcsj" + size, schedule.getFcsj());
+			tempMap.put("fcsjActual" + size, schedule.getFcsjActual()!=null?schedule.getFcsjActual():"");
+			tempMap.put("fcsjk" + size, "");
+			tempMap.put("fcsjm" + size, "");
+			tempMap.put("remarks" + size, schedule.getRemarks()!=null?schedule.getRemarks():"");
+			
+			size++;
+		}
+		if(size < 3){
+			for(; size < 3; size++){
+				tempMap.put("lpName" + size, "");
+				tempMap.put("qdzName" + size, "");
+				tempMap.put("zdsj" + size, "");
+				tempMap.put("zdsjActual" + size, "");
+				tempMap.put("zdsjk" + size, "");
+				tempMap.put("zdsjm" + size, "");
+				tempMap.put("fcsj" + size, "");
+				tempMap.put("fcsjActual" + size, "");
+				tempMap.put("fcsjk" + size, "");
+				tempMap.put("fcsjm" + size, "");
+				tempMap.put("remarks" + size, "");
+			}
+		}
+		
+		dataList3.add(tempMap);
+
+        if (type.equals("export")) {
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			Map<String, Object> m = new HashMap<String, Object>();
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(list1.iterator());
+				listI.add(dataList2.iterator());
+				listI.add(dataList3.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/scheduleDaily.xls",
+						path+"export/调度日报" + sdfSimple.format(sdfMonth.parse(date))+".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+        }
+        
+		return new ArrayList<Map<String, Object>>();
+	}
+	
 }
 \ No newline at end of file
@@ -37,7 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>
 			</div>
@@ -51,14 +51,15 @@
 							</tr>
 							<tr>
 								<td rowspan="3">路线别</td>
-								<td colspan="15">全日营运里程（公里）</td>
+								<td colspan="16">全日营运里程（公里）</td>
 								<td colspan="15">全日营运班次</td>
 								<td colspan="9">大间隔情况</td>
 							</tr>
 							<tr>
 								<td rowspan="2">计划</td>
 								<td rowspan="2">实驶</td>
-								<td rowspan="2">少驶</td>
+								<td rowspan="2">少驶公里</td>
+								<td rowspan="2">少驶班次</td>
 								<td colspan="11">少驶原因（公里）</td>
 								<td rowspan="2">临加公里</td>
 								<td colspan="3">计划班次</td>
@@ -67,7 +68,7 @@
 								<td colspan="3">放站班次</td>
 								<td colspan="3">调头班次</td>
 								<td colspan="3">发生次数</td>
-								<td rowspan="2">最大间隔时间（秒）</td>
+								<td rowspan="2">最大间隔时间（分）</td>
 								<td colspan="5" rowspan="2">原因</td>
 							</tr>
 							<tr>
@@ -277,6 +278,10 @@
 			var line = $("#line").val();
 			var xlName = $("#select2-line-container").html();
 			var date = $("#date").val();
+			if(date == null || date.length == 0){
+				layer.msg("请选择时间");
+				return;
+			}
 			$get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
 				var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
 				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
@@ -292,6 +297,26 @@
 			});
  
 		});
+
+		$("#export").on("click",function(){
+			var params = {};
+			var line = $("#line").val();
+			var xlName = $("#select2-line-container").html();
+			var date = $("#date").val();
+			if(date == null || date.length == 0){
+				layer.msg("请选择时间");
+				return;
+			}
+			params['line'] = line;
+			params['date'] = date;
+			params['xlName'] = "xlName";
+			params['type'] = "export";
+			params['state'] = '2';
+			$get('/realSchedule/scheduleDailyExport', params, function(result){
+				window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMMDD"));
+			});
+		});
+		
 	});
 </script>
 <script type="text/html" id="scheduleDaily_1">
@@ -301,6 +326,7 @@
 			<td>{{obj.jhlc}}</td>
 			<td>{{obj.sjgl}}</td>
 			<td>{{obj.ssgl}}</td>
+			<td>{{obj.ssbc}}</td>
 			<td>{{obj.ssgl_lz}}</td>
 			<td>{{obj.ssgl_dm}}</td>
 			<td>{{obj.ssgl_gz}}</td>
@@ -348,7 +374,7 @@
 		{{/if}}
 				<td colspan="2">{{obj[3]}}</td>
 				<td colspan="2">{{obj[2]}}</td>
-				<td>{{obj[4]}}</td>
+				<td>{{obj[1]}}/{{obj[4]}}</td>
 				<td>&nbsp;</td>
 				<td>&nbsp;</td>
 				<td>&nbsp;</td>