班次到离站导出，营运服务阶段报表

廖磊
1 parent d3b6eb98
Showing 15 changed files with 343 additions and 123 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/entity/mcy_forms/Operationservice.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/mould/inoutstation.xls
src/main/resources/static/pages/forms/mould/operationservice.xls
src/main/resources/static/pages/forms/mould/statisticsDaily_.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
src/main/resources/static/pages/mforms/operationservices/operationservice.html
src/main/resources/static/pages/report/inoutstation.html
@@ -253,7 +253,7 @@ public class ExportController {
 	}
 	// 运营服务阶段报表
-	@RequestMapping(value = "/operationserviceExport", method = RequestMethod.POST)
+	@RequestMapping(value = "/operationserviceExport", method = RequestMethod.GET)
 	public List<Map<String, Object>> operationserviceExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
@@ -86,7 +86,7 @@ public class MCY_FormsController {
 	}
 	// 运营服务阶段报表
-	@RequestMapping(value = "/operationservice", method = RequestMethod.POST)
+	@RequestMapping(value = "/operationservice", method = RequestMethod.GET)
 	public List<Operationservice> operationservice(@RequestParam Map<String, Object> map) {
 		return formsService.operationservice(map);
 package com.bsth.controller.report;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.entity.excep.ArrivalInfo;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.report.ReportService;
+import com.bsth.util.ReportUtils;
 @RestController
 @RequestMapping("report")
@@ -31,12 +34,74 @@ public class ReportController {
 			@RequestParam String date,@RequestParam String fcsj,@RequestParam String ddsj){
 		return service.queryListZdxx(line,date,clzbh,fcsj,ddsj);
 	}
+	
+	@RequestMapping(value="/exportQueryListZdxx" ,method = RequestMethod.GET)
+	public List<Map<String, Object>> exportQueryListZdxx(@RequestParam String clzbh,@RequestParam String line,
+			@RequestParam String date,@RequestParam String fcsj,@RequestParam String ddsj){
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<ArrivalInfo> list=service.queryListZdxx(line,date,clzbh,fcsj,ddsj);
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		int i=1;
+		for (ArrivalInfo a:list ) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("i", i);
+			m.put("mbbm", a.getNbbm());
+			m.put("stopName", a.getStopName());
+			m.put("jzsj", a.getJzsj());
+			m.put("czsj", a.getCzsj());
+			m.put("upDown", a.getUpDown()==0?"上行":"下行");
+			i++;
+		}
+		
+		try {
+			Map<String, Object> map=new HashMap<String, Object>();
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls",
+					path + "export/班次到离站.xls");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return resList;
+	}
+	
 	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.GET)
 	public List<ArrivalInfo> queryListClzd(@RequestParam String zd,@RequestParam String line,
 			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
 		return service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
 	}
+	@RequestMapping(value="/exportQueryListClzd" ,method = RequestMethod.GET)
+	public List<Map<String, Object>> exportQueryListClzd(@RequestParam String zd,@RequestParam String line,
+			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<ArrivalInfo> list=service.queryListClzd(line, zd, zdlx, fcsj, ddsj);
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		int i=1;
+		for (ArrivalInfo a:list ) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("i", i);
+			m.put("nbbm", a.getNbbm());
+			m.put("stopName", a.getStopName());
+			m.put("jzsj", a.getJzsj());
+			m.put("czsj", a.getCzsj());
+			m.put("upDown", a.getUpDown()==0?"上行":"下行");
+			i++;
+		}
+		
+		try {
+			Map<String, Object> map=new HashMap<String, Object>();
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls",
+					path + "export/班次到离站.xls");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return resList;
+	}
 	@RequestMapping(value = "/sreachZd", method = RequestMethod.GET)
 	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx,@RequestParam String zd) {
 		return service.sreachZd(line,zdlx, zd);
@@ -3,7 +3,7 @@ package com.bsth.entity.mcy_forms;
 public class Operationservice {
 	private String xlName;//线路
-	
+	private String xlBm;//线路编码
 	private String jzl;//加注量
 	private String xhl;//消耗量
@@ -81,6 +81,14 @@ public class Operationservice {
 	public void setSjbc(String sjbc) {
 		this.sjbc = sjbc;
 	}
+
+	public String getXlBm() {
+		return xlBm;
+	}
+
+	public void setXlBm(String xlBm) {
+		this.xlBm = xlBm;
+	}
 }
@@ -151,18 +151,19 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') and gsBm like %?4% and fgsBm like %?5% order by s.xlBm")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3  and gsBm like %?4% and fgsBm like %?5% order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2,String gsdm,String fgsdm);
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj2(String line,String date,String date2);
 		//月报表
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3  order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
+	
 	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY clZbh,fcsj")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm);
@@ -539,55 +539,102 @@ public class FormsServiceImpl implements FormsService {
 	// 运营服务阶段报表
 	@Override
 	public List<Operationservice> operationservice(Map<String, Object> map) {
-
-		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
-		        + "  FROM bsth_c_s_sp_info_real r "
-		       // + "LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM"
-		        + "  left join bsth_c_ylb y ON r.cl_zbh = y.nbbm "
-				+ "  where 1=1 ";
-		if(map.get("startDate").toString()!=""){
-			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
-		}
-		if(map.get("endDate").toString()!=""){
-			sql+=" and  to_days('" + map.get("endDate").toString() + "') ";
-		}
-			sql+="  and r.xl_bm='" + map.get("line").toString() + "'" ;
-			sql+="  and r.bc_type not in('in','out')";
-		if(map.get("gsdmOperat").toString()!=""){
-			sql+=" and r.gs_bm='"+map.get("gsdmOperat").toString()+"'";
+		String xlbm=map.get("line").toString().trim();
+		String gsdm="";
+		if(map.get("gsdmOperat")!=null){
+			gsdm=map.get("gsdmOperat").toString();
 		}
-		if(map.get("fgsdmOperat").toString()!=""){
-			sql+=" and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'";
+		String fgsdm="";
+		if(map.get("fgsdmOperat")!=null){
+			fgsdm=map.get("fgsdmOperat").toString();
+		}
+		startDate=map.get("startDate").toString();
+		endDate =map.get("endDate").toString();
+		String sql="select r.xl_bm"
+				+ " from bsth_c_s_sp_info_real r where"
+				+ " r.schedule_date_str BETWEEN  '"+startDate+"' and '"+endDate+"'";
+		if(xlbm.equals("")){
+			sql +="and r.gs_bm='"+gsdm+"' "
+					+ " and r.fgs_bm='"+fgsdm+"'";
+		}else{
+			sql += " and r.xl_bm = '"+xlbm+"'";
 		}
-			sql	+= "  AND r.gs_bm is not null";
-			sql	+= "  GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name";
-			startDate = map.get("startDate").toString();
-			endDate = map.get("endDate").toString();
-		List<Operationservice> list = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
-
-			@Override
-			public Operationservice mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Operationservice op = new Operationservice();
-				op.setXlName(arg0.getString("xl_name"));
-				op.setJzl(arg0.getString("JZL"));
-				op.setXhl(arg0.getString("YH"));
-				op.setClzbh(arg0.getString("cl_zbh"));
-				op.setJname(arg0.getString("j_name"));
+	       sql += " group  by  r.xl_bm";
+		
+	       
+	       List<Operationservice> list= jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
+				@Override
+				public Operationservice mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Operationservice ve = new Operationservice();
+					ve.setXlBm(arg0.getString("xl_bm"));
+					return ve;
+				}
+			});
+	       
+	       String ylbSql=" select * from bsth_c_ylb where rq BETWEEN '"+startDate+"' and '"+endDate+"'";
+	       if(xlbm.equals("")){
+	    	   ylbSql +="and ssgsdm='"+gsdm+"' "
+						+ " and fgsdm='"+fgsdm+"'";
+			}else{
+				ylbSql += " and xlbm = '"+xlbm+"'";
+			}
+	       List<Ylb> ylbList= jdbcTemplate.query(ylbSql, new RowMapper<Ylb>() {
+				@Override
+				public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Ylb y = new Ylb();
+					y.setXlbm(arg0.getString("xlbm"));
+					y.setJzl(arg0.getDouble("jzl"));
+					y.setYh(arg0.getDouble("yh"));
+					return y;
+				}
+			});
+			List<ScheduleRealInfo> listReal;
+			if(xlbm.equals("")){
+				listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj(xlbm, startDate, endDate, gsdm, fgsdm);
+			}else{
+				listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj2(xlbm, startDate, endDate);
+			}
+			
+			for (int i = 0; i < list.size(); i++) {
+				Operationservice o=list.get(i);
+				String line=o.getXlBm();
+				String xlname=BasicData.lineCode2NameMap.get(line);
+				o.setXlName(xlname);
+				
+				List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
+				for (int j = 0; j < listReal.size(); j++) {
+					ScheduleRealInfo s=listReal.get(j);
+					if(s.getXlBm().equals(line)){
+						newList.add(s);
+					}
+				}
+				
+				int sjbc=culateMileageService.culateSjbc(newList,"");
+				int ljbc=culateMileageService.culateLjbc(newList,"");
+				double ksgl=culateMileageService.culateKsgl(newList);
+				double jccgl=culateMileageService.culateJccgl(newList);
+						
+			    double sjgl=culateMileageService.culateSjgl(newList);
+				double ljgl=culateMileageService.culateLjgl(newList);
-				return op;
+				o.setEmptMileage(String.valueOf(Arith.add(ksgl, jccgl)));
+				o.setXsgl(String.valueOf(Arith.add(sjgl, ljgl)));
+				o.setSjbc(String.valueOf(sjbc+ljbc));
+				
+				double jzl=0.0;
+				double xhl=0.0;
+				for (int j = 0; j < ylbList.size(); j++) {
+					Ylb t=ylbList.get(j);
+					if(t.getXlbm().equals(line)){
+						jzl=Arith.add(jzl, t.getJzl());
+						xhl=Arith.add(xhl, t.getYh());
+					}
+				}
+				
+				o.setJzl(String.valueOf(jzl));
+				o.setXhl(String.valueOf(xhl));
 			}
-		});
-		
-		for(int i=0;i<list.size();i++){
-			Operationservice o=list.get(i);
-			Map<String, Object> maps = new HashMap<>();
-			maps = commonService.findKMBC1(o.getJname(), o.getClzbh(), startDate,
-					endDate);
-			o.setXsgl(maps.get("jhlc").toString() == null ? "" : maps.get("jhlc").toString());
-			o.setEmptMileage(maps.get("ksgl").toString() == null ? "" : maps.get("ksgl").toString());
-			o.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());
-		}
 		return list;
 	}
@@ -3,6 +3,7 @@ package com.bsth.service.realcontrol.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.support.odps.udf.CodecCheck.A;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
@@ -1646,9 +1647,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     	List<ScheduleRealInfo> lists = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
     	Map<String, Object> map = new HashMap<String, Object>();
     	 map.put("xlName", xlName);
-         map.put("jhlc", culateService.culateJhgl(lists));
+    	 double jhlc=culateService.culateJhgl(lists);
+         map.put("jhlc",jhlc);
          map.put("sjgl", Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists)));
-         map.put("ssgl", culateService.culateLbgl(lists));
+         double lbgl=culateService.culateLbgl(lists);
+         map.put("ssgl", lbgl);
          map.put("ssgl_lz", culateService.culateCJLC(lists, "路阻"));
          map.put("ssgl_dm", culateService.culateCJLC(lists, "吊慢"));
          map.put("ssgl_gz", culateService.culateCJLC(lists, "故障"));
@@ -1665,7 +1668,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          double ssgl_qt=culateService.culateCJLC(lists, "其他");
          map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
          map.put("ssbc", culateService.culateLbbc(lists));
-         map.put("ljgl", culateService.culateLjgl(lists));
+         double ljgl=culateService.culateLjgl(lists);
+         map.put("ljgl", ljgl);
          map.put("jhbc", culateService.culateJhbc(lists,""));
          map.put("jhbc_m", culateService.culateJhbc(lists, "zgf"));
          map.put("jhbc_a", culateService.culateJhbc(lists, "wgf"));
@@ -1685,6 +1689,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          map.put("djg_m", 0);
          map.put("djg_a", 0);
          map.put("djg_time", 0);
+         map.put("jls", Arith.sub(Arith.add(jhlc, ljgl), lbgl));
          lMap.add(map);
     	return lMap;
     }
@@ -2238,8 +2243,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public final Map<String, Object> staticTj(List<ScheduleRealInfo> lists){
     	Map<String, Object> map = new HashMap<String, Object>();
    	 	map.put("xlName", lists.get(0).getXlName());
-        map.put("jhlc", culateService.culateJhgl(lists));
-        map.put("sjgl", Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists)));
+	   	 double jhyygl=culateService.culateJhgl(lists);//计划营运公里
+		 double jhjcclc= culateService.culateJhJccgl(lists);//计划进出场公里(计划空驶公里)
+	     map.put("jhlc", jhyygl);
+	     map.put("jcclc", jhjcclc);
+	     map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
+	     
+	     double ljgl= culateService.culateLjgl(lists);
+	     double sjyygl= culateService.culateSjgl(lists);
+	     double zyygl= Arith.add(sjyygl,ljgl);
+	     
+	     double sjjccgl=culateService.culateJccgl(lists);
+	     double sjksgl=culateService.culateKsgl(lists);
+	     double zksgl=Arith.add(sjjccgl, sjksgl);
+	     map.put("sjzgl", Arith.add(zyygl, zksgl));
+	     map.put("sjgl",zyygl);
+	     map.put("sjksgl", zksgl);
+	     
         map.put("ssgl", culateService.culateLbgl(lists));
         map.put("ssgl_lz", culateService.culateCJLC(lists, "路阻"));
         map.put("ssgl_dm", culateService.culateCJLC(lists, "吊慢"));
@@ -2253,7 +2273,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ssgl_yw", culateService.culateCJLC(lists, "援外"));
         map.put("ssgl_other", culateService.culateCJLC(lists, "其他"));
         map.put("ssbc", culateService.culateLbbc(lists));
-        map.put("ljgl", culateService.culateLjgl(lists));
+        map.put("ljgl", ljgl);
         map.put("jhbc", culateService.culateJhbc(lists,""));
         map.put("jhbc_m", culateService.culateJhbc(lists, "zgf"));
         map.put("jhbc_a", culateService.culateJhbc(lists, "wgf"));
@@ -2316,8 +2336,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> map = new HashMap<String, Object>();
    	 	map.put("xlName", "合计");
-        map.put("jhlc", culateService.culateJhgl(list));
-        map.put("sjgl", Arith.add(culateService.culateSjgl(list),culateService.culateLjgl(list)));
+   	 	double jhyygl=culateService.culateJhgl(list);//计划营运公里
+   	 	double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
+        map.put("jhlc", jhyygl);
+        map.put("jcclc", jhjcclc);
+        map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
+        
+        double ljgl= culateService.culateLjgl(list);
+        double sjyygl= culateService.culateSjgl(list);
+        double zyygl= Arith.add(sjyygl,ljgl);
+        
+        double sjjccgl=culateService.culateJccgl(list);
+        double sjksgl=culateService.culateKsgl(list);
+        double zksgl=Arith.add(sjjccgl, sjksgl);
+        map.put("sjzgl", Arith.add(zyygl, zksgl));
+        map.put("sjgl",zyygl);
+        map.put("sjksgl", zksgl);
         map.put("ssgl", culateService.culateLbgl(list));
         map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
         map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
@@ -2331,7 +2365,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
         map.put("ssgl_other", culateService.culateCJLC(list, "其他"));
         map.put("ssbc", culateService.culateLbbc(list));
-        map.put("ljgl", culateService.culateLjgl(list));
+        map.put("ljgl", ljgl);
         map.put("jhbc", culateService.culateJhbc(list,""));
         map.put("jhbc_m", culateService.culateJhbc(list, "zgf"));
         map.put("jhbc_a", culateService.culateJhbc(list, "wgf"));
@@ -2506,7 +2540,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             list.add(t);
         }
-        List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+        List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date);
         List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
@@ -181,10 +181,10 @@ public class ReportServiceImpl implements ReportService{
 				try {
 					SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 					SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-					Long date1=simpleDateFormat.parse(fcsj+" 00:00:00").getTime();
-					Long date2=simpleDateFormat.parse(ddsj+" 23:59:59").getTime();
-					Date dates1=simpleDateFormat.parse(fcsj+" 00:00:00");
-					Date dates2=simpleDateFormat.parse(ddsj+" 00:00:00");
+					Long date1=simpleDateFormat.parse(fcsj+":00").getTime();
+					Long date2=simpleDateFormat.parse(ddsj+":00").getTime();
+					Date dates1=simpleDateFormat.parse(fcsj+":00");
+					Date dates2=simpleDateFormat.parse(ddsj+":00");
 					List<ArrivalInfo> lists=load2(line,date1,date2,dates1,dates2,zd,zdlx);
 					for(int i=0;i<lists.size();i++){
@@ -65,6 +65,7 @@ letter-spacing: 20px;
 			<div class="portlet-body">
 				<div class="table-container" id="ddrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
 					<label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
+					<br/><label>计划+临加-少驶=<span id="jls"></span>&nbsp;&nbsp;计算机实驶:<span id="jsjss"></span></label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
@@ -409,6 +410,8 @@ letter-spacing: 20px;
 			$("#export").removeAttr("disabled");
 			$get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
 				var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
+				$("#jls").html(result[0].jls);
+				$("#jsjss").html(result[0].sjgl);
 				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
 			});
 			$.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){
@@ -14,6 +14,16 @@
 	 .table > tbody + tbody {
 	   border-top: 1px solid; }
+	   
+	   #forms > thead > tr> td >span{
+	    width: 5px; 
+		word-wrap: break-word; 
+		letter-spacing: 20px; 
+	  }
+	  
+	  #forms   > thead > tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
 </style>
 <div class="page-head">
@@ -55,64 +65,70 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+				<div class="table-container"  id="ddrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
 					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="36">线路运营情况统计日报</th>
+								<th colspan="44">线路调度日报</th>
 							</tr>
 							<tr>
-								<td rowspan="3">路线别</td>
-								<td colspan="15">全日营运里程（公里）</td>
+								<td rowspan="3"><span >路线名</span></td>
+								<td colspan="20">全日营运里程（公里）</td>
 								<td colspan="15">全日营运班次</td>
-								<td colspan="5">大间隔情况</td>
+								<td colspan="9">大间隔情况</td>
 							</tr>
 							<tr>
-								<td rowspan="2">计划</td>
-								<td rowspan="2">实驶</td>
-								<td rowspan="2">少驶</td>
+								<td rowspan="2"><label>计划总</label>
+													<label>公里</label></td>
+								<td rowspan="2"><label>计划营</label><label>运公里</label></td>
+								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
+								<td rowspan="2"><label>实际</label><label>总公里</label></td>
+								<td rowspan="2"><label>实际营</label><label>运公里</label></td>
+								<td rowspan="2"><label>实际空</label><label>驶公里</label></td>
+								<td rowspan="2"><span>少驶公里</span></td>
+								<td rowspan="2"><span>少驶班次</span></td>
 								<td colspan="11">少驶原因（公里）</td>
-								<td rowspan="2">临加公里</td>
+								<td rowspan="2"><span >临加公里</span></td>
 								<td colspan="3">计划班次</td>
 								<td colspan="3">实际班次</td>
 								<td colspan="3">临加班次</td>
 								<td colspan="3">放站班次</td>
 								<td colspan="3">调头班次</td>
 								<td colspan="3">发生次数</td>
-								<td rowspan="2">最大间隔时间（秒）</td>
-								<td rowspan="2">原因</td>
+								<td rowspan="2">最大间隔时间（分）</td>
+								<td  rowspan="2">原因</td>
 							</tr>
 							<tr>
-								<td width="31px">路阻</td>
-								<td>吊慢</td>
-								<td>故障</td>
-								<td>纠纷</td>
-								<td>肇事</td>
-								<td>缺人</td>
-								<td>缺车</td>
-								<td>客稀</td>
-								<td>气候</td>
-								<td>援外</td>
-								<td>其他</td>
-								<td>全日</td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td>全日</td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td>全日</td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td>全日</td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td>全日</td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td>全日</td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
+								<td><span >路阻</span></td>
+								<td><span>吊慢</span></td>
+								<td><span >故障</span></td>
+								<td><span >纠纷</span></td>
+								<td><span >肇事</span></td>
+								<td><span>缺人</span></td>
+								<td><span>缺车</span></td>
+								<td><span >客稀</span></td>
+								<td><span>气候</span></td>
+								<td><span>援外</span></td>
+								<td><span>其他</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
 							</tr>
 						</thead>
 						<tbody class="statisticsDaily">
@@ -269,7 +285,7 @@
 			}
 		});
-
+		$("#ddrbBody").height($(window).height()-280);
 		$("#export").on("click",function(){
 			 var params = {};
 			 params['gsdm'] = gsdm;
@@ -290,9 +306,14 @@
 	{{each list as obj i}}
 		<tr>
 			<td>{{obj.xlName}}</td>
+			<td>{{obj.jhzlc}}</td>
 			<td>{{obj.jhlc}}</td>
+			<td>{{obj.jcclc}}</td>
+			<td>{{obj.sjzgl}}</td>
 			<td>{{obj.sjgl}}</td>
+			<td>{{obj.sjksgl}}</td>
 			<td>{{obj.ssgl}}</td>
+			<td>{{obj.ssbc}}</td>
 			<td>{{obj.ssgl_lz}}</td>
 			<td>{{obj.ssgl_dm}}</td>
 			<td>{{obj.ssgl_gz}}</td>
@@ -329,7 +350,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="36"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -169,6 +169,7 @@
 		$("#fgsdmOperat").on("change",initXl);
 		function initXl(){
 			var data=[];
+			data.push({id: " ", text: "请选择"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}
@@ -201,7 +202,7 @@
 					var lpName = $("#lpName").val();
 					var gsdmOperat = $("#gsdmOperat").val();
 					var fgsdmOperat = $("#fgsdmOperat").val(); 
-					$post("/mcy_forms/operationservice", {
+					$get("/mcy_forms/operationservice", {
 						gsdmOperat : gsdmOperat,
 						fgsdmOperat : fgsdmOperat, 
 						line : line,
@@ -238,7 +239,7 @@
 		   	  endDate=$("#endDate").val();
 		   	gsdmOperat=$("#gsdmOperat").val();
 		   	  fgsdmOperat=$("#fgsdmOperat").val();
-			$post('/mcy_export/operationserviceExport',{gsdmOperat:gsdmOperat,fgsdmOperat:fgsdmOperat,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+			$get('/mcy_export/operationserviceExport',{gsdmOperat:gsdmOperat,fgsdmOperat:fgsdmOperat,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
 				window.open("/downloadFile/download?fileName=运营服务阶段报表"+moment(startDate).format("YYYYMMDD"));
 			});
 		});
@@ -76,8 +76,9 @@
 							</div>
 						<div class="form-group" style="display: inline-block;margin-left: 15px;">
 							<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" style="display: none;" id="query2" value="查询"/>
-<!-- 							<input class="btn btn-default" type="button" id="export" value="导出"/> -->
+							<input class="btn btn-default" type="button" id="export2" style="display: none;" value="导出"/>
 <!-- 							<input class="btn btn-default" type="button" id="print" value="打印"/> -->
 <!-- 							<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/> -->
 						</div>
@@ -103,9 +104,12 @@
 					        </tbody>
 						</table>
 					</div>
-					<div>
-						<span style="font-size: 20px" class="item-label" id="dlzmx"> </span>
-					
+					<div >
+						<span style="font-size: 20px" class="item-label" id="dlzmx">
+						到离站详细    &nbsp;待查询 
+						</span>
+						<input id="fcsj_xx" type="hidden" value="">
+						<input id="ddsj_xx" type="hidden" value="">
 					</div>
 					<div style="margin-top: 20px; "  id="forms1Div">
 						<table class="table table-bordered table-checkable" id="forms1">
@@ -148,13 +152,19 @@
 				  $("#formsDiv").css('display','inline-block');
 				  $("#query2").css('display','none');
 				  $("#query").css('display','inline-block');
+				  $("#export2").css('display','none');
+				  $("#export").css('display','inline-block');
 			  }else{
+				  $("#fcsj_xx").val("");
+				  $("#ddsj_xx").val("");
 				  $("#clzdDiv").css('display','inline-block');
 				  $("#bczxDiv").css('display','none');
 				  $("#formsDiv").css('display','none');
 				  $("#query").css('display','none');
 				  $("#query2").css('display','inline-block');
+				  $("#export").css('display','none');
+				  $("#export2").css('display','inline-block');
 			  }
 		});
@@ -168,12 +178,12 @@
 		});
 		$("#date1").datetimepicker({
-			format : 'YYYY-MM-DD',
+			format : 'YYYY-MM-DD HH:mm',
 			locale : 'zh-cn'
 		});
 		$("#date2").datetimepicker({
-			format : 'YYYY-MM-DD',
+			format : 'YYYY-MM-DD HH:mm',
 			locale : 'zh-cn'
 		});
@@ -282,16 +292,6 @@
 		var params = new Array();
 		var jName = '';
-		
-// 		$("#export").on("click",function(){
-// 			if(params.length < 1){
-// 				return;
-// 			}
-// 			$post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
-// 				window.open("/downloadFile/download?fileName="+jName);
-// 			});
-// 		});
-		
 // 		$("#print").click(function(){
 // 			$("#printArea").printArea();
 // 		});
@@ -385,6 +385,8 @@
 					    var rqmc="日期: "+rq;
 					    var bcmc="班次: "+fcsj+"-"+ddsj;
 					    $("#dlzmx").html("到离站详细                "+xlmc+"   "+clmc+"   "+rqmc+"   "+bcmc);
+					    $("#fcsj_xx").val(fcsj);
+					    $("#ddsj_xx").val(ddsj);
 						var ludan_ll_1 = template('ludan_ll_1',{list:result});
 							// 把渲染好的模版html文本追加到表格中
 						$('#forms1 .ludan_ll_1').html(ludan_ll_1);
@@ -472,6 +474,44 @@
 			}
 		})
+		
+		
+		$("#export").on("click",function(){
+			var rq=$("#date").val();
+			var line=$("#line").val();
+			var nbbm=$("#nbbm").val();
+			var fcsj=$("#fcsj_xx").val();
+			var ddsj=$("#ddsj_xx").val();
+			if(fcsj==""){
+				layer.msg("没数据");
+			}else{
+				$get('/report/exportQueryListZdxx',{clzbh:nbbm,date:rq,line:line,fcsj:fcsj,ddsj:ddsj},function(result){
+					window.open("/downloadFile/download?fileName=班次到离站");
+				});
+			}
+			
+		});
+		
+		$("#export2").on("click",function(){
+			var date1=$("#date1").val();
+			var date2=$("#date2").val();
+			var line=$("#line").val();
+			var zdlx=$("#zdlx").val();
+			var zd=$("#zd").val();
+			if(date1=="" || date1==null){
+				layer.msg("请选择时间");
+			}else if( line=="" || line==null){
+				layer.msg("请选择线路");
+			}else if(date2 ==null || date2==""){
+				layer.msg("请选择时间");
+			}else if(zdlx=="" || zdlx==null){
+				layer.msg("请选择方向");
+			}else{
+				$get('/report/exportQueryListClzd',{zd:zd,zdlx:zdlx,line:line,fcsj:date1,ddsj:date2},function(result){
+					window.open("/downloadFile/download?fileName=班次到离站");
+				});
+			}
+		});
 	});