首末班准点率

电量拆分调度日报加入大间隔线路资料修改添加权证配车数

首末班准点率
电量拆分调度日报加入大间隔线路资料修改添加权证配车数
廖磊
1 parent 2377da07
Showing 19 changed files with 603 additions and 153 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/entity/excep/ArrivalInfo.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/repository/oil/JdlRepository.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/JdlServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/CulateMileageService.java
src/main/java/com/bsth/service/report/ReportService.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/base/line/details.html
src/main/resources/static/pages/base/line/edit.html
src/main/resources/static/pages/electricity/jdl/list.html
src/main/resources/static/pages/forms/export/import_Jdl.xls
src/main/resources/static/pages/forms/mould/export_Jdl.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/report/inoutstation/inoutstation.html
@@ -84,12 +84,19 @@ public class ReportController {
 			@RequestParam int zd){
 		return service.queryStrinon(line,zd);
 	}
+	//根据排班查到离站
 	@RequestMapping(value="/queryInOutStrtion" ,method = RequestMethod.GET)
 	public List<Map<String, Object>> queryInOutStrtion(@RequestParam String line,
 			@RequestParam String date,@RequestParam int zd,@RequestParam String lzsj){
 		return service.queryInOutStrtion(line,date,zd,lzsj);
 	}
+	//根据GPS数据查到离站
+	@RequestMapping(value="/queryInOutStrtions" ,method = RequestMethod.GET)
+	public List<Map<String, Object>> queryInOutStrtions(@RequestParam String line,
+			@RequestParam String date,@RequestParam int zd,@RequestParam String lzsj){
+		return service.queryInOutStrtions(line,date,zd,lzsj);
+	}
 	@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){
@@ -61,11 +61,12 @@ public class ArrivalInfo {
 	private String jzsj;
 	/** -1 则信号有效，但程序标记为不使用 */
 	private int flag = 0;
-	
+	private Date dates;
+	private int route;
 	public ArrivalInfo(){}
 	public ArrivalInfo(String deviceId, long ts, String lineCode, int upDown, String stopNo, int inOut, long createDate,
-			int weeksYear, String stopName) {
+			int weeksYear, String stopName,Date dates,int route) {
 		this.deviceId = deviceId;
 		this.ts = ts;
@@ -75,6 +76,8 @@ public class ArrivalInfo {
 		this.stopName = stopName;
 		this.inOut = inOut;
 		this.createDate = createDate;
+		this.dates=dates;
+		this.route=route;
 	}
 /*	@Override
@@ -253,6 +256,22 @@ public class ArrivalInfo {
 	public void setPzh(String pzh) {
 		this.pzh = pzh;
 	}
+
+	public Date getDates() {
+		return dates;
+	}
+
+	public void setDates(Date dates) {
+		this.dates = dates;
+	}
+
+	public int getRoute() {
+		return route;
+	}
+
+	public void setRoute(int route) {
+		this.route = route;
+	}
@@ -53,7 +53,7 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
-			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
+			+ " group by nbbm,rq,ssgsdm,fgsdm",nativeQuery=true)
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
 	@Query(value="select nbbm,sum(cdl*100) as cdl ,sum(zlc*100) as zlc from bsth_c_dlb where to_days(?1)=to_days(rq) and "
@@ -17,25 +17,25 @@ public interface JdlRepository extends BaseRepository&lt;Jdl, Integer&gt;{
 	@Transactional
     @Modifying
     @Query(value="INSERT INTO bsth_c_jdl("+
-    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date,jsy)" +
+    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date)" +
     			 " VALUES(" +
-    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'),?11)", nativeQuery=true)
-	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate,String jsy);
+    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'))", nativeQuery=true)
+	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate);
-	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4% and jsy like %?5%" ,nativeQuery=true)
-	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm,String jsy);
+	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4% " ,nativeQuery=true)
+	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm);
 	@Query(value="SELECT * FROM bsth_c_jdl where rq = ?",nativeQuery=true)
 	List<Jdl> JdlList( String rq);
-	@Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4 and jsy = ?5 ",nativeQuery=true)
-	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm, String jsy);
+	@Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4  ",nativeQuery=true)
+	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm);
 	@Transactional
     @Modifying
-	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5 and jsy = ?6",nativeQuery=true)
-	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jsy);
+	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5",nativeQuery=true)
+	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm);
 }
@@ -9,6 +9,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -428,13 +430,22 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 //					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
-			// 前一天所有车辆最后进场班次信息
-//			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
-//			List<Dlb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
-//			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 从排班表中计算出行驶的总里程
 			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
 			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
+		    Map<String, Double> lcMap=new HashMap<String,Double>();
+			for (int i = 0; i < listpbs.size(); i++) {
+				String cl=listpbs.get(i).get("clZbh").toString();
+				Double lc= listpbs.get(i).get("totalKilometers") == null ? 0.0
+						: Double.parseDouble(listpbs.get(i).get("totalKilometers").toString());
+				if(lcMap.get(cl)==null){
+					lcMap.put(cl, lc);
+				}else{
+					Double lc_=lcMap.get(cl);
+					lcMap.remove(cl);
+					lcMap.put(cl, Arith.add(lc, lc_));
+				}
+			}
 			List<Jdl> jdlList=jdlRepository.JdlList(rq);
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
@@ -470,126 +481,134 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					}
 				}
 			}
-			
+			Map<String, Object> newMap_=new HashMap<String,Object>();
 			List<Dlb> addList = new ArrayList<Dlb>();
 			List<Dlb> updateList = new ArrayList<Dlb>();
 			String ins="";
 			Map<String, Object> ylMap=new HashMap<String, Object>();
-			for (int x = 0; x < listpb.size(); x++) {
+			List<Map<String, Object>> listpb_=listpb;
+			Collections.sort(listpb,new NbbmJcsxMap());
+			for (int x = 0; x < listpb_.size(); x++) {
 				String type = "add";
 				boolean sfdc = false;
-				Map<String, Object> map = listpb.get(x);
-				if (carsMap.get(map.get("clZbh").toString()) != null) {
-					sfdc = carsMap.get(map.get("clZbh").toString());
+				Map<String, Object> map_ = listpb_.get(x);
+				if (carsMap.get(map_.get("clZbh").toString()) != null) {
+					sfdc = carsMap.get(map_.get("clZbh").toString());
 				} else {
 					sfdc = false;
 				}
 				if (sfdc) {
-					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
-					Dlb t = new Dlb();
-					for (int k = 0; k < dlList.size(); k++) {
-						Dlb t1 = dlList.get(k);
-						if (t1.getNbbm().equals(map.get("clZbh").toString())
-								&& t1.getJsy().equals(map.get("jGh").toString())
-								&& t1.getXlbm().equals(map.get("xlBm").toString())) {
-							t = t1;
-							type = "update";
+					if(newMap_.get(map_.get("clZbh").toString())==null){
+						newMap_.put(map_.get("clZbh").toString(), map_.get("clZbh").toString());
+						//车辆总里程
+						double zlc =lcMap.get(map_.get("clZbh").toString());
+						//车辆总加电量
+						Double zjzl = 0.0;
+						for (int j = 0; j < ylxxList.size(); j++) {
+							Ylxxb ylxxb = ylxxList.get(j);
+							if (map_.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& map_.get("company").toString().equals(ylxxb.getGsdm())) {
+								zjzl = Arith.add(zjzl, ylxxb.getJzl());
+							}
 						}
-					}
-
-					// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
-				/*	if (map.get("seqNumber").toString().equals("1")) {
-						boolean fage = true;
-						for (int i = 0; i < ylListBe.size(); i++) {
-							Ylb ylb = ylListBe.get(i);
-							if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
-								if(ylb.getJzyl()>0){
-									t.setCzyl(ylb.getJzyl());
-									fage = false;
-									break;
-								}
-								
+						for (int i = 0; i < jdlList.size(); i++) {
+							Jdl jdl=jdlList.get(i);
+							if(map_.get("clZbh").toString().equals(jdl.getNbbm()) 
+									&&map_.get("company").toString().equals(jdl.getGsBm())
+									&&map_.get("bCompany").toString().equals(jdl.getFgsBm())){
+								zjzl = Arith.add(zjzl,jdl.getJdl());
 							}
 						}
-						if (fage) {
-							for (int y = 0; y < clyList.size(); y++) {
-								Cyl cyl = clyList.get(y);
-								if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
-									if(cyl!=null){
-										if(cyl.getCyl()>=0){
-											t.setCzyl(cyl.getCyl());
-											fage = false;
-											break;
-										}else {
-											if(cyl.getCxrl()!=null){
-												if(cyl.getCxrl()>0){
-													t.setCzyl(cyl.getCxrl());
-													fage = false;
-													break;
-												}
+						
+						Double nextJzyl = 0.0;
+						for (int i = 0; i < listpb.size(); i++) {
+							Map<String, Object> map = listpb.get(i);
+							if(map_.get("clZbh").toString().equals(map.get("clZbh").toString())){
+								// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+								Dlb t = new Dlb();
+								for (int k = 0; k < dlList.size(); k++) {
+									Dlb t1 = dlList.get(k);
+									if (t1.getNbbm().equals(map.get("clZbh").toString())
+											&& t1.getJsy().equals(map.get("jGh").toString())
+											&& t1.getXlbm().equals(map.get("xlBm").toString())) {
+										t = t1;
+										type = "update";
+									}
+								}
+								Double lc= Double.parseDouble(map.get("totalKilometers").toString());
+								if(map.get("seqNumber").toString().equals("1")){
+									// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+									Double dh=0.0;
+									if(zlc>0){
+										dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+									}
+									nextJzyl =Arith.sub(zjzl,dh);
+									if(zlc>0){
+										long l=Math.round(nextJzyl);
+										double ylxs=l*100/100;
+										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+										t.setHd(dh);
+										t.setCdl(dh);
+										nextJzyl=ylxs;
+									}else{
+										t.setHd(0.0);
+										t.setCdl(0.0);
+									}
+								}else{
+									Double dh=0.0;
+									if(zlc>0){
+										dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+									}
+									nextJzyl =Arith.sub( nextJzyl,dh);
+									if(zlc>0){
+										long l=0l;
+										double ylxs=0.0;
+										if(i==listpb.size()-1){
+//											ylxs=czyl;
+										}else{
+											if(listpb.get(i+1).get("clZbh").toString().equals(map.get("clZbh").toString())){
+												l=Math.round(nextJzyl);
+												ylxs=l*100/100;
 											}
+											
 										}
+										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+										t.setHd(dh);
+										t.setCdl(dh);
+										nextJzyl=ylxs;
+									}else{
+										t.setHd(0.0);
+										t.setCdl(0.0);
 									}
 								}
+								t.setCzcd(100.0);
+								t.setJzcd(100.0);
+								t.setNbbm(map.get("clZbh").toString());
+								t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
+								t.setZlc(map.get("totalKilometers") == null ? 0.0
+										: Double.parseDouble(map.get("totalKilometers").toString()));
+								t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+								t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+								t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
+								t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
+								t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+								t.setRq(sdf.parse(rq));
+								
+								 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+									 if(type.equals("add")){
+										 t.setCreatetime(date);
+										 addList.add(t); 
+									 }else{
+										 t.setUpdatetime(date);
+									     updateList.add(t); 
+									     ins += t.getId().toString()+",";
+									  }
+								 }
+//								repository.save(t);
+								newMap.put("status", ResponseCode.SUCCESS);
 							}
 						}
-						if (fage) {
-							t.setCzyl(0.0);
-						}
-					}
-					*/
-					Double jzl = 0.0;
-					//一人一车加注量只匹配一次
-					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())!=null){
-						
-					}else{
-						// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
-						for (int j = 0; j < ylxxList.size(); j++) {
-							Ylxxb ylxxb = ylxxList.get(j);
-							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
-									&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
-								jzl +=Arith.add(jzl, ylxxb.getJzl());
-							}
-						}
-						ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
 					}
-					for (int i = 0; i < jdlList.size(); i++) {
-						Jdl jdl=jdlList.get(i);
-						if(map.get("clZbh").toString().equals(jdl.getNbbm()) 
-								&&map.get("jGh").toString().equals(jdl.getJsy())
-								&&map.get("bCompany").toString().equals(jdl.getFgsBm())){
-							jzl+=jdl.getJdl();
-						}
-					}
-				
-					t.setCdl(jzl);
-					t.setCzcd(100.0);
-					t.setJzcd(100.0);
-					t.setHd(jzl);
-					t.setNbbm(map.get("clZbh").toString());
-					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
-					t.setZlc(map.get("totalKilometers") == null ? 0.0
-							: Double.parseDouble(map.get("totalKilometers").toString()));
-					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
-					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
-					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
-					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
-					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
-					t.setRq(sdf.parse(rq));
-					
-					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
-						 if(type.equals("add")){
-							 t.setCreatetime(date);
-							 addList.add(t); 
-						 }else{
-							 t.setUpdatetime(date);
-						     updateList.add(t); 
-						     ins += t.getId().toString()+",";
-						  }
-					 }
-//					repository.save(t);
-					newMap.put("status", ResponseCode.SUCCESS);
-
 				}
 			}
 			if(addList.size()>0){ 
@@ -1014,3 +1033,11 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		return lists;
 	}
 }
+
+class NbbmJcsxMap implements Comparator<Map<String, Object>>{
+	 @Override
+		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+			// TODO Auto-generated method stub
+			return  (o1.get("clZbh").toString()+o1.get("seqNumber").toString()).compareTo((o2.get("clZbh").toString()+o1.get("seqNumber").toString()));
+		}
+}
@@ -63,7 +63,7 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				}
 				String[] split = (text+";").split(",");
 				String str = "";
-				for(int j = 0; j < split.length && j < 6; j++){
+				for(int j = 0; j < split.length && j < 5; j++){
 					str += split[j];
 				}
 				if(str.trim().length() == 0)
@@ -75,22 +75,22 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				String[] split = text.split(",");
 				String rq = split[0].trim();
 				String nbbm = split[1].trim();
-				String jsy= split[2].trim();
-				double jdl = Double.valueOf(split[3].trim().length()!=0?split[3]:"0");
-				String jdz = split[4].trim();
-				String remarks = split[5].trim();
+//				String jsy= split[2].trim();
+				double jdl = Double.valueOf(split[2].trim().length()!=0?split[2]:"0");
+				String jdz = split[3].trim();
+				String remarks = split[4].trim();
 				if(rq.trim().length() == 0){
 					rq = sdf.format(new Date());
 				}
-				List<Double> jdl_ = repository.queryBySame(gsbm, fgsbm, rq, nbbm, jsy);
+				List<Double> jdl_ = repository.queryBySame(gsbm, fgsbm, rq, nbbm);
 				if(jdl_.size() == 0){
 					repository.insertData(gsbm, gsName, fgsbm, fgsName, rq, nbbm,
-							df.format(jdl), jdz, remarks, sd.format(new Date()),jsy);
+							df.format(jdl), jdz, remarks, sd.format(new Date()));
 				}else{
 //					jdl += jdl_.get(0);
-					repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm, jsy);
+					repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm);
 				}
 			}
 			wb.close();
@@ -112,9 +112,9 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 		String fgsbm = map.get("fgsbm").toString();
 		String rq = map.get("rq").toString();
 		String nbbm = map.get("nbbm").toString();
-		String jsy =map.get("jsy").toString();
+//		String jsy =map.get("jsy").toString();
 		Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
-		List<Jdl> query = repository.query(gsbm, fgsbm, rq, nbbm,jsy);
+		List<Jdl> query = repository.query(gsbm, fgsbm, rq, nbbm);
 		if(!map.containsKey("type")){
@@ -133,7 +133,6 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				m.put("nbbm", jdl.getNbbm());
 				m.put("jdl", jdl.getJdl());
 				m.put("jdz", jdl.getJdz());
-				m.put("jsy", jdl.getJsy());
 				m.put("remarks", jdl.getRemarks());
 				list.add(m);
 			}
@@ -1837,7 +1837,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 map = new HashMap<String, Object>();
                  map.put("num", i++);
                  map.put("xlName", xlName);
-                 map.put("clZbh", BasicData.deviceId2NbbmMap.get(obj[2]));
+                 map.put("clZbh", BasicData.deviceId2NbbmMap.get(obj[2])==null?"":BasicData.deviceId2NbbmMap.get(obj[2]));
                  map.put("company",fgs);
                  map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[0] + "")).toUpperCase());
                  map.put("requestTime", obj[1]);
@@ -2324,10 +2324,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("dtbc", 0);
         map.put("dtbc_m", 0);
         map.put("dtbc_a", 0);
-        map.put("djg", 0);
-        map.put("djg_m", 0);
-        map.put("djg_a", 0);
-        map.put("djg_time", 0);
+        Map<String, Object> m=culateService.culateDjg(list_s, line);
+        map.put("djg", m.get("djgcsq"));
+        map.put("djg_m", m.get("djgcsz"));
+        map.put("djg_a", m.get("djgcsw"));
+        map.put("djg_time", m.get("djgsj"));
         map.put("jls", Arith.sub(Arith.add(jhlc, ljgl), lbgl));
         lMap.add(map);
         return lMap;
@@ -30,6 +30,8 @@ public interface CulateMileageService {
 	 int culateFzbc(List<ScheduleRealInfo> lists,String item);
+	 Map<String, Object> culateDjg(List<ScheduleRealInfo> lists,String line);
+	 
 	 //以下计算方法供新报表使用
@@ -17,6 +17,8 @@ public interface ReportService {
 	List<ArrivalInfo> queryListClzd(String line,String zd,String zdlx,String fcsj,String ddsj);
 	List<StationRoute> queryStrinon(String line,int zd);
 	List<Map<String, Object>> queryInOutStrtion(String line,String date,int zd,String lzsj);
+	
+	List<Map<String, Object>> queryInOutStrtions(String line,String date,int zd,String lzsj);
 	List<Map<String, String>>  sreachZd(String line,int zdlx);
 	List<Object[]> historyMessageCount(String line, String date, String code);
 package com.bsth.service.report.impl;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -9,18 +14,26 @@ import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import com.bsth.data.BasicData;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.Interval;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
+import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableJob;
+import com.bsth.util.ReportUtils;
 import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
 @Service
 public class CulateMileageServiceImpl  implements CulateMileageService{
-
+	@Autowired
+	JdbcTemplate jdbcTemplate;
 	private static long zgf1 = 6 * 60 + 31,
 			zgf2 = 8 * 60 + 30,
 			wgf1 = 16 * 60 + 1, 
@@ -943,6 +956,209 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		}
 		return kfks;
 	}
+
+	@Override
+	public Map<String, Object> culateDjg(List<ScheduleRealInfo> lists, String line) {
+		// TODO Auto-generated method stub
+		
+
+		// TODO Auto-generated method stub
+		List<ScheduleRealInfo> list=lists;
+		Map<String, Object> m=new HashMap<String,Object>();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+//			 Collections.sort(listInfo,new ComparableAcuals());
+			 //查询所有线路
+			 String xlSql="select line_code,spac_grade from bsth_c_line"
+			 		+ "  where line_code ='"+line+"'";
+			 
+			List<Map<String, Object>> xlList=jdbcTemplate.query(xlSql, new RowMapper<Map<String, Object>>() {
+			@Override
+			public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Map<String, Object> map=new HashMap<String,Object>();
+				map.put("line",arg0.getString("line_code"));
+				map.put("grade", arg0.getString("spac_grade"));
+				return map;
+			}
+		});
+			//查询大间隔时间
+			String djgSql="select * from bsth_c_interval";
+			List<Interval> djgList=jdbcTemplate.query(djgSql, new RowMapper<Interval>() {
+			@Override
+			public Interval mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Interval m=new Interval();
+				m.setLevel(arg0.getString("level"));
+				m.setPeak(arg0.getInt("peak"));
+				m.setTrough(arg0.getInt("trough"));
+				return m;
+			}
+		});
+			
+			 for (int i = 0; i < xlList.size(); i++) {
+				 String lineCode=xlList.get(i).get("line").toString();
+				 String grade =xlList.get(i).get("grade")==null?"1":xlList.get(i).get("grade").toString();
+				 int peak=0;
+				 int trough=0;
+				 for (int j = 0; j < djgList.size(); j++) {
+					Interval il=djgList.get(j);
+					if(il.getLevel().equals(grade)){
+						peak=il.getPeak();
+						trough=il.getTrough();
+						continue;
+					}
+			 }
+				List<ScheduleRealInfo> listInfo=new ArrayList<ScheduleRealInfo>();
+				 for (int j = 0; j < list.size(); j++) {
+					ScheduleRealInfo sinfo=list.get(j);
+					try {
+					if(sinfo.getXlBm().equals(lineCode)){
+						ScheduleRealInfo s=checkBc(sinfo);
+						String fcsj=s.getFcsjActual()==null?"":s.getFcsjActual();
+						if(!fcsj.equals("")){
+							Long fcsjAcual = sdf.parse(s.getRealExecDate() + " " + s.getFcsjActual()).getTime();
+							s.setFcsjActualTime(fcsjAcual);
+							s.setFcsjActual(fcsj);
+							listInfo.add(s);
+						}
+						
+					}
+					} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			 }
+				 
+			 if(listInfo.size()>0){
+				  m=listDjg(peak,trough,listInfo,grade);
+			 }
+		}
+		return m;
+	
+	}
+	
+	public ScheduleRealInfo checkBc(ScheduleRealInfo s){
+		//如果班次有子任务 且 子任务中有属于营运的。把该子任务的发车时间设置成班次的发车时间
+		String fcsj=s.getFcsjActual()==null?"":s.getFcsjActual();
+		if(fcsj.equals("")){
+			Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+			if(!childTaskPlans.isEmpty()){
+					List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
+		       	    Collections.sort(listit, new ComparableChild());
+		       	    for (int i = 0; i < listit.size(); i++) {
+		       	    	ChildTaskPlan c=listit.get(i);
+		       	    	if(!c.isDestroy()){
+		       	    		if(c.getMileageType().equals("service")){
+		       	    			s.setFcsjActual(c.getStartDate());
+								break;
+							}
+							
+		       	    	}
+					}
+			}
+		}
+		return s;
+	}
+	public Map<String, Object> listDjg(int peak,int trough,List<ScheduleRealInfo> listInfo,String grade){
+		DecimalFormat  df   = new DecimalFormat("#0.00"); 
+		Collections.sort(listInfo,new ComparableAcuals());
+		List<ScheduleRealInfo> listInfo0=new ArrayList<ScheduleRealInfo>();
+		List<ScheduleRealInfo> listInfo1=new ArrayList<ScheduleRealInfo>();
+		for (int i = 0; i < listInfo.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			if(s.getXlDir().equals("0")){
+				listInfo0.add(s);
+			}else{
+				listInfo0.add(s);
+			}
+			
+		}
+		Map<String, Object> map=new HashMap<String,Object>();
+		int djgcsz=0;
+		int djgcsw=0;
+		int djgcsq=0;
+		long djcsj=0l;
+		for (int i = 0; i < listInfo0.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			Long fcsjTime=s.getFcsjActualTime();
+			String time=s.getFcsjActual();
+			String[] fcsjStr = time.split(":");
+			long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+			if(i<listInfo.size()-1){
+				Long djg=0l;
+				Long fscjNext=listInfo.get(i+1).getFcsjActualTime();
+				if((fcsj>=zgf1&&fcsj<=zgf2)){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsz ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else if((fcsj>=wgf1&&fcsj<=wgf2)){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsw ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else{
+					djg = (long) (trough*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}
+			}
+		}
+		for (int i = 0; i < listInfo1.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			Long fcsjTime=s.getFcsjActualTime();
+			String time=s.getFcsjActual();
+			String[] fcsjStr = time.split(":");
+			long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+			if(i<listInfo.size()-1){
+				Long djg=0l;
+				Long fscjNext=listInfo.get(i+1).getFcsjActualTime();
+				if(fcsj>=zgf1&&fcsj<=zgf2){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsz ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else if(fcsj>=wgf1&&fcsj<=wgf2){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsw ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else{
+					djg = (long) (trough*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}
+			}
+		}
+		
+		map.put("djgcsz", djgcsz);
+		map.put("djgcsw", djgcsw);
+		map.put("djgcsq", djgcsq);
+		map.put("djgsj", djcsj);
+		return map;
+	}
 }
@@ -598,7 +598,7 @@ public class ReportServiceImpl implements ReportService{
 		        String sqlCl="SELECT cl_zbh,qdz_name,bc_type,fcsj,bcsj FROM"
 		        		+ "  bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
-		        		+ " AND bc_type = 'normal' order by qdz_name";
+		        		+ " AND  (bc_type = 'normal' or bc_type='region') order by qdz_name";
         List<Map<String, Object>> listj= jdbcTemplate.query(sqlCl,
 				 new RowMapper<Map<String, Object>>(){
@@ -1885,6 +1885,50 @@ public class ReportServiceImpl implements ReportService{
 	        return list;
 		}
+		public List<ArrivalInfo> load4(String line, String date, int zd,String minfcsj){
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+			Long date1=0L;
+			Long date2=0L;
+			Calendar cal = Calendar.getInstance();
+			List<ArrivalInfo> list=null;
+			try {
+				 Date dates1 = simpleDateFormat.parse(date+" "+minfcsj+":01");
+				 String d1=date+" "+minfcsj+":01";
+//				 Date dates2=simpleDateFormat.parse(date+" 23:59:59");
+				 date1=dates1.getTime();
+//				 date2=dates2.getTime();
+				 cal.setTime(dates1);
+				 int weeks_year1 = cal.get(Calendar.WEEK_OF_YEAR);
+				 cal.add(cal.DATE,1);//把日期往后增加一天.整数往后推,负数往前移动 
+				 int weeks_year2 = cal.get(Calendar.WEEK_OF_YEAR);
+			     Date dates2=cal.getTime(); 
+			     String d2=simpleDateFormat.format(dates2);
+			     String sql="select *,UNIX_TIMESTAMP(times) as ts from bsth_c_arrival_info where times >= '"+d1 +"'and "
+			     		+ " times <='"+d2+"' and line_id = '"+line+"' and up_down = '"+zd+"'"
+			     				+ " order by device_id,times";
+			     
+			     list =jdbcTemplate.query(sql, new RowMapper<ArrivalInfo>() {
+						@Override
+						public ArrivalInfo mapRow(ResultSet arg0, int arg1) throws SQLException {
+							ArrivalInfo ai=new ArrivalInfo();
+							ai.setInOut(arg0.getInt("in_out"));
+							ai.setDeviceId(arg0.getString("device_id"));
+							ai.setStopNo(arg0.getString("stop_no"));
+							ai.setDates(arg0.getDate("times"));
+							ai.setTs(arg0.getLong("ts")*1000);
+							return ai;
+						}
+					});
+
+			} catch (ParseException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+			return list;
+			
+		}
+		
 		public List<ArrivalInfo> load3(String line, String date, int zd){
 					SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 					SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
@@ -1928,6 +1972,8 @@ public class ReportServiceImpl implements ReportService{
 				}
 			return list;
 		}
+		
+		//根据排班查到离站
 		@Override
 		public List<Map<String, Object>> queryInOutStrtion(String line, String date, int zd,String lzsj) {
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1997,6 +2043,106 @@ public class ReportServiceImpl implements ReportService{
 			return inoutList;
 		}
+		//根据GPS查到离站
+		@Override
+		public List<Map<String, Object>> queryInOutStrtions(String line, String date, int zd,String lzsj) {
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			 String sqlMinYysj="select start_opt from bsth_c_line_config where "
+		        		+ " id = ("
+		        		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
+		        		+ ")";
+			 String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+			List<ArrivalInfo> arrInfoList=this.load4(line, date, zd,minfcsj);
+			
+			//查询线路所有的站点
+			List<StationRoute> listStation= stationRouteRepository.findByLine(line,zd);
+			List<Map<String, Object>> inoutList=new ArrayList<Map<String,Object>>();
+			//保存的所以的站点信息
+			Map<String, Object> map1=new HashMap<String,Object>();
+			map1.put("bc", "");
+			map1.put("nbbm", "");
+			
+			for (int i = 0; i < listStation.size(); i++) {
+				map1.put(listStation.get(i).getStationCode()+"in"
+						, listStation.get(i).getStationName());
+				map1.put(listStation.get(i).getStationCode()+"out"
+						, (i+1));
+			}
+			inoutList.add(map1);
+		
+			/*for (int j = 0; j < listStation.size(); j++) {
+				 map2=new HashMap<String,Object>();
+				StationRoute s=listStation.get(j);
+				List<ArrivalInfo> arrivalList=new ArrayList<ArrivalInfo>();
+				for (int j2 = 0; j2 < arrInfoList.size(); j2++) {
+					ArrivalInfo a=arrivalList.get(j2);
+					if(s.getStationCode().equals(a.getStopNo())){
+						arrivalList.add(a);
+					}
+				}
+				Map<String, String> m=this.strInOut(arrivalList,lzsj);
+				
+				map2.put(s.getStationCode()+"in", m.get("in"));
+				map2.put(s.getStationCode()+"out", m.get("out"));
+				map2.put(s.getStationCode(), m.get("type"));
+			}*/
+			List<String> list_nbbm=new ArrayList<String>();
+			Map<String, Object> m=new HashMap<String,Object>();
+			for (int i = 0; i < arrInfoList.size(); i++) {
+				arrInfoList.get(i).setRoute(-1);
+				for (int j = 0; j < listStation.size(); j++) {
+					if(arrInfoList.get(i).getStopNo().equals(listStation.get(j).getStationCode())){
+						arrInfoList.get(i).setRoute(listStation.get(j).getStationRouteCode());
+						
+					}
+				}
+				if(m.get(arrInfoList.get(i).getDeviceId())==null){
+					m.put(arrInfoList.get(i).getDeviceId(), arrInfoList.get(i).getDeviceId());
+					list_nbbm.add(arrInfoList.get(i).getDeviceId());
+				}
+			}
+
+			Map<String, Object> map2=new HashMap<String, Object>();
+			for (int i = 0; i < list_nbbm.size(); i++) {
+				String nbbm=list_nbbm.get(i);
+				
+				int zdbm =0;
+				int inout=-1;
+				List<ArrivalInfo> arrivalList=new ArrayList<ArrivalInfo>();
+				for (int j = 0; j < arrInfoList.size(); j++) {
+					ArrivalInfo aif=arrInfoList.get(j);
+					
+					if(aif.getDeviceId().equals(nbbm)){
+						map2.put("nbbm", BasicData.deviceId2NbbmMap.get(nbbm));
+						if(aif.getRoute()>-1){
+							if(((inout==aif.getInOut() && zdbm==aif.getRoute()) || !(zdbm ==aif.getRoute()))){
+								if(aif.getRoute()<=zdbm ){
+									inoutList.add(map2);
+									map2=new HashMap<String, Object>();
+									arrivalList=new ArrayList<ArrivalInfo>();
+								}
+							}
+							arrivalList.add(aif);
+//							if(!(zdbm ==aif.getRoute())){
+								Map<String, String> m_=this.strInOut(arrivalList,lzsj);
+								map2.put(aif.getStopNo()+"in", m_.get("in"));
+								map2.put(aif.getStopNo()+"out", m_.get("out"));
+								map2.put(aif.getStopNo(), m_.get("type"));
+//								arrivalList=new ArrayList<ArrivalInfo>();
+//							}
+							zdbm =aif.getRoute();
+							inout=aif.getInOut();
+							
+						}
+						
+					}
+					
+				}
+			}
+		
+			return inoutList;
+		}
+		
 		public Map<String, String> strInOut(List<ArrivalInfo> lists,String lzsj){
 			String inout="";
 			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
@@ -2015,6 +2161,9 @@ public class ReportServiceImpl implements ReportService{
 							t1.setCzsj(sdf.format(new Date(t2.getTs())));
 							out =t2.getTs();
 							break;
+						}else{
+							t1.setCzsj("");
+							out =0l;
 						}
 					}
@@ -2721,7 +2870,7 @@ public class ReportServiceImpl implements ReportService{
  			 for (int i = 0; i < xlList.size(); i++) {
  				 String lineCode=xlList.get(i).get("line").toString();
- 				 String grade =xlList.get(i).get("grade").toString();
+ 				 String grade =xlList.get(i).get("grade")==null?"1":xlList.get(i).get("grade").toString();
  				 int peak=0;
  				 int trough=0;
  				 for (int j = 0; j < djgList.size(); j++) {
@@ -1233,7 +1233,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
 					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
 					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'"
-					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
+					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.trim().length() != 0)
 				sql += " and xl_bm = '"+line+"'";
 			else if(company.length() != 0)
@@ -1326,14 +1326,18 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			for(ScheduleRealInfo s : keyMap.get(xlName)){
 				if(s.getXlDir().equals("0")){
 					up1.add(s.getFcsjT());
-					up2.add(s.getFcsjActualTime());
 					up1Map.put(s.getFcsjT(), s);
-					up2Map.put(s.getFcsjActualTime(), s);
+					if(s.getFcsjActual() != null){
+						up2.add(s.getFcsjActualTime());
+						up2Map.put(s.getFcsjActualTime(), s);
+					}
 				} else if(s.getXlDir().equals("1")){
 					dn1.add(s.getFcsjT());
-					dn2.add(s.getFcsjActualTime());
 					dn1Map.put(s.getFcsjT(), s);
-					dn2Map.put(s.getFcsjActualTime(), s);
+					if(s.getFcsjActual() != null){
+						dn2.add(s.getFcsjActualTime());
+						dn2Map.put(s.getFcsjActualTime(), s);
+					}
 				}
 			}
 			if(up1.size() > 0 && up2.size() > 0){
@@ -1455,7 +1459,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
 					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
 					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"
-					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
+					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.length() != 0)
 				sql += " and xl_bm = '"+line+"'";
 			if(company.length() != 0)
@@ -1565,14 +1569,18 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				for(ScheduleRealInfo s : keyMap.get(xlName).get(date)){
 					if(s.getXlDir().equals("0")){
 						up1.add(s.getFcsjT());
-						up2.add(s.getFcsjActualTime());
 						up1Map.put(s.getFcsjT(), s);
-						up2Map.put(s.getFcsjActualTime(), s);
+						if(s.getFcsjActual() != null){
+							up2.add(s.getFcsjActualTime());
+							up2Map.put(s.getFcsjActualTime(), s);
+						}
 					} else if(s.getXlDir().equals("1")){
 						dn1.add(s.getFcsjT());
-						dn2.add(s.getFcsjActualTime());
 						dn1Map.put(s.getFcsjT(), s);
-						dn2Map.put(s.getFcsjActualTime(), s);
+						if(s.getFcsjActual() != null){
+							dn2.add(s.getFcsjActualTime());
+							dn2Map.put(s.getFcsjActualTime(), s);
+						}
 					}
 				}
 				if(up1.size() > 0 && up2.size() > 0){
@@ -1687,7 +1695,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return resList;
 	}
-	
 	/*@Override
 	public List<Map<String, Object>> commandState(Map<String, Object> map) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
@@ -408,7 +408,18 @@
 	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
-                 
+                 <!-- 表单分组组件 form-group START -->
+                   <div class="form-group">
+	                <!-- 权证车辆数 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                    	<div class="col-md-4">
+                     		<input type="text" class="form-control" name="warrantCar" id="warrantCarInput" placeholder="权证车辆数">
+                    	</div>
+	                </div>
+	                <!-- 权证车辆数 END -->
+	                </div>
+	                 <!-- 表单分组组件 form-group END -->
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
 	                <!-- 线路沿革 START -->
@@ -417,6 +417,18 @@
                  </div>
                  <!-- 表单分组组件 form-group END -->
+                  <!-- 表单分组组件 form-group START -->
+                   <div class="form-group">
+	                <!-- 权证车辆数 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                    	<div class="col-md-4">
+                     		<input type="text" class="form-control" name="warrantCar" id="warrantCarInput" placeholder="权证车辆数">
+                    	</div>
+	                </div>
+	                <!-- 权证车辆数 END -->
+	                </div>
+	                 <!-- 表单分组组件 form-group END -->
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
 	                <!-- 线路沿革 START -->
@@ -55,8 +55,7 @@
                             <td>
                                 <select class="form-control" name="nbbm" id="nbbm" style="width: 120px;"></select>
                             </td>
-                            <td>驾驶员:</td>
-                            <td><input type="text" style="width: 80px" name="jsy" id="jsy"/></td>
+                           
                             <td width="20%">
                                 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">
                                     <i class="fa fa-search"></i> 搜索
@@ -73,7 +72,6 @@
                             <th>#</th>
                             <th>日期</th>
                             <th colspan="2">内部编码</th>
-                            <th colspan="2">驾驶员</th>
                             <th colspan="2">充电量</th>
                             <th colspan="2">充电站</th>
                             <th colspan="2">备注</th>
@@ -382,7 +380,7 @@
         </td>
         <td>{{obj.rq}}</td>
         <td colspan="2">{{obj.nbbm}}</td>
-        <td colspan="2">{{obj.jsy}}</td>
+       
         <td colspan="2">{{obj.jdl}}</td>
 		<td colspan="2">{{obj.jdz}}</td>
 		<td>{{obj.remarks}}</td>
@@ -86,7 +86,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>
@@ -199,7 +199,7 @@
 				layer.msg("请选择方向");
 			}else{
 				$get('/report/queryStrinon',{line:line,zd:zdlx},function(result){
-					$get('/report/queryInOutStrtion',{line:line,date:date,zd:zdlx,lzsj:lzsj},function(result2){
+					$get('/report/queryInOutStrtions',{line:line,date:date,zd:zdlx,lzsj:lzsj},function(result2){
 						console.log(result2);
 					    /* getTime(result); */
 						var ludan_ll_1 = template('ludan_ll_1',{list:result2,lists:result});