Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang # Conflicts: # src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang # Conflicts: # src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
廖磊
2 parents a457f9b5 2e25f1c9
Showing 41 changed files with 3015 additions and 2218 deletions
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/TimedEnableStationRoute.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/AbnormalStateHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java
src/main/java/com/bsth/service/schedule/rules/validate/ValidRepeatBcFunction.java
 package com.bsth.controller.realcontrol;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
 import com.bsth.service.realcontrol.RealMapService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -74,4 +77,9 @@ public class RealMapController {
     public Map<String, Object> multiSectionRoute(@RequestParam String codeIdx){
         return realMapService.multiSectionRoute(codeIdx);
     }
+
+    @RequestMapping(value = "/lockAndFlxedTimeEnabled", method = RequestMethod.POST)
+    public void lockAndFlxedTimeEnabled(TimedEnableStationRoute tes){
+        GeoCacheData.tesMap.put(tes.getLineCode(), tes);
+    }
 }
@@ -102,7 +102,7 @@ public class anomalyCheckController {
     }
     @RequestMapping(value = "/findSchByLpName")
-    public List<ScheduleRealInfo> findSchByLpName(String lpName){
+    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
         return dayOfSchedule.getLpScheduleMap().get(lpName);
     }
 }
@@ -77,7 +77,7 @@ public class LineConfigData implements CommandLineRunner {
     public long applyIn(ScheduleRealInfo sch, Long timestamp){
         LineConfig config = lineConfMap.get(sch.getXlBm());
         int diff = sch.getXlDir().equals("0")?config.getUpInDiff():config.getDownInDiff();
-        return timestamp - (diff * 1000);
+        return timestamp + (diff * 1000);
     }
     @Component
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata.arrival;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
 import com.google.common.collect.ArrayListMultimap;
@@ -53,6 +54,10 @@ public class GeoCacheData {
     //线路限速信息
     private static Map<String, Double> speedLimitMap;
+    //需要定时刷新的站点路由
+    public static Map<String, TimedEnableStationRoute> tesMap = new HashMap<>();
+    //TimedEnableStationRoute
+
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -282,6 +287,28 @@ public class GeoCacheData {
                 connectStationRoute(tempMap.get(key));
             }
+            //定时启用的站点走向
+            if(tesMap.size() > 0){
+                List<String> rems = new ArrayList<>();
+                long t = System.currentTimeMillis();
+                for(TimedEnableStationRoute tes : tesMap.values()){
+                    if(tes.getEnableTime() > t){
+                        logger.info("锁住站点路由，"  + tes.getLineCode());
+                        tempMap.replaceValues(tes.getLineCode() + "_0", stationCacheMap.get(tes.getLineCode() + "_0"));
+                        tempMap.replaceValues(tes.getLineCode() + "_1", stationCacheMap.get(tes.getLineCode() + "_1"));
+                    }
+                    else
+                        rems.add(tes.getLineCode());
+                }
+
+                //remove
+                if(rems.size() > 0){
+                    for(String lineCode : rems){
+                        logger.info("启用路由，"  + lineCode);
+                        tesMap.remove(lineCode);
+                    }
+                }
+            }
             stationCacheMap = tempMap;
             routeCodeMap = codeMap;
         }
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 定时启用站点路由
+ * Created by panzhao on 2017/8/28.
+ */
+public class TimedEnableStationRoute {
+
+    private String lineCode;
+
+    private Long enableTime;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getEnableTime() {
+        return enableTime;
+    }
+
+    public void setEnableTime(Long enableTime) {
+        this.enableTime = enableTime;
+    }
+}
@@ -65,8 +65,8 @@ public class AbnormalStateHandle extends SignalHandle{
      * @return
      */
     public boolean outOfBounds(GpsEntity gps){
-        //场内的车不处理
-        if(gps.getInstation() == 2){
+        //只处理电子围栏外的车
+        if(gps.getInstation() != 0){
             return false;
         }
@@ -239,9 +239,14 @@ public class InOutStationSignalHandle extends SignalHandle{
         long t2 = gps.getTimestamp();
         long c = sch.getDfsjT();
-        if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
+        /*if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
+            return true;
+        }*/
+        int threshold = 1000 * 60 * 5;
+        if(Math.abs(t2 - c) < threshold && c - t1 > threshold){
             return true;
         }
+        //if(Math.abs(t2 - c) < 1000 * 60 * 5 && c - t1 > 1000 * 60 * 5)
         return false;
     }
@@ -255,7 +260,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         if (config != null && config.getOutConfig() == 2) {
             //出站既出场
             ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-            if (schPrev != null && schPrev.getBcType().equals("out")
+            if (schPrev != null && schPrev.getBcType().equals("out") && (schPrev.getBcsj()==0 || schPrev.getJhlcOrig().equals(0))
                     && (!limitPark || park.equals(schPrev.getQdzCode()))) {
                 schPrev.setFcsjActualAll(sch.getFcsjActualTime());
@@ -447,7 +452,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         boolean limitPark = StringUtils.isNotEmpty(park);
-        if (next.getBcType().equals("in") && config.getOutConfig() == 2
+        if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().equals(0))
                 && (!limitPark || park.equals(next.getZdzCode()))) {
             next.setFcsjActualAll(sch.getZdsjActualTime());
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("W9H-088"))
+            /*if(nbbm.equals("W09-164"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
             /*if(lineId.equals("60028"))
                 new RecoveryThread(listMap.get(lineId), count).run();*/
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=207";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=241";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -153,7 +153,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 boolean task;
                 for (GpsEntity gps : list) {
                     try {
-                        /*if(gps.getTimestamp() >= 1500942270000L){
+                        /*if(gps.getTimestamp() >= 1503960000000L){
                             System.out.println("debugger...");
                         }*/
                         //是否有任务
@@ -278,12 +278,14 @@ public class DayOfSchedule {
         List<String> lprms = new ArrayList<>();
         Set<String> lps = lpScheduleMap.keySet();
         for (String lp : lps) {
-            if (lp.indexOf(lineCode + "_") != -1)
+            if (lp.startsWith(lineCode + "_"))
                 lprms.add(lp);
         }
-        for (String lp : lprms)
+        for (String lp : lprms){
+            logger.info("清理路牌映射 " + lp);
             lpScheduleMap.removeAll(lp);
+        }
         logger.info(lineCode + "排班清理 " + count);
     }
@@ -571,7 +573,7 @@ public class DayOfSchedule {
                 continue;
             //出站既出场，忽略出场班次
-            if (outConfig == 2 && temp.getBcType().equals("out")
+            if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
                     && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
@@ -117,8 +117,7 @@ public class SchAttrCalculator {
 		for(int i = 1; i < len; i ++){
 			curr = list.get(i);
-			if(prve.getZdzName().equals(curr.getQdzName())
-					|| prve.getZdzCode().equals(curr.getQdzCode())){
+			if(isJoin(prve, curr)){
 				curr.setQdzArrDatejh(prve.getZdsj());
 				if(StringUtils.isNotEmpty(prve.getZdsjActual()))
 					curr.setQdzArrDatesj(prve.getZdsjActual());
@@ -126,6 +125,13 @@ public class SchAttrCalculator {
 			prve = curr;
 		}
 	}
+
+	private boolean isJoin(ScheduleRealInfo prve, ScheduleRealInfo curr) {
+		return prve.getZdzName().equals(curr.getQdzName())//名称相等
+				|| prve.getZdzCode().equals(curr.getQdzCode())//编码相等
+				|| prve.getZdzName().startsWith(curr.getQdzName())//起始包括
+				|| curr.getQdzName().startsWith(prve.getZdzName());//起始包括
+	}
 	/**
 	 * 
@@ -3,6 +3,8 @@ package com.bsth.data.schedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -20,20 +22,38 @@ public class ScheduleComparator {
 			return s1.getFcno() - s2.getFcno();
 		}
 	}*/
+
+	static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
+
+	static{
+		bcTypeOrderMap.put("out", 0);
+		bcTypeOrderMap.put("normal", 1);
+		bcTypeOrderMap.put("region", 2);
+		bcTypeOrderMap.put("major", 3);
+		bcTypeOrderMap.put("venting", 4);
+		bcTypeOrderMap.put("ldks", 5);
+		bcTypeOrderMap.put("in", 6);
+	}
 	public static class FCSJ  implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getFcsjT() - s2.getFcsjT());
+			int diff = (int) (s1.getFcsjT() - s2.getFcsjT());
+			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
 		}
 	}
+	private static int typeOrder(String bcType){
+		return bcTypeOrderMap.get(bcType)!=null?bcTypeOrderMap.get(bcType):0;
+	}
+
 	public static class DFSJ  implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getDfsjT() - s2.getDfsjT());
+			int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
+			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
 		}
 	}
 }
@@ -217,6 +217,14 @@ public class ScheduleRealInfo {
 	/** 是否需要补充GPS信号 （网关提交至运管处动态数据用） 1: 能发车， 2：能到达  3: 补发过*/
 	private int siginCompate;
+	/**
+	 * 漂移状态
+	 * 1: 发车漂移
+	 * 2：到站漂移
+	 * 3：中途漂移
+	 */
+	private int driftStatus = 0;
+
 	public boolean isDfAuto() {
 		return dfAuto;
 	}
@@ -933,4 +941,12 @@ public class ScheduleRealInfo {
 	public void setSiginCompate(int siginCompate) {
 		this.siginCompate = siginCompate;
 	}
+
+	public int getDriftStatus() {
+		return driftStatus;
+	}
+
+	public void setDriftStatus(int driftStatus) {
+		this.driftStatus = driftStatus;
+	}
 }
@@ -50,25 +50,25 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 	JdbcTemplate jdbcTemplate;
 	@Override
 	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
-		
+
 		String rq=map.get("yyrq").toString();
 		String gsdm=map.get("gsdm_like").toString();
 		String fgsdm=map.get("fgsdm_like").toString();
-		
-	String sql="	select * from ("
-			+ "select *,CONCAT(nbbm,jsy)  as nj "
-			+ " from bsth_c_ylxxb where yyrq='"+rq+"' "
-			+ " and gsdm ='"+gsdm+"' and jylx ='0') x where x.nj not in ("
-			+ " select CONCAT(nbbm,jsy)  from bsth_c_ylb "
-			+ " where rq='"+rq+"'"
-			+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"')"
-			+ " and x.nbbm in (select nbbm  from bsth_c_ylb "
-			+ " where rq='"+rq+"'"
-			+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"') "
-					+ " and x.nbbm not in (select nbbm from bsth_c_ylxxb"
-					+ " where yyrq='"+rq+"' and gsdm ='"+gsdm+"' AND jylx ='1')";
-		
-		
+
+		String sql="	select * from ("
+				+ "select *,CONCAT(nbbm,jsy)  as nj "
+				+ " from bsth_c_ylxxb where yyrq='"+rq+"' "
+				+ " and gsdm ='"+gsdm+"' and jylx ='0') x where x.nj not in ("
+				+ " select CONCAT(nbbm,jsy)  from bsth_c_ylb "
+				+ " where rq='"+rq+"'"
+				+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"')"
+				+ " and x.nbbm in (select nbbm  from bsth_c_ylb "
+				+ " where rq='"+rq+"'"
+				+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"') "
+				+ " and x.nbbm not in (select nbbm from bsth_c_ylxxb"
+				+ " where yyrq='"+rq+"' and gsdm ='"+gsdm+"' AND jylx ='1')";
+
+
 		/*String sql= "select v.*,u.jsy as ldgh  from "
 				+ " ( select *  from   bsth_c_ylxxb x  where  "
 				+ " DATE_FORMAT(x.yyrq,'%Y-%m-%d')='"+rq+"'  and x.gsdm='"+gsdm+"'"
@@ -83,43 +83,43 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 				+ " where DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"'"
 				+ " and ssgsdm='"+gsdm+"'  and fgsdm='"+fgsdm+"' )  u "
 				+ " on  v.nbbm=u.nbbm ";*/
-		
+
 		//根具条件查询指定日期Ylxxb的数据
 //		List<Ylxxb> iterator=repository.checkYlxx(rq,gsdm);
 		/*if(map.get("gsdm_in")!=null){
 			map.put("ssgsdm_in", map.get("gsdm_in"));
 			map.remove("gsdm_in");
-			
+
 		}else{
 			map.put("ssgsdm_like", map.get("gsdm_like"));
 			map.remove("gsdm_like");
 		}*/
-		
+
 		//根具条件查询指定日期Ylb的数据
 //		List<Ylb> ylbIterator=ylbRepository.checkYl(rq,gsdm,fgsdm);
-		List<Ylxxb> list=jdbcTemplate.query(sql,  
-		        new RowMapper<Ylxxb>(){  
-            @Override  
-            public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-            	Ylxxb s  = new Ylxxb(); 
-            	s.setId(rs.getInt("id"));
-            	s.setYyrq(rs.getDate("yyrq"));
-            	s.setNbbm(rs.getString("nbbm"));
-            	s.setGsdm(rs.getString("gsdm"));
-            	s.setFgsdm(rs.getString("fgsdm"));
-            	s.setJsy(rs.getString("jsy"));
-            	s.setJzl(rs.getDouble("jzl"));
-            	s.setStationid(rs.getString("stationid"));
-            	s.setNylx(rs.getInt("nylx"));
-            	s.setJyggh(rs.getString("jyggh"));
-            	s.setYj(rs.getDouble("yj"));
+		List<Ylxxb> list=jdbcTemplate.query(sql,
+				new RowMapper<Ylxxb>(){
+					@Override
+					public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Ylxxb s  = new Ylxxb();
+						s.setId(rs.getInt("id"));
+						s.setYyrq(rs.getDate("yyrq"));
+						s.setNbbm(rs.getString("nbbm"));
+						s.setGsdm(rs.getString("gsdm"));
+						s.setFgsdm(rs.getString("fgsdm"));
+						s.setJsy(rs.getString("jsy"));
+						s.setJzl(rs.getDouble("jzl"));
+						s.setStationid(rs.getString("stationid"));
+						s.setNylx(rs.getInt("nylx"));
+						s.setJyggh(rs.getString("jyggh"));
+						s.setYj(rs.getDouble("yj"));
 //            	s.setLdgh(rs.getString("ldgh"));
-            	s.setBz(rs.getString("bz"));
-                return s;  
-            }  
-		});  
-		
-		
+						s.setBz(rs.getString("bz"));
+						return s;
+					}
+				});
+
+
 		List<Ylb> listylb=ylbRepository.obtainYl(rq, gsdm, fgsdm, "", "", "nbbm");
 		for (int i = 0; i < list.size(); i++) {
 			String ldgh="";
@@ -129,11 +129,11 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 					if(ldgh.equals(""))
 						ldgh +=ylb.getJsy();
 					else
-					    ldgh += ","+ylb.getJsy();
+						ldgh += ","+ylb.getJsy();
 				}
 			}
 			list.get(i).setLdgh(ldgh);
-			
+
 		}
 		//正式使用用下面代码
 //		for (int i = 0; i < iterator.size(); i++) {
@@ -154,16 +154,16 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 //				list.add(y1);
 //			}
 //		}
-		
-		
-		
+
+
+
 		PageHelper pageHelper = new PageHelper(list.size(), map);
 		pageHelper.getMap();
 		PageObject<Ylxxb> pageObject = pageHelper.getPageObject();
 		pageObject.setDataList(list);
 		return pageObject;
 	}
-	@Transactional  
+	@Transactional
 	@Override
 	public Map<String, Object> checkJsy(Map<String, Object> map) throws Exception{
 		Map<String, Object> newMap=new HashMap<String,Object>();
@@ -188,7 +188,7 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 					repository.save(ylxxb);
 				}
 			}
-		newMap.put("status", ResponseCode.SUCCESS);
+			newMap.put("status", ResponseCode.SUCCESS);
 		}catch(Exception e){
 			newMap.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
@@ -235,6 +235,7 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		return list;
 	}
+
 	@Transactional  
 	@Override
 	public Map<String, Object> checkNbbm(Map<String, Object> map) throws Exception{
@@ -4077,8 +4077,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 Long zdsjActual_=Long.parseLong(zdsjActual_s[0])*60+Long.parseLong(zdsjActual_s[1]);
             	 if((zdsj_-zdsjActual_)>0){
             		 zdsjk =String.valueOf(zdsj_-zdsjActual_);
-            	 }
-            	 if(((zdsj_-zdsjActual_)<0)){
+            	 }else{
             		 zdsjm =String.valueOf(zdsjActual_-zdsj_);
             	 }
              }
@@ -4105,8 +4104,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 Long fcsjActural_=Long.parseLong(fcsjActural_s[0])*60+Long.parseLong(fcsjActural_s[1]);
             	 if((zdsj_-fcsjActural_)>0){
             		 fcsjk =String.valueOf(zdsj_-fcsjActural_);
-            	 }
-            	 if((zdsj_-fcsjActural_)<0){
+            	 }else{
             		 fcsjm =String.valueOf(fcsjActural_-zdsj_);
             	 }
              }
@@ -4671,8 +4669,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         mr.setSjyygl(rs.getDouble("sjyygl"));
                         mr.setSjksgl(rs.getDouble("sjksgl"));
                         mr.setZgl(rs.getDouble("zyygl"));
-                        mr.setZddfgl(rs.getDouble("sddfgl"));
-                        mr.setSddfgl(rs.getDouble("zddfgl"));
+                        mr.setZddfgl(rs.getDouble("zddfgl"));
+                        mr.setSddfgl(rs.getDouble("sddfgl"));
                         mr.setWqwxhgl(rs.getDouble("wqwxhgl"));
                         mr.setBfwxhgl(rs.getDouble("bfwxhgl"));
                         mr.setPygl(rs.getDouble("pygl"));
@@ -4765,8 +4763,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				sReport.setSjyybc(rs.getInt("sjyybc"));
 				sReport.setSjksbc(rs.getInt("sjksbc"));
 				sReport.setZbc(rs.getInt("zyybc"));
-				sReport.setZddfbc(rs.getInt("sddfbc"));
-				sReport.setSddfbc(rs.getInt("zddfbc"));
+				sReport.setZddfbc(rs.getInt("zddfbc"));
+				sReport.setSddfbc(rs.getInt("sddfbc"));
 				sReport.setWqwxhbc(rs.getInt("wqwxhbc"));
 				sReport.setBfwxhbc(rs.getInt("bfwxhbc"));
 				sReport.setPybc(rs.getInt("pybc"));
@@ -43,17 +43,17 @@ import javax.persistence.criteria.CriteriaBuilder.In;
 @Service
 public class ReportServiceImpl implements ReportService{
-	
+
 	private static long zgf1 = 6 * 60 + 31,
 			zgf2 = 8 * 60 + 30,
-			wgf1 = 16 * 60 + 1, 
+			wgf1 = 16 * 60 + 1,
 			wgf2 = 18 * 60;
-	
+
 	private Logger logger = LoggerFactory.getLogger(this.getClass());
-	
+
 	@Autowired
 	JdbcTemplate jdbcTemplate;
-	
+
 	@Autowired
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
 	@Autowired
@@ -64,24 +64,24 @@ public class ReportServiceImpl implements ReportService{
 	LineRepository lineRepository;
 	@Autowired
 	StationRouteRepository stationRouteRepository;
-	
+
 	@Override
 	public List<ScheduleRealInfo> queryListBczx(String line, String date,String clzbh) {
 		// TODO Auto-generated method stub
 		List<ScheduleRealInfo> list=scheduleRealInfoRepository.findByDate2(line,date,clzbh);
-		
+
 //				jdbcTemplate.query("select * from bsth_c_s_sp_info_real where line=?1  "
-//				+ "and  DATE_FORMAT(schedule_date,'%Y-%m-%d')=?2 and cl_zbl=?3",   
-//                new Object[]{line,date,clzbh},   
-//                new RowMapper(){  
-//                    @Override  
-//                    public Object mapRow(ResultSet rs, int rowNum) throws SQLException {  
-//                    	ScheduleRealInfo s  = new ScheduleRealInfo();  
+//				+ "and  DATE_FORMAT(schedule_date,'%Y-%m-%d')=?2 and cl_zbl=?3",
+//                new Object[]{line,date,clzbh},
+//                new RowMapper(){
+//                    @Override
+//                    public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
+//                    	ScheduleRealInfo s  = new ScheduleRealInfo();
 ////                    	s.
-//                        return s;  
-//                    }  
-//        });  
-		
+//                        return s;
+//                    }
+//        });
+
 		return list;
 	}
 	@Override
@@ -96,7 +96,7 @@ public class ReportServiceImpl implements ReportService{
 			Long date2=simpleDateFormat.parse(date+" "+sjdd+":00").getTime();
 			Date dates=simpleDateFormat.parse(date+" 00:00:00");
 			List<ArrivalInfo> lists=load(line,sbbb,date1,date2,dates);
-			
+
 			for(int i=0;i<lists.size();i++){
 				ArrivalInfo t1=lists.get(i);
 				if(t1.getInOut()==0){
@@ -109,53 +109,53 @@ public class ReportServiceImpl implements ReportService{
 					}
 					list.add(t1);
 				}
-				
+
 			}
-			
-			
+
+
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
+
 		return list;
 	}
-	
+
 	public List<ArrivalInfo> load(String line,String sbbb,Long date1,Long date2,Date dates){
 		List<ArrivalInfo> list = null;
-			Calendar cal = Calendar.getInstance();
-			cal.setTime(dates);
-			//周数，表分区字段
-			int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
-			
-			Connection conn = null;
-			PreparedStatement ps = null;
-			ResultSet rs = null;
-			
-			String sql = "select * from bsth_c_arrival_info where  device_id=? AND line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
-			try{
-				conn = DBUtils_MS.getConnection();
-				ps = conn.prepareStatement(sql);
-				ps.setString(1, sbbb);
-				ps.setString(2,line);
-				ps.setInt(3, weeks_year);
-				ps.setLong(4, date1);
-				ps.setLong(5, date2);
-				rs = ps.executeQuery();
-				
-				list = resultSet2Set(rs);
-			}catch(Exception e){
-				logger.error("", e);
-			}finally {
-				DBUtils_MS.close(rs, ps, conn);
-			}
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(dates);
+		//周数，表分区字段
+		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+
+		String sql = "select * from bsth_c_arrival_info where  device_id=? AND line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setString(1, sbbb);
+			ps.setString(2,line);
+			ps.setInt(3, weeks_year);
+			ps.setLong(4, date1);
+			ps.setLong(5, date2);
+			rs = ps.executeQuery();
+
+			list = resultSet2Set(rs);
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
 		return list;
 	}
-	
+
 	public List<ArrivalInfo> resultSet2Set(ResultSet rs) throws SQLException{
 		List<ArrivalInfo> list = new ArrayList<>();
-		
+
 		ArrivalInfo arr;
 		while(rs.next()){
 			arr = new ArrivalInfo();
@@ -167,7 +167,7 @@ public class ReportServiceImpl implements ReportService{
 				logger.warn("未注册的设备号，" + arr.getDeviceId());
 				continue;
 			}
-			
+
 			arr.setTs(rs.getLong("ts"));
 			arr.setLineCode(rs.getString("line_id"));
 			arr.setUpDown(rs.getInt("up_down"));
@@ -177,7 +177,7 @@ public class ReportServiceImpl implements ReportService{
 			arr.setCreateDate(rs.getLong("create_timestamp"));
 			arr.setWeeksYear(rs.getInt("weeks_year"));
 			arr.setEnable(true);
-			
+
 			list.add(arr);
 		}
 		return list;
@@ -185,76 +185,76 @@ public class ReportServiceImpl implements ReportService{
 	@Override
 	public List<ArrivalInfo> queryListClzd(String line, String zd, String zdlx, String fcsj, String ddsj) {
 		// TODO Auto-generated method stub
-				List<ArrivalInfo> list=new ArrayList<ArrivalInfo>();
-				try {
-					SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-					SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-					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++){
-						ArrivalInfo t1=lists.get(i);
-						if(t1.getInOut()==0){
-							t1.setJzsj(sdf.format(new Date(t1.getTs())));
-							for(int j=0;j<lists.size();j++){
-								ArrivalInfo t2=lists.get(j);
-								if(t2.getInOut()==1 && t2.getDeviceId().equals(t1.getDeviceId()) 
-										&& t2.getStopNo().equals(t1.getStopNo())
-										&& t2.getTs()>t1.getTs()){
-									t1.setCzsj(sdf.format(new Date(t2.getTs())));
-									break;
-								}
-							}
-							list.add(t1);
+		List<ArrivalInfo> list=new ArrayList<ArrivalInfo>();
+		try {
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+			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++){
+				ArrivalInfo t1=lists.get(i);
+				if(t1.getInOut()==0){
+					t1.setJzsj(sdf.format(new Date(t1.getTs())));
+					for(int j=0;j<lists.size();j++){
+						ArrivalInfo t2=lists.get(j);
+						if(t2.getInOut()==1 && t2.getDeviceId().equals(t1.getDeviceId())
+								&& t2.getStopNo().equals(t1.getStopNo())
+								&& t2.getTs()>t1.getTs()){
+							t1.setCzsj(sdf.format(new Date(t2.getTs())));
+							break;
 						}
-						
 					}
-					
-					
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
+					list.add(t1);
 				}
-				
-				return list;
+
+			}
+
+
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		return list;
 	}
-	
-	
+
+
 	public List<ArrivalInfo> load2(String line,Long date1,Long date2,Date dates1,Date dates2,String zd,String zdlx){
 		List<ArrivalInfo> list = null;
-			Calendar cal = Calendar.getInstance();
-			cal.setTime(dates1);
-			//周数，表分区字段
-			int weeks_year1 = cal.get(Calendar.WEEK_OF_YEAR);
-			cal.setTime(dates2);
-			int weeks_year2 = cal.get(Calendar.WEEK_OF_YEAR);
-			Connection conn = null;
-			PreparedStatement ps = null;
-			ResultSet rs = null;
-			
-			String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year>=? "
-					+ " AND weeks_year<=? AND ts > ? AND ts <=? AND up_down=? AND stop_no like ? order by ts";
-			try{
-				conn = DBUtils_MS.getConnection();
-				ps = conn.prepareStatement(sql);
-				ps.setString(1, line);
-				ps.setInt(2, weeks_year1);
-				ps.setInt(3, weeks_year2);
-				ps.setLong(4, date1);
-				ps.setLong(5, date2);
-				ps.setString(6, zdlx);
-				ps.setString(7, "%"+zd+"%");
-				rs = ps.executeQuery();
-				
-				list = resultSet2Set(rs);
-			}catch(Exception e){
-				logger.error("", e);
-			}finally {
-				DBUtils_MS.close(rs, ps, conn);
-			}
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(dates1);
+		//周数，表分区字段
+		int weeks_year1 = cal.get(Calendar.WEEK_OF_YEAR);
+		cal.setTime(dates2);
+		int weeks_year2 = cal.get(Calendar.WEEK_OF_YEAR);
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+
+		String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year>=? "
+				+ " AND weeks_year<=? AND ts > ? AND ts <=? AND up_down=? AND stop_no like ? order by ts";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setString(1, line);
+			ps.setInt(2, weeks_year1);
+			ps.setInt(3, weeks_year2);
+			ps.setLong(4, date1);
+			ps.setLong(5, date2);
+			ps.setString(6, zdlx);
+			ps.setString(7, "%"+zd+"%");
+			rs = ps.executeQuery();
+
+			list = resultSet2Set(rs);
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
 		return list;
 	}
 	@Override
@@ -285,14 +285,14 @@ public class ReportServiceImpl implements ReportService{
 		String sqlPc="  select count(*) from bsth_c_cars where id in("
 				+ " select cl from bsth_c_s_ccinfo where  xl in ( "
 				+ " select id from bsth_c_line where line_code='"+line+"' )"
-						+ " group by equipment_code ) ";
-				
+				+ " group by equipment_code ) ";
+
 		Map<String, Object> map=new HashMap<String,Object>();
-		
+
 		/*List<Map<String, Object>> listPc= jdbcTemplate.query(sqlPc,
 				 new RowMapper<Map<String, Object>>(){
 			 @Override
-			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
 				 Map<String, Object> m=new HashMap<String,Object>();
 				 m.put("zbh", rs.getString("cl_zbh"));
 				 return m;
@@ -300,61 +300,61 @@ public class ReportServiceImpl implements ReportService{
 		});*/
 		//配车
 		int pcs=jdbcTemplate.queryForObject(sqlPc, Integer.class);
-		
+
 		String sqlPlan=" SELECT jhlc,bc_type,fcsj FROM bsth_c_s_ttinfo_detail "
 				+" where ttinfo ='"+ttinfo+"' ";
-		
+
 		//班次
 		int zgf_0 = 6*60+31,zgf_1 = 8*60+30,wgf_0 = 16*60+1,wgf_1 = 18*60;
 		int qcBc=0,qjBc=0,zqcBc=0,zqjBc=0,wqcBc=0,wqjBc=0;
 		double zlc = 0 , yylc = 0,kslc=0;
 		//查询班次
-		List<Map<String, Object>> listPlan= jdbcTemplate.query(sqlPlan, 
+		List<Map<String, Object>> listPlan= jdbcTemplate.query(sqlPlan,
 				new RowMapper<Map<String, Object>>(){
-			 @Override
-			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
-				 Map<String, Object> m2=new HashMap<String,Object>();
-				 m2.put("jhlc", rs.getDouble("jhlc"));
-				 m2.put("bcType", rs.getString("bc_type"));
-				 m2.put("fcsj", rs.getString("fcsj"));
-				 return m2;
-			 }
-		});
-		
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m2=new HashMap<String,Object>();
+						m2.put("jhlc", rs.getDouble("jhlc"));
+						m2.put("bcType", rs.getString("bc_type"));
+						m2.put("fcsj", rs.getString("fcsj"));
+						return m2;
+					}
+				});
+
 		for (int i = 0; i < listPlan.size(); i++) {
 			Map<String, Object> m=listPlan.get(i);
-			double jhlc=Double.parseDouble(m.get("jhlc").toString()); 
+			double jhlc=Double.parseDouble(m.get("jhlc").toString());
 			String bcType=m.get("bcType").toString();
 			String fcsjs[]=m.get("fcsj").toString().split(":");
-			
+
 			zlc +=jhlc;
 			if(bcType.equals("in") || bcType.equals("out")){
 				kslc+=jhlc;
 			}
 			else if(bcType.equals("region")){
 				qjBc++;
-				if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > zgf_0 
+				if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > zgf_0
 						&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < zgf_1){
 					zqjBc++;
-				}else if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > wgf_0 
-				&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < wgf_1){
+				}else if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > wgf_0
+						&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < wgf_1){
 					wqjBc++;
 				}
-				
+
 				yylc+=jhlc;
 			}else{
 				qcBc ++;
-				if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > zgf_0 
+				if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > zgf_0
 						&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < zgf_1){
 					zqcBc++;
-				}else if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > wgf_0 
-				&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < wgf_1){
+				}else if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > wgf_0
+						&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < wgf_1){
 					wqcBc++;
 				}
 				yylc +=jhlc;
 			}
 		}
-		
+
 		map.put("pcs", pcs);
 		map.put("qcbc", qcBc);
 		map.put("qjbc", qjBc);
@@ -373,39 +373,39 @@ public class ReportServiceImpl implements ReportService{
 		DecimalFormat df = new DecimalFormat("#0.00");
 		// TODO Auto-generated method stub
 		//最早营运时间 区分夜宵线
-		 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);
+		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);
 		String[] minSjs = minfcsj.split(":");
 		int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
 		//查询时间里程
 		String sqlPc=" (SELECT jhlc,fcsj,bc_type,lp,2 as xh, ists FROM bsth_c_s_ttinfo_detail "
-				    + " where ttinfo ='"+ttinfo+"' and fcsj <='"+minfcsj+"' ) "
-				    + " union "
-				    + " (SELECT jhlc,fcsj,bc_type,lp,1 as xh, ists FROM bsth_c_s_ttinfo_detail "
-				    + " where ttinfo ='"+ttinfo+"' and fcsj > '"+minfcsj+"') order by lp,xh,fcsj";
-				
+				+ " where ttinfo ='"+ttinfo+"' and fcsj <='"+minfcsj+"' ) "
+				+ " union "
+				+ " (SELECT jhlc,fcsj,bc_type,lp,1 as xh, ists FROM bsth_c_s_ttinfo_detail "
+				+ " where ttinfo ='"+ttinfo+"' and fcsj > '"+minfcsj+"') order by lp,xh,fcsj";
+
 		Map<String, Object> map=new HashMap<String,Object>();
 		List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
-				 new RowMapper<Map<String, Object>>(){
-			 @Override
-			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Map<String, Object> m=new HashMap<String,Object>();
-				 m.put("fcsj", rs.getString("fcsj"));
-				 m.put("yygl", rs.getString("jhlc")==null?"0":rs.getString("jhlc"));
-				 m.put("bcType", rs.getString("bc_type"));
-				 m.put("lp", rs.getString("lp"));
-				 m.put("ists", rs.getObject("ists")==null?"0":rs.getString("ists"));
-				 return m;
-			 }
-		});
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("fcsj", rs.getString("fcsj"));
+						m.put("yygl", rs.getString("jhlc")==null?"0":rs.getString("jhlc"));
+						m.put("bcType", rs.getString("bc_type"));
+						m.put("lp", rs.getString("lp"));
+						m.put("ists", rs.getObject("ists")==null?"0":rs.getString("ists"));
+						return m;
+					}
+				});
 		int yysj=0 ;
 		double yycs=0 ,yygl=0;
 		String lp ="0";
 		int sj=0;
-		
+
 		for(int i=0;i<list.size();i++){
 			Map<String, Object> m=list.get(i);
 			String time=m.get("fcsj").toString();
@@ -421,7 +421,7 @@ public class ReportServiceImpl implements ReportService{
 						}
 					}else{
 						yygl += Double.parseDouble(m.get("yygl").toString());
-						
+
 						if(sj==0){
 							sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]);
 						}else{
@@ -439,7 +439,7 @@ public class ReportServiceImpl implements ReportService{
 						}
 					}else{
 						yygl += Double.parseDouble(m.get("yygl").toString());
-						
+
 						if(sj==0){
 							sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
 						}else{
@@ -456,7 +456,7 @@ public class ReportServiceImpl implements ReportService{
 					sj=0;
 				}
 				lp=m.get("lp").toString();
-				
+
 			}
 			if(m.containsKey("ists") && m.get("ists").equals("1")){
 				sj = 0;
@@ -467,105 +467,105 @@ public class ReportServiceImpl implements ReportService{
 		}
 		int hh=yysj/60;
 		int mm=yysj%60;
-		
+
 		map.put("yysj", hh+":"+mm);
 		map.put("yycs", df.format(yycs)+"公里/小时");
 //		map.put(key, value)
 		return map;
 	}
-	
+
 	public static void main(String[] args) {
 		System.out.println(609360/60);
 		System.out.println(609360%60);
 	}
-/*	@Override
-	public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
-		// TODO Auto-generated method stub
-		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
-		
+	/*	@Override
+        public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
+            // TODO Auto-generated method stub
+            List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
-		String sqlZd="select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqc' AS lx from ("
-				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"' "
-				+ " and bc_type ='normal'"
-				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
-				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
-				+ " union "
-				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqc' AS lx from ("
-				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
-				+ " and bc_type ='normal' "
-				+ " and fcsj >'16:01' and fcsj<'18:00' group by cl_zbh,qdz_name "
-				+ " ) a group by a.qdz_name "
-				+ " union "
-				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqj' AS lx from ("
-				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
-				+ " and bc_type ='region' "
-				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
-				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
-				+ " union "
-				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqj' AS lx from ("
-				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
-				+ " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
-				+ " group by cl_zbh,qdz_name) a group by a.qdz_name";
-		List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
-				 new RowMapper<Map<String, Object>>(){
-			 @Override
-			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Map<String, Object> m=new HashMap<String,Object>();
-				 m.put("zdm", rs.getString("qdz_name"));
-				 m.put("cls", rs.getString("cls"));
-				 m.put("lx", rs.getString("lx"));
-				 return m;
-			 }
-		});
-		int a=0;
-		int b=0;
-		int c=0;
-		int d=0;
-		for(int i=0;i<lists.size();i++){
-			boolean fage=true;
-			Map<String, Object> newMap= new HashMap<String, Object>();
-			list.add(newMap);
-			Map<String, Object> maps=lists.get(i);
-			if(maps.get("lx").equals("zqc")){
-				list.get(a).put("zqcZm", maps.get("zdm"));
-				list.get(a).put("zqcCls", maps.get("cls"));
-				a++;
-				fage=false;
-			}else if(maps.get("lx").equals("wqc")){
-				list.get(b).put("wqcZm", maps.get("zdm"));
-				list.get(b).put("wqcCls", maps.get("cls"));
-				b++;
-				fage=false;
-			}else if(maps.get("lx").equals("zqj")){
-				list.get(c).put("zqjZm", maps.get("zdm"));
-				list.get(c).put("zqjCls", maps.get("cls"));
-				c++;
-				fage=false;
-			}else if(maps.get("lx").equals("wqj")){
-				list.get(d).put("wqjZm", maps.get("zdm"));
-				list.get(d).put("wqjCls", maps.get("cls"));
-				d++;
-				fage=false;
-			}
-			if(fage){
-				break;
-			}
-		}
-		boolean status=true;
-		while (status) {
-			for (int i = 0; i < list.size(); i++) {
-				if(list.get(i).isEmpty()){
-					list.remove(i);
-					status=true;
-				}else{
-					status=false;
-				}
-			}
-			
-		}
-		return list;
-	}*/
+
+            String sqlZd="select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqc' AS lx from ("
+                    + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"' "
+                    + " and bc_type ='normal'"
+                    + " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
+                    + " group by cl_zbh,qdz_name) a group by a.qdz_name"
+                    + " union "
+                    + " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqc' AS lx from ("
+                    + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+                    + " and bc_type ='normal' "
+                    + " and fcsj >'16:01' and fcsj<'18:00' group by cl_zbh,qdz_name "
+                    + " ) a group by a.qdz_name "
+                    + " union "
+                    + " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqj' AS lx from ("
+                    + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+                    + " and bc_type ='region' "
+                    + " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
+                    + " group by cl_zbh,qdz_name) a group by a.qdz_name"
+                    + " union "
+                    + " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqj' AS lx from ("
+                    + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+                    + " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
+                    + " group by cl_zbh,qdz_name) a group by a.qdz_name";
+            List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
+                     new RowMapper<Map<String, Object>>(){
+                 @Override
+                 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+                     Map<String, Object> m=new HashMap<String,Object>();
+                     m.put("zdm", rs.getString("qdz_name"));
+                     m.put("cls", rs.getString("cls"));
+                     m.put("lx", rs.getString("lx"));
+                     return m;
+                 }
+            });
+            int a=0;
+            int b=0;
+            int c=0;
+            int d=0;
+            for(int i=0;i<lists.size();i++){
+                boolean fage=true;
+                Map<String, Object> newMap= new HashMap<String, Object>();
+                list.add(newMap);
+                Map<String, Object> maps=lists.get(i);
+                if(maps.get("lx").equals("zqc")){
+                    list.get(a).put("zqcZm", maps.get("zdm"));
+                    list.get(a).put("zqcCls", maps.get("cls"));
+                    a++;
+                    fage=false;
+                }else if(maps.get("lx").equals("wqc")){
+                    list.get(b).put("wqcZm", maps.get("zdm"));
+                    list.get(b).put("wqcCls", maps.get("cls"));
+                    b++;
+                    fage=false;
+                }else if(maps.get("lx").equals("zqj")){
+                    list.get(c).put("zqjZm", maps.get("zdm"));
+                    list.get(c).put("zqjCls", maps.get("cls"));
+                    c++;
+                    fage=false;
+                }else if(maps.get("lx").equals("wqj")){
+                    list.get(d).put("wqjZm", maps.get("zdm"));
+                    list.get(d).put("wqjCls", maps.get("cls"));
+                    d++;
+                    fage=false;
+                }
+                if(fage){
+                    break;
+                }
+            }
+            boolean status=true;
+            while (status) {
+                for (int i = 0; i < list.size(); i++) {
+                    if(list.get(i).isEmpty()){
+                        list.remove(i);
+                        status=true;
+                    }else{
+                        status=false;
+                    }
+                }
+
+            }
+            return list;
+        }*/
 	@Override
 	public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
 		// TODO Auto-generated method stub
@@ -595,39 +595,39 @@ public class ReportServiceImpl implements ReportService{
 				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
 				+ " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
 				+ " group by cl_zbh,qdz_name) a group by a.qdz_name";*/
-		
-		        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' or bc_type='region') order by qdz_name";
-		        
-        List<Map<String, Object>> listj= jdbcTemplate.query(sqlCl,
-				 new RowMapper<Map<String, Object>>(){
-			 @Override
-			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Map<String, Object> m=new HashMap<String,Object>();
-				 m.put("cl_zbh", rs.getString("cl_zbh"));
-				 m.put("qdz_name", rs.getString("qdz_name"));
-				 m.put("bcType", rs.getString("bc_type"));
-				 m.put("fcsj", rs.getString("fcsj"));
-				 m.put("bcsj", rs.getString("bcsj"));
-				 return m;
-			 }
-		});
-        
-        String sqlZd="select qdz_name ,bc_type from  bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
-        		+ " AND (bc_type = 'normal' or bc_type='region') group by qdz_name ,bc_type "
-        		+ " order by qdz_name";
+
+		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' or bc_type='region') order by qdz_name";
+
+		List<Map<String, Object>> listj= jdbcTemplate.query(sqlCl,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("cl_zbh", rs.getString("cl_zbh"));
+						m.put("qdz_name", rs.getString("qdz_name"));
+						m.put("bcType", rs.getString("bc_type"));
+						m.put("fcsj", rs.getString("fcsj"));
+						m.put("bcsj", rs.getString("bcsj"));
+						return m;
+					}
+				});
+
+		String sqlZd="select qdz_name ,bc_type from  bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
+				+ " AND (bc_type = 'normal' or bc_type='region') group by qdz_name ,bc_type "
+				+ " order by qdz_name";
 		List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
-				 new RowMapper<Map<String, Object>>(){
-			 @Override
-			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Map<String, Object> m=new HashMap<String,Object>();
-				 m.put("zdm", rs.getString("qdz_name"));
-				 m.put("bcType", rs.getString("bc_type"));
-				 return m;
-			 }
-		});
-		
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("zdm", rs.getString("qdz_name"));
+						m.put("bcType", rs.getString("bc_type"));
+						return m;
+					}
+				});
+
 		for (int i = 0; i < lists.size(); i++) {
 			Map<String, Object> z=new HashMap<String,Object>();
 			Map<String, Object> w=new HashMap<String,Object>();
@@ -636,7 +636,7 @@ public class ReportServiceImpl implements ReportService{
 			int wbcs=0;
 			if(p.get("bcType").toString().equals("normal")){
 				for (int j = 0; j < listj.size(); j++) {
-					if(listj.get(j).get("qdz_name").toString().equals(p.get("zdm").toString()) && 
+					if(listj.get(j).get("qdz_name").toString().equals(p.get("zdm").toString()) &&
 							listj.get(j).get("bcType").toString().equals("normal")){
 						String time=listj.get(j).get("fcsj").toString();
 						long bcsj= Long.parseLong(listj.get(j).get("bcsj").toString());
@@ -644,15 +644,15 @@ public class ReportServiceImpl implements ReportService{
 						String[] fcsjStr = time.split(":");
 						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
 						long ddsj=fcsj+bcsj;
-						if((fcsj>=zgf1 && fcsj<=zgf2) || (ddsj>=zgf1&&ddsj<=zgf2) 
+						if((fcsj>=zgf1 && fcsj<=zgf2) || (ddsj>=zgf1&&ddsj<=zgf2)
 								|| (fcsj<zgf1&&ddsj>zgf2)){
 							if(p.get("z"+clZbh)==null){
 								zbcs++;
 								p.put("z"+clZbh, clZbh);
 							}
 						}
-						
-						if((fcsj>=wgf1 && fcsj<=wgf2) || (ddsj>=wgf1&&ddsj<=wgf2) 
+
+						if((fcsj>=wgf1 && fcsj<=wgf2) || (ddsj>=wgf1&&ddsj<=wgf2)
 								|| (fcsj<wgf1&&ddsj>wgf2)){
 							if(p.get("w"+clZbh)==null){
 								wbcs++;
@@ -660,26 +660,26 @@ public class ReportServiceImpl implements ReportService{
 							}
 						}
 					}
-					
+
 				}
 				if(zbcs>0){
-					 z.put("zdm", p.get("zdm"));
-					 z.put("cls", zbcs);
-					 z.put("lx", "zqc");
-					 list_s.add(z);
+					z.put("zdm", p.get("zdm"));
+					z.put("cls", zbcs);
+					z.put("lx", "zqc");
+					list_s.add(z);
 				}
 				if(wbcs>0){
 					w.put("zdm", p.get("zdm"));
-					 w.put("cls", zbcs);
-					 w.put("lx", "wqc");
-					 list_s.add(w);
+					w.put("cls", zbcs);
+					w.put("lx", "wqc");
+					list_s.add(w);
 				}
-				
+
 			}
-			
+
 			if(p.get("bcType").equals("region")){
 				for (int j = 0; j < listj.size(); j++) {
-					if(listj.get(j).get("qdz_name").toString().equals(p.get("zdm").toString()) && 
+					if(listj.get(j).get("qdz_name").toString().equals(p.get("zdm").toString()) &&
 							listj.get(j).get("bcType").toString().equals("region")){
 						String time=listj.get(j).get("fcsj").toString();
 						long bcsj= Long.parseLong(listj.get(j).get("bcsj").toString());
@@ -687,15 +687,15 @@ public class ReportServiceImpl implements ReportService{
 						String[] fcsjStr = time.split(":");
 						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
 						long ddsj=fcsj+bcsj;
-						if((fcsj>=zgf1 && fcsj<=zgf2) || (ddsj>=zgf1&&ddsj<=zgf2) 
+						if((fcsj>=zgf1 && fcsj<=zgf2) || (ddsj>=zgf1&&ddsj<=zgf2)
 								|| (fcsj<zgf1&&ddsj>zgf2)){
 							if(p.get("z"+clZbh)==null){
 								zbcs++;
 								p.put("z"+clZbh, clZbh);
 							}
 						}
-						
-						if((fcsj>=wgf1 && fcsj<=wgf2) || (ddsj>=wgf1&&ddsj<=wgf2) 
+
+						if((fcsj>=wgf1 && fcsj<=wgf2) || (ddsj>=wgf1&&ddsj<=wgf2)
 								|| (fcsj<wgf1&&ddsj>wgf2)){
 							if(p.get("w"+clZbh)==null){
 								wbcs++;
@@ -703,22 +703,22 @@ public class ReportServiceImpl implements ReportService{
 							}
 						}
 					}
-					
+
 				}
 				if(zbcs>0){
-					 z.put("zdm", p.get("zdm"));
-					 z.put("cls", zbcs);
-					 z.put("lx", "zqj");
-					 list_s.add(z);
+					z.put("zdm", p.get("zdm"));
+					z.put("cls", zbcs);
+					z.put("lx", "zqj");
+					list_s.add(z);
 				}
 				if(wbcs>0){
-					 w.put("zdm", p.get("zdm"));
-					 w.put("cls", zbcs);
-					 w.put("lx", "wqj");
-					 list_s.add(w);
+					w.put("zdm", p.get("zdm"));
+					w.put("cls", zbcs);
+					w.put("lx", "wqj");
+					list_s.add(w);
 				}
 			}
-			
+
 		}
 		int a=0;
 		int b=0;
@@ -764,47 +764,47 @@ public class ReportServiceImpl implements ReportService{
 					status=false;
 				}
 			}
-			
+
 		}
 		return list;
 	}
-	
+
 	@Override
 	public List<Map<String, Object>> tbodyTime4(String line, String ttinfo) {
 		List<Map<String, Object>> list =new ArrayList<>();
 		// TODO Auto-generated method stub
 		//最早营运时间 区分夜宵线
-		 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);
-		
+		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);
+
 		//查询全程
 		String sqlqc="select t.* from ( "
-				     + " (SELECT bc_type, fcsj,qdz,2 as xh,xl_dir,qdz_name FROM bsth_c_s_ttinfo_detail "
-					 + " where ttinfo ='"+ttinfo+"' and (bc_type='normal' || bc_type='region') "
-					 + " and fcsj <='"+minfcsj+"') "
-					 + " union "
-					 + " (SELECT bc_type, fcsj,qdz,1 as xh,xl_dir,qdz_name FROM bsth_c_s_ttinfo_detail "
-					 + " where ttinfo ='"+ttinfo+"' and (bc_type='normal' || bc_type='region') "
-					 + " and fcsj > '"+minfcsj+"') "
-					 + "order by  xl_dir,xh,fcsj ) t ";
+				+ " (SELECT bc_type, fcsj,qdz,2 as xh,xl_dir,qdz_name FROM bsth_c_s_ttinfo_detail "
+				+ " where ttinfo ='"+ttinfo+"' and (bc_type='normal' || bc_type='region') "
+				+ " and fcsj <='"+minfcsj+"') "
+				+ " union "
+				+ " (SELECT bc_type, fcsj,qdz,1 as xh,xl_dir,qdz_name FROM bsth_c_s_ttinfo_detail "
+				+ " where ttinfo ='"+ttinfo+"' and (bc_type='normal' || bc_type='region') "
+				+ " and fcsj > '"+minfcsj+"') "
+				+ "order by  xl_dir,xh,fcsj ) t ";
 		List<Map<String, String>> qclist= jdbcTemplate.query(sqlqc,
-				 new RowMapper<Map<String, String>>(){
-			 @Override
-				 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-					 Map<String, String> m=new HashMap<String,String>();
-					 m.put("qdz_name", rs.getString("qdz_name"));
-					 m.put("bcType", rs.getString("bc_type"));
-					 m.put("fcsj", rs.getString("fcsj"));
-					 m.put("xl", rs.getString("xl_dir"));
-					 m.put("xh", rs.getString("xh"));
-					 return m;
-				 }
-			 
-		});
-		
+				new RowMapper<Map<String, String>>(){
+					@Override
+					public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, String> m=new HashMap<String,String>();
+						m.put("qdz_name", rs.getString("qdz_name"));
+						m.put("bcType", rs.getString("bc_type"));
+						m.put("fcsj", rs.getString("fcsj"));
+						m.put("xl", rs.getString("xl_dir"));
+						m.put("xh", rs.getString("xh"));
+						return m;
+					}
+
+				});
+
 		List<List<Map<String, String>>> mapList = new ArrayList<List<Map<String,String>>>();
 		mapList.add(new ArrayList<Map<String, String>>());
 		mapList.add(new ArrayList<Map<String, String>>());
@@ -816,7 +816,7 @@ public class ReportServiceImpl implements ReportService{
 				mapList.get(1).add(m);
 			}
 		}
-		
+
 		for(int i = 0; i < mapList.size(); i++){
 			List<Map<String, String>> l = mapList.get(i);
 			Map<String, Object> tempMap = new HashMap<String, Object>();
@@ -852,33 +852,33 @@ public class ReportServiceImpl implements ReportService{
 			if(sxqdz.length()!=0 || xxqdz.length()!=0)
 				list.add(tempMap);
 		}
-		
+
 		return list;
 	}
 	@Override
 	public List<Map<String, Object>> tbodyTime5(String line, String ttinfo) {
 		// TODO Auto-generated method stub
 		//最早营运时间 区分夜宵线
-				String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
-				String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
-				String[] minSjs = minfcsj.split(":");
-				int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
-				//查询时间里程
-				String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,2 as xh FROM "
-						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"' and "
-						+ " fcsj <='"+minfcsj+"'  and bc_type!='ldks'"
-								+ " and bc_type !='region') "
-						+ " union "
-						+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,1 as xh FROM "
-						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
-						+ " fcsj > '"+minfcsj+"'  and bc_type!='ldks' "
-								+ " and bc_type !='region') "
-						+ " order by  xh, lp,fcsj";
-				Map<String, Object> map=new HashMap<String,Object>();
-				List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
-						new RowMapper<Map<String, Object>>(){
+		String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
+		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		String[] minSjs = minfcsj.split(":");
+		int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
+		//查询时间里程
+		String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,2 as xh FROM "
+				+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"' and "
+				+ " fcsj <='"+minfcsj+"'  and bc_type!='ldks'"
+				+ " and bc_type !='region') "
+				+ " union "
+				+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,1 as xh FROM "
+				+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
+				+ " fcsj > '"+minfcsj+"'  and bc_type!='ldks' "
+				+ " and bc_type !='region') "
+				+ " order by  xh, lp,fcsj";
+		Map<String, Object> map=new HashMap<String,Object>();
+		List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
+				new RowMapper<Map<String, Object>>(){
 					@Override
-					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
 						Map<String, Object> m=new HashMap<String,Object>();
 						m.put("fcsj", rs.getString("fcsj"));
 						m.put("yygl", rs.getString("jhlc")==null?"0":rs.getString("jhlc"));
@@ -891,11 +891,11 @@ public class ReportServiceImpl implements ReportService{
 						if(rs.getString("xh").equals("2")){
 							m.put("fcsj", (Integer.valueOf(split[0]) + 24) + ":"+split[1]);
 						}
-						
+
 						return m;
 					}
 				});
-		List<Map<String, Object>> newList=new ArrayList<Map<String,Object>>();		
+		List<Map<String, Object>> newList=new ArrayList<Map<String,Object>>();
 		int yysxZq=0,yyxxZq=0,tzsxZq=0,tzxxZq=0,minZqcj=0,maxZqcj=0,sxcountZqbc=0,xxcountZqbc=0; //早前
 		int yysxZgf=0,yyxxZgf=0,tzsxZgf=0,tzxxZgf=0,minZgfcj=0,maxZgfcj=0,sxcountZgfbc=0,xxcountZgfbc=0;//早高峰
 		int yysxZw=0,yyxxZw=0,tzsxZw=0,tzxxZw=0,minZwcj=0,maxZwcj=0,sxcountZwbc=0,xxcountZwbc=0;//中午
@@ -906,7 +906,7 @@ public class ReportServiceImpl implements ReportService{
 		List<Integer> zwFcsj0=new ArrayList<Integer>();
 		List<Integer> wgfFcsj0=new ArrayList<Integer>();
 		List<Integer> whFcsj0=new ArrayList<Integer>();
-		
+
 		List<Integer> zqFcsj1=new ArrayList<Integer>();
 		List<Integer> zgfFcsj1=new ArrayList<Integer>();
 		List<Integer> zwFcsj1=new ArrayList<Integer>();
@@ -944,141 +944,141 @@ public class ReportServiceImpl implements ReportService{
 					ists=false;
 				}else{
 //						if(xlDir==0){
-							//上行数据
-							if(fcsjT>= minSj && fcsjT <= 6*60+30){
-								//早高峰前
-								if(xlDir==0){
-									yysxZq +=bcsj;
-									sxcountZqbc ++;
-									zqFcsj0.add(fcsjT);
+					//上行数据
+					if(fcsjT>= minSj && fcsjT <= 6*60+30){
+						//早高峰前
+						if(xlDir==0){
+							yysxZq +=bcsj;
+							sxcountZqbc ++;
+							zqFcsj0.add(fcsjT);
+						}else{
+							yyxxZq +=bcsj;
+							xxcountZqbc ++;
+							zqFcsj1.add(fcsjT);
+						}
+						if(ists){
+							if(lpname.equals(m.get("lp").toString())){
+								if(dir==0)
+									tzsxZq +=fcsjT-temp;
+								else
+									tzxxZq +=fcsjT-temp;
+							}
+						}
+						temp = fcsjT+bcsj;
+
+					}else if(fcsjT > 6*60+30 && fcsjT <= 8*60+30){
+						//早高峰
+						if(xlDir==0){
+							yysxZgf +=bcsj;
+							sxcountZgfbc ++;
+							zgfFcsj0.add(fcsjT);
+						}else{
+							yyxxZgf +=bcsj;
+							xxcountZgfbc ++;
+							zgfFcsj1.add(fcsjT);
+						}
+
+						if(ists){
+							if(lpname.equals(m.get("lp").toString())){
+								if(dir==0){
+									if(fcsjT_>= minSj && fcsjT_ <= 6*60+30)
+										tzsxZq +=fcsjT-temp;
+									else
+										tzsxZgf +=fcsjT-temp;
 								}else{
-									yyxxZq +=bcsj;
-									xxcountZqbc ++;
-									zqFcsj1.add(fcsjT);
-								}
-								if(ists){
-									if(lpname.equals(m.get("lp").toString())){
-										if(dir==0)
-											tzsxZq +=fcsjT-temp;
-										else
-											tzxxZq +=fcsjT-temp;
-									}
-								}
-								temp = fcsjT+bcsj;
-								
-							}else if(fcsjT > 6*60+30 && fcsjT <= 8*60+30){
-								//早高峰
-								if(xlDir==0){
-									yysxZgf +=bcsj;
-									sxcountZgfbc ++;
-									zgfFcsj0.add(fcsjT);
-								}else{
-									yyxxZgf +=bcsj;
-									xxcountZgfbc ++;
-									zgfFcsj1.add(fcsjT);
-								}
-								
-								if(ists){
-									if(lpname.equals(m.get("lp").toString())){
-										if(dir==0){
-											if(fcsjT_>= minSj && fcsjT_ <= 6*60+30)
-												tzsxZq +=fcsjT-temp;
-											else
-												tzsxZgf +=fcsjT-temp;
-										}else{
-											if(fcsjT_>= minSj && fcsjT_ <= 6*60+30)
-												tzxxZq +=fcsjT-temp;
-											else
-											    tzxxZgf +=fcsjT-temp;
-										}
-									}
+									if(fcsjT_>= minSj && fcsjT_ <= 6*60+30)
+										tzxxZq +=fcsjT-temp;
+									else
+										tzxxZgf +=fcsjT-temp;
 								}
-								temp =fcsjT+bcsj;
-								
-							}else if(fcsjT > 8*60+30 && fcsjT <= 16*60){
-								//中午
-								if(xlDir==0){
-									yysxZw +=bcsj;
-									sxcountZwbc ++;
-									zwFcsj0.add(fcsjT);
+							}
+						}
+						temp =fcsjT+bcsj;
+
+					}else if(fcsjT > 8*60+30 && fcsjT <= 16*60){
+						//中午
+						if(xlDir==0){
+							yysxZw +=bcsj;
+							sxcountZwbc ++;
+							zwFcsj0.add(fcsjT);
+						}else{
+							yyxxZw +=bcsj;
+							xxcountZwbc ++;
+							zwFcsj1.add(fcsjT);
+						}
+						if(ists){
+							if(lpname.equals(m.get("lp").toString())){
+								if(dir==0){
+									if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+										tzsxZgf +=fcsjT-temp;
+									else
+										tzsxZw +=fcsjT-temp;
 								}else{
-									yyxxZw +=bcsj;
-									xxcountZwbc ++;
-									zwFcsj1.add(fcsjT);
-								}
-								if(ists){
-									if(lpname.equals(m.get("lp").toString())){
-										if(dir==0){
-											if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
-												tzsxZgf +=fcsjT-temp;
-											else
-											    tzsxZw +=fcsjT-temp;
-										}else{
-											if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
-												tzxxZgf +=fcsjT-temp;
-											else
-											    tzxxZw +=fcsjT-temp;
-										}
-									}
+									if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+										tzxxZgf +=fcsjT-temp;
+									else
+										tzxxZw +=fcsjT-temp;
 								}
-								temp =fcsjT+bcsj;
-							}else if(fcsjT > 16*60 && fcsjT <= 18*60){
-								//晚高峰
-								if(xlDir==0){
-									yysxWgf +=bcsj;
-									sxcountWgfbc ++;
-									wgfFcsj0.add(fcsjT);
+							}
+						}
+						temp =fcsjT+bcsj;
+					}else if(fcsjT > 16*60 && fcsjT <= 18*60){
+						//晚高峰
+						if(xlDir==0){
+							yysxWgf +=bcsj;
+							sxcountWgfbc ++;
+							wgfFcsj0.add(fcsjT);
+						}else{
+							yyxxWgf +=bcsj;
+							xxcountWgfbc ++;
+							wgfFcsj1.add(fcsjT);
+						}
+
+						if(ists){
+							if(lpname.equals(m.get("lp").toString())){
+								if(dir==0){
+									if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+										tzsxZw +=fcsjT-temp;
+									else
+										tzsxWgf +=fcsjT-temp;
 								}else{
-									yyxxWgf +=bcsj;
-									xxcountWgfbc ++;
-									wgfFcsj1.add(fcsjT);
-								}
-								
-								if(ists){
-									if(lpname.equals(m.get("lp").toString())){
-										if(dir==0){
-											if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
-												tzsxZw +=fcsjT-temp;
-											else	
-											    tzsxWgf +=fcsjT-temp;
-										}else{
-											if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
-												 tzxxZw +=fcsjT-temp;
-											else
-												 tzxxWgf +=fcsjT-temp;
-										}
-									}
+									if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+										tzxxZw +=fcsjT-temp;
+									else
+										tzxxWgf +=fcsjT-temp;
 								}
-								temp =fcsjT+bcsj;
-							}else{
-								//晚高峰后
-								if(xlDir==0){
-									yysxWh +=bcsj;
-									sxcountWhbc ++;
-									whFcsj0.add(fcsjT);
+							}
+						}
+						temp =fcsjT+bcsj;
+					}else{
+						//晚高峰后
+						if(xlDir==0){
+							yysxWh +=bcsj;
+							sxcountWhbc ++;
+							whFcsj0.add(fcsjT);
+						}else{
+							yyxxWh +=bcsj;
+							xxcountWhbc ++;
+							whFcsj1.add(fcsjT);
+						}
+						if(ists){
+							if(lpname.equals(m.get("lp").toString())){
+								if(dir==0){
+									if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+										tzsxWgf +=fcsjT-temp;
+									else
+										tzsxWh +=fcsjT-temp;
 								}else{
-									yyxxWh +=bcsj;
-									xxcountWhbc ++;
-									whFcsj1.add(fcsjT);
-								}
-								if(ists){
-									if(lpname.equals(m.get("lp").toString())){
-										if(dir==0){
-											if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
-												tzsxWgf +=fcsjT-temp;
-											else
-											    tzsxWh +=fcsjT-temp;
-										}else{
-											if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
-												tzxxWgf +=fcsjT-temp;
-											else
-											    tzxxWh +=fcsjT-temp;
-										}
-									}
+									if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+										tzxxWgf +=fcsjT-temp;
+									else
+										tzxxWh +=fcsjT-temp;
 								}
-								temp =fcsjT+bcsj;
 							}
-							
+						}
+						temp =fcsjT+bcsj;
+					}
+
 						/*}else{
 							//下行数据
 							if(fcsjT>= minSj && fcsjT <= 6*60+30){
@@ -1151,19 +1151,19 @@ public class ReportServiceImpl implements ReportService{
 							}
 //						}
 					}*/
-						lpname=m.get("lp").toString();
-						fcsjT_=fcsjT;
-						dir =xlDir;
-						if(m.get("ists").toString().trim().equals("1")){
-							ists=false;
-						}else{
-							ists = true;
-						}
-			    }
+					lpname=m.get("lp").toString();
+					fcsjT_=fcsjT;
+					dir =xlDir;
+					if(m.get("ists").toString().trim().equals("1")){
+						ists=false;
+					}else{
+						ists = true;
+					}
+				}
 			}
-			
+
 		}
-			
+
 		//---------------------------------------早前
 		List<Integer> cjs = new ArrayList<Integer>();
 		Collections.sort(zqFcsj0);
@@ -1175,7 +1175,7 @@ public class ReportServiceImpl implements ReportService{
 				cjs.add(zqFcsj0.get(i)-fcsjs);
 				fcsjs=zqFcsj0.get(i);
 			}
-			
+
 		}
 		Collections.sort(zqFcsj1);
 		int fcsjx=0;
@@ -1186,7 +1186,7 @@ public class ReportServiceImpl implements ReportService{
 				cjs.add(zqFcsj1.get(i)-fcsjx);
 				fcsjx =zqFcsj1.get(i);
 			}
-			
+
 		}
 		Collections.sort(cjs);
 		for(int i : cjs){
@@ -1199,7 +1199,7 @@ public class ReportServiceImpl implements ReportService{
 			sxtszq=Arith.div(tzsxZq, sxcountZqbc, 1);
 			sxsjzq=Arith.div(yysxZq, sxcountZqbc,1);
 		}
-		
+
 		double xxtszq=0.0;
 		double xxsjzq=0.0;
 		if(xxcountZqbc>0){
@@ -1215,13 +1215,13 @@ public class ReportServiceImpl implements ReportService{
 		tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
 		tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
 		newList.add(tempMap);
-		
+
 		//----------------------------------早高峰
 		cjs = new ArrayList<Integer>();
 		zcj =0;
-		
+
 		Collections.sort(zgfFcsj0);
-		 fcsjs=0;
+		fcsjs=0;
 		for (int i = 0; i < zgfFcsj0.size(); i++) {
 			if(i==0){
 				fcsjs =zgfFcsj0.get(i);
@@ -1229,10 +1229,10 @@ public class ReportServiceImpl implements ReportService{
 				cjs.add(zgfFcsj0.get(i)-fcsjs);
 				fcsjs=zgfFcsj0.get(i);
 			}
-			
+
 		}
 		Collections.sort(zgfFcsj1);
-		 fcsjx=0;
+		fcsjx=0;
 		for (int i = 0; i < zgfFcsj1.size(); i++) {
 			if(i==0){
 				fcsjx =zgfFcsj1.get(i);
@@ -1240,7 +1240,7 @@ public class ReportServiceImpl implements ReportService{
 				cjs.add(zgfFcsj1.get(i)-fcsjx);
 				fcsjx =zgfFcsj1.get(i);
 			}
-			
+
 		}
 		Collections.sort(cjs);
 		for(int i : cjs){
@@ -1252,15 +1252,15 @@ public class ReportServiceImpl implements ReportService{
 			sxtszgf=Arith.div(tzsxZgf, sxcountZgfbc, 1);
 			sxsjzgf =Arith.div(yysxZgf, sxcountZgfbc, 1);
 		}
-		
+
 		double xxtszgf=0.0;
 		double xxsjzgf=0.0;
 		if(xxcountZgfbc>0){
 			xxtszgf=Arith.div(tzxxZgf, xxcountZgfbc, 1);
 			xxsjzgf=Arith.div(yyxxZgf, xxcountZgfbc,1);
 		}
-		
-		
+
+
 		tempMap = new HashMap<String, Object>();
 		tempMap.put("sjd", "6:31——8:30");
 		tempMap.put("sxsj", sxsjzgf);
@@ -1274,9 +1274,9 @@ public class ReportServiceImpl implements ReportService{
 		//----------------------------------------------中午
 		cjs = new ArrayList<Integer>();
 		zcj =0;
-		
+
 		Collections.sort(zwFcsj0);
-		 fcsjs=0;
+		fcsjs=0;
 		for (int i = 0; i < zwFcsj0.size(); i++) {
 			if(i==0){
 				fcsjs =zwFcsj0.get(i);
@@ -1284,10 +1284,10 @@ public class ReportServiceImpl implements ReportService{
 				cjs.add(zwFcsj0.get(i)-fcsjs);
 				fcsjs=zwFcsj0.get(i);
 			}
-			
+
 		}
 		Collections.sort(zwFcsj1);
-		 fcsjx=0;
+		fcsjx=0;
 		for (int i = 0; i < zwFcsj1.size(); i++) {
 			if(i==0){
 				fcsjx =zwFcsj1.get(i);
@@ -1295,7 +1295,7 @@ public class ReportServiceImpl implements ReportService{
 				cjs.add(zwFcsj1.get(i)-fcsjx);
 				fcsjx =zwFcsj1.get(i);
 			}
-			
+
 		}
 		Collections.sort(cjs);
 		for(int i : cjs){
@@ -1307,7 +1307,7 @@ public class ReportServiceImpl implements ReportService{
 			sxtzsjzw=Arith.div(tzsxZw, sxcountZwbc, 1);
 			sxsjsjzw=Arith.div(yysxZw, sxcountZwbc,1);
 		}
-		
+
 		double xxtzsjzw=0.0;
 		double xxsjsjzw=0.0;
 		if(xxcountZwbc>0){
@@ -1327,9 +1327,9 @@ public class ReportServiceImpl implements ReportService{
 		//-------------------------------------------------晚高峰
 		cjs = new ArrayList<Integer>();
 		zcj =0;
-		
+
 		Collections.sort(wgfFcsj0);
-		 fcsjs=0;
+		fcsjs=0;
 		for (int i = 0; i < wgfFcsj0.size(); i++) {
 			if(i==0){
 				fcsjs =wgfFcsj0.get(i);
@@ -1337,10 +1337,10 @@ public class ReportServiceImpl implements ReportService{
 				cjs.add(wgfFcsj0.get(i)-fcsjs);
 				fcsjs=wgfFcsj0.get(i);
 			}
-			
+
 		}
 		Collections.sort(wgfFcsj1);
-		 fcsjx=0;
+		fcsjx=0;
 		for (int i = 0; i < wgfFcsj1.size(); i++) {
 			if(i==0){
 				fcsjx =wgfFcsj1.get(i);
@@ -1348,27 +1348,27 @@ public class ReportServiceImpl implements ReportService{
 				cjs.add(wgfFcsj1.get(i)-fcsjx);
 				fcsjx =wgfFcsj1.get(i);
 			}
-			
+
 		}
 		Collections.sort(cjs);
 		for(int i : cjs){
 			zcj += i;
 		}
-		
+
 		double sxtzsjwgf=0.0;
 		double sxsjsjwgf=0.0;
 		if(sxcountWgfbc>0){
 			sxtzsjwgf=Arith.div(tzsxWgf, sxcountWgfbc, 1);
 			sxsjsjwgf=Arith.div(yysxWgf, sxcountWgfbc,1);
 		}
-		
+
 		double xxtzsjwgf=0.0;
 		double xxsjsjwgf=0.0;
 		if(xxcountWgfbc>0){
 			xxtzsjwgf=Arith.div(tzxxWgf, xxcountWgfbc, 1);
 			xxsjsjwgf=Arith.div(yyxxWgf, xxcountWgfbc,1);
 		}
-		
+
 		tempMap = new HashMap<String, Object>();
 		tempMap.put("sjd", "16:01——18:00");
 		tempMap.put("sxsj", sxsjsjwgf);
@@ -1379,13 +1379,13 @@ public class ReportServiceImpl implements ReportService{
 		tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
 		tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
 		newList.add(tempMap);
-		
+
 		//----------------------------------晚后
 		cjs = new ArrayList<Integer>();
 		zcj =0;
-		
+
 		Collections.sort(whFcsj0);
-		 fcsjs=0;
+		fcsjs=0;
 		for (int i = 0; i < whFcsj0.size(); i++) {
 			if(i==0){
 				fcsjs =whFcsj0.get(i);
@@ -1393,10 +1393,10 @@ public class ReportServiceImpl implements ReportService{
 				cjs.add(whFcsj0.get(i)-fcsjs);
 				fcsjs=whFcsj0.get(i);
 			}
-			
+
 		}
 		Collections.sort(whFcsj1);
-		 fcsjx=0;
+		fcsjx=0;
 		for (int i = 0; i < whFcsj1.size(); i++) {
 			if(i==0){
 				fcsjx =whFcsj1.get(i);
@@ -1404,7 +1404,7 @@ public class ReportServiceImpl implements ReportService{
 				cjs.add(whFcsj1.get(i)-fcsjx);
 				fcsjx =whFcsj1.get(i);
 			}
-			
+
 		}
 		Collections.sort(cjs);
 		for(int i : cjs){
@@ -1416,7 +1416,7 @@ public class ReportServiceImpl implements ReportService{
 			sxtzsjwh=Arith.div(tzsxWh,sxcountWhbc,1);
 			sxsjsjwh=Arith.div(yysxWh, sxcountWhbc,1);
 		}
-		
+
 		double xxtzsjwh=0.0;
 		double xxsjsjwh=0.0;
 		if(xxcountWhbc>0){
@@ -1458,7 +1458,7 @@ public class ReportServiceImpl implements ReportService{
 				keyMap.get("18:01——(末)").add(ttMap);
 			}
 		}
-		
+
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<Map<String, Object>> list2 = keyMap.get(key);
@@ -1477,7 +1477,7 @@ public class ReportServiceImpl implements ReportService{
 				}else{
 					String[] split = m.get("fcsj").toString().split(":");
 					int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-					
+
 					int xlDir = Integer.valueOf(m.get("dir").toString());
 					int bcsj = Integer.valueOf(m.get("bcsj").toString());
 					if(temp >= fcsj){
@@ -1498,17 +1498,17 @@ public class ReportServiceImpl implements ReportService{
 									}
 								}
 								lpname=m.get("lp").toString();
-								
+
 							}
 							sxtsbc++;
 						}
-						
+
 					} else {
-						
+
 						fcsj_x.add(fcsj);
 						xxsj += bcsj;
 						xxbc ++;
-						
+
 						if(!ists){
 							if(lpname.equals("")){
 								lpname=m.get("lp").toString();
@@ -1522,7 +1522,7 @@ public class ReportServiceImpl implements ReportService{
 							}
 							xxtsbc++;
 						}
-						
+
 					}
 					if(temp < fcsj){
 						cjs.add(fcsj - temp);
@@ -1544,7 +1544,7 @@ public class ReportServiceImpl implements ReportService{
 					cjs.add(fcsj_s.get(i)-fcsjs);
 					fcsjs=fcsj_s.get(i);
 				}
-				
+
 			}
 			Collections.sort(fcsj_x);
 			int fcsjx=0;
@@ -1555,7 +1555,7 @@ public class ReportServiceImpl implements ReportService{
 					cjs.add(fcsj_x.get(i)-fcsjx);
 					fcsjx =fcsj_x.get(i);
 				}
-				
+
 			}
 			Collections.sort(cjs);
 			for(int i : cjs){
@@ -1577,7 +1577,7 @@ public class ReportServiceImpl implements ReportService{
 		newList.add(maps.get("8:31——16:00"));
 		newList.add(maps.get("16:01——18:00"));
 		newList.add(maps.get("18:01——(末)"));*/
-		
+
 		return newList;
 	}
 	@Override
@@ -1593,27 +1593,27 @@ public class ReportServiceImpl implements ReportService{
 				sql += " and  cl.line_code = '"+line+"'";
 			}
 			sql += " order by tt.create_date desc";
-			
+
 			list = jdbcTemplate.query(sql,
 					new RowMapper<Map<String, Object>>(){
-				@Override
-				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
-					Map<String, Object> map = new HashMap<String, Object>();
-					map.put("id", rs.getString("id"));
-					map.put("name", rs.getString("name"));
-					return map;
-				}
-			});
+						@Override
+						public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+							Map<String, Object> map = new HashMap<String, Object>();
+							map.put("id", rs.getString("id"));
+							map.put("name", rs.getString("name"));
+							return map;
+						}
+					});
 		}catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return list;
 	}
-	
+
 	private List<ScheduleRealInfo> getListSinfo(Map<String, Object> map){
 		List<ScheduleRealInfo> list =new ArrayList<ScheduleRealInfo>();
-		
+
 		String sql="select DISTINCT a.* from (select * from bsth_c_s_sp_info_real where 1=1 ";
 		if(map.get("date")!=null){
 			sql += " and schedule_date_str='"+map.get("date").toString()+"'";
@@ -1622,70 +1622,70 @@ public class ReportServiceImpl implements ReportService{
 			if(map.get("line").toString()!=""){
 				sql += " and xl_bm='"+map.get("line").toString()+"'";
 			}
-			
+
 		}
 		if(map.get("bcType")!=null){
 			if(map.get("bcType").toString().equals("inout")){
 				sql += " and bc_type in ('in','out')";
 			}
-			
+
 			if(map.get("bcType").toString().equals("normal")){
 				sql += " and bc_type not in ('in','out')";
 			}
 		}
-		
+
 		sql += " )a left join bsth_c_s_child_task b on a.id=b.schedule";
 		list= jdbcTemplate.query(sql,
-				 new RowMapper<ScheduleRealInfo>(){
-			 @Override
-			 public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 ScheduleRealInfo m=new ScheduleRealInfo();
-				 m.setId(rs.getLong("id"));
+				new RowMapper<ScheduleRealInfo>(){
+					@Override
+					public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						ScheduleRealInfo m=new ScheduleRealInfo();
+						m.setId(rs.getLong("id"));
 //				 m.setBcs();
 //				 m.setBcsj();
-				 m.setClZbh(rs.getString("cl_zbh"));
-				 m.setFcsj(rs.getString("fcsj"));
-				 m.setFcsjActual(rs.getString("fcsj_actual"));
-				 m.setjGh(rs.getString("j_gh"));
-				 m.setjName(rs.getString("j_name"));
-				 m.setJhlc(rs.getDouble("jhlc"));
-				 m.setLpName(rs.getString("lp_name"));
-				 m.setQdzCode(rs.getString("qdz_code"));
-				 m.setQdzName(rs.getString("qdz_name"));
-				 m.setRealExecDate(rs.getString("real_exec_date"));
-				 m.setRealMileage(rs.getDouble("real_mileage"));
-				 m.setRemarks(rs.getString("remarks"));
-				 m.setsGh(rs.getString("s_gh"));
-				 m.setsName(rs.getString("s_name"));
-				 m.setScheduleDate(rs.getDate("schedule_date"));
-				 m.setScheduleDateStr(rs.getString("schedule_date_str"));
-				 m.setSflj(rs.getBoolean("sflj"));
-				 m.setSpId(rs.getLong("sp_id"));
-				 m.setStatus(rs.getInt("status"));
-				 m.setXlBm(rs.getString("xl_bm"));
-				 m.setXlDir(rs.getString("xl_dir"));
-				 m.setXlName(rs.getString("xl_name"));
-				 m.setZdsj(rs.getString("zdsj"));
-				 m.setZdsjActual(rs.getString("zdsj_actual"));
-				 m.setZdzCode(rs.getString("zdz_code"));
-				 m.setZdzName(rs.getString("zdz_name"));
-				 m.setCcno(rs.getInt("ccno"));
-				 m.setDfAuto(rs.getBoolean("df_auto"));
-				 m.setFgsBm(rs.getString("fgs_bm"));
-				 m.setFgsName(rs.getString("fgs_name"));
-				 m.setGsBm(rs.getString("gs_bm"));
-				 m.setGsName(rs.getString("gs_name"));
-				 m.setOnline(rs.getBoolean("online"));
-				 m.setAdjustExps(rs.getString("adjust_exps"));
-				 m.setReissue(rs.getBoolean("reissue"));
-				 m.setJhlcOrig(rs.getDouble("jhlc_orig"));
-				 return m;
-			 }
-		});
-		
+						m.setClZbh(rs.getString("cl_zbh"));
+						m.setFcsj(rs.getString("fcsj"));
+						m.setFcsjActual(rs.getString("fcsj_actual"));
+						m.setjGh(rs.getString("j_gh"));
+						m.setjName(rs.getString("j_name"));
+						m.setJhlc(rs.getDouble("jhlc"));
+						m.setLpName(rs.getString("lp_name"));
+						m.setQdzCode(rs.getString("qdz_code"));
+						m.setQdzName(rs.getString("qdz_name"));
+						m.setRealExecDate(rs.getString("real_exec_date"));
+						m.setRealMileage(rs.getDouble("real_mileage"));
+						m.setRemarks(rs.getString("remarks"));
+						m.setsGh(rs.getString("s_gh"));
+						m.setsName(rs.getString("s_name"));
+						m.setScheduleDate(rs.getDate("schedule_date"));
+						m.setScheduleDateStr(rs.getString("schedule_date_str"));
+						m.setSflj(rs.getBoolean("sflj"));
+						m.setSpId(rs.getLong("sp_id"));
+						m.setStatus(rs.getInt("status"));
+						m.setXlBm(rs.getString("xl_bm"));
+						m.setXlDir(rs.getString("xl_dir"));
+						m.setXlName(rs.getString("xl_name"));
+						m.setZdsj(rs.getString("zdsj"));
+						m.setZdsjActual(rs.getString("zdsj_actual"));
+						m.setZdzCode(rs.getString("zdz_code"));
+						m.setZdzName(rs.getString("zdz_name"));
+						m.setCcno(rs.getInt("ccno"));
+						m.setDfAuto(rs.getBoolean("df_auto"));
+						m.setFgsBm(rs.getString("fgs_bm"));
+						m.setFgsName(rs.getString("fgs_name"));
+						m.setGsBm(rs.getString("gs_bm"));
+						m.setGsName(rs.getString("gs_name"));
+						m.setOnline(rs.getBoolean("online"));
+						m.setAdjustExps(rs.getString("adjust_exps"));
+						m.setReissue(rs.getBoolean("reissue"));
+						m.setJhlcOrig(rs.getDouble("jhlc_orig"));
+						return m;
+					}
+				});
+
 		return list;
 	}
-	
+
 	@Override
 	public List<Map<String, Object>> jobFwqk(Map<String, Object> map) {
 		// TODO Auto-generated method stub
@@ -1697,7 +1697,7 @@ public class ReportServiceImpl implements ReportService{
 		List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
 		for (int i = 0; i < sList.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo = sList.get(i);
-			if (!(scheduleRealInfo.getBcType().equals("in") 
+			if (!(scheduleRealInfo.getBcType().equals("in")
 					|| scheduleRealInfo.getBcType().equals("out")
 					||scheduleRealInfo.getBcType().equals("ldks"))) {
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
@@ -1755,43 +1755,43 @@ public class ReportServiceImpl implements ReportService{
 							}
 						}
 					}else{*/
-						while (it.hasNext()) {
-							ChildTaskPlan childTaskPlan = it.next();
-							if (childTaskPlan.isDestroy()) {
-								String destroyReason = "";
-								if ( childTaskPlan.getDestroyReason() == null) {
-									destroyReason = "其他";
-								}else if(childTaskPlan.getDestroyReason().equals("")){
-									destroyReason = "其他";
-								} else {
-									destroyReason = childTaskPlan.getDestroyReason();
-								}
-								Map<String, Object> newMap = new HashMap<String, Object>();
-								newMap.put("nr", destroyReason);
-								newMap.put("lp", scheduleRealInfo.getLpName());
-								newMap.put("nbbm", scheduleRealInfo.getClZbh());
-								newMap.put("jgh", scheduleRealInfo.getjGh());
-								newMap.put("dz", childTaskPlan.getStartStationName());
-								newMap.put("sj", childTaskPlan.getStartDate());
-								newMap.put("gzf", " ");
-								newMap.put("lbbc", 0);
-								newMap.put("lblc", childTaskPlan.getMileage());
-								newMap.put("jyqp", childTaskPlan.getRemarks());
-								list.add(newMap);
-
+					while (it.hasNext()) {
+						ChildTaskPlan childTaskPlan = it.next();
+						if (childTaskPlan.isDestroy()) {
+							String destroyReason = "";
+							if ( childTaskPlan.getDestroyReason() == null) {
+								destroyReason = "其他";
+							}else if(childTaskPlan.getDestroyReason().equals("")){
+								destroyReason = "其他";
+							} else {
+								destroyReason = childTaskPlan.getDestroyReason();
 							}
+							Map<String, Object> newMap = new HashMap<String, Object>();
+							newMap.put("nr", destroyReason);
+							newMap.put("lp", scheduleRealInfo.getLpName());
+							newMap.put("nbbm", scheduleRealInfo.getClZbh());
+							newMap.put("jgh", scheduleRealInfo.getjGh());
+							newMap.put("dz", childTaskPlan.getStartStationName());
+							newMap.put("sj", childTaskPlan.getStartDate());
+							newMap.put("gzf", " ");
+							newMap.put("lbbc", 0);
+							newMap.put("lblc", childTaskPlan.getMileage());
+							newMap.put("jyqp", childTaskPlan.getRemarks());
+							list.add(newMap);
+
 						}
+					}
 //					}
-					
+
 				}
 			}
 		}
-		List<Map<String, Object>> listNew=new ArrayList<Map<String,Object>>(); 
+		List<Map<String, Object>> listNew=new ArrayList<Map<String,Object>>();
 		for (int i = 0; i < lblxs.length; i++) {
-			 String lx=lblxs[i];
-			 double lblc=0.0;
-			 int lbbc=0;
-			 for (int j = 0; j < list.size(); j++) {
+			String lx=lblxs[i];
+			double lblc=0.0;
+			int lbbc=0;
+			for (int j = 0; j < list.size(); j++) {
 				Map<String, Object> m1=list.get(j);
 				if(lx.equals(m1.get("nr").toString())){
 					m1.put("lx", 0);
@@ -1800,1434 +1800,1434 @@ public class ReportServiceImpl implements ReportService{
 					lbbc += Integer.parseInt(m1.get("lbbc").toString());
 				}
 			}
-			 if(lblc>0){
-				 Map<String, Object> newMap = new HashMap<String, Object>();
-				 newMap.put("lx", 1);
-			 	 newMap.put("nr", lx);
-				 newMap.put("lp", "小计");
-				 newMap.put("nbbm", "少驶班次");
-				 newMap.put("jgh", lbbc);
-				 newMap.put("lbbc", "少驶公里");
-				 newMap.put("lblc", lblc);
-				 newMap.put("dz", " ");
-				 newMap.put("sj", " ");
-				 newMap.put("gzf", " ");
-				 newMap.put("jyqp"," ");
-				 listNew.add(newMap);
-			 }
-			
-			 
+			if(lblc>0){
+				Map<String, Object> newMap = new HashMap<String, Object>();
+				newMap.put("lx", 1);
+				newMap.put("nr", lx);
+				newMap.put("lp", "小计");
+				newMap.put("nbbm", "少驶班次");
+				newMap.put("jgh", lbbc);
+				newMap.put("lbbc", "少驶公里");
+				newMap.put("lblc", lblc);
+				newMap.put("dz", " ");
+				newMap.put("sj", " ");
+				newMap.put("gzf", " ");
+				newMap.put("jyqp"," ");
+				listNew.add(newMap);
+			}
+
+
 		}
 		Collections.sort(listNew, new ComparableJob());
 		return listNew;
 	}
-		
-		//统计临加班次详细信息
-		@Override
-		public List<Map<String, Object>> jobLjqk(Map<String, Object> map) {
-			// TODO Auto-generated method stub
-			String line=map.get("line").toString();
-			String date=map.get("date").toString();
-			map.put("bcType", "normal");
-			List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
-			List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
-			for (int i = 0; i < sList.size(); i++) {
-				ScheduleRealInfo scheduleRealInfo=sList.get(i);
-				if (!(scheduleRealInfo.getBcType().equals("in") 
-						|| scheduleRealInfo.getBcType().equals("out")
-						|| scheduleRealInfo.getBcType().equals("ldks"))) {
+
+	//统计临加班次详细信息
+	@Override
+	public List<Map<String, Object>> jobLjqk(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		String line=map.get("line").toString();
+		String date=map.get("date").toString();
+		map.put("bcType", "normal");
+		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
+		List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
+		for (int i = 0; i < sList.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=sList.get(i);
+			if (!(scheduleRealInfo.getBcType().equals("in")
+					|| scheduleRealInfo.getBcType().equals("out")
+					|| scheduleRealInfo.getBcType().equals("ldks"))) {
 //				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 //				if(childTaskPlans.isEmpty()){
-					if(scheduleRealInfo.isSflj()){
-						Map<String, Object> newMap=new HashMap<String,Object>();
-						newMap.put("lp", scheduleRealInfo.getLpName());
-						newMap.put("nbbm", scheduleRealInfo.getClZbh());
-						newMap.put("jgh", scheduleRealInfo.getjGh());
-						newMap.put("dz", scheduleRealInfo.getQdzName());
-						newMap.put("sj", scheduleRealInfo.getFcsj());
-						newMap.put("ljlc", scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
-						newMap.put("jyqp", scheduleRealInfo.getRealMileage()==null?"":scheduleRealInfo.getRealMileage());
-						list.add(newMap);
-					}
+				if(scheduleRealInfo.isSflj()){
+					Map<String, Object> newMap=new HashMap<String,Object>();
+					newMap.put("lp", scheduleRealInfo.getLpName());
+					newMap.put("nbbm", scheduleRealInfo.getClZbh());
+					newMap.put("jgh", scheduleRealInfo.getjGh());
+					newMap.put("dz", scheduleRealInfo.getQdzName());
+					newMap.put("sj", scheduleRealInfo.getFcsj());
+					newMap.put("ljlc", scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+					newMap.put("jyqp", scheduleRealInfo.getRealMileage()==null?"":scheduleRealInfo.getRealMileage());
+					list.add(newMap);
+				}
 //				}else{
 //					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 //	                while (it.hasNext()) {
 //	                    ChildTaskPlan childTaskPlan = it.next();
 //	                    if (childTaskPlan.isDestroy()) {
-//	                    } 
+//	                    }
 //	                }
 //				}
+			}
+		}
+		return list;
+	}
+
+	public static  double culateCJLC2(List<ScheduleRealInfo> list, String item) {
+		// TODO Auto-generated method stub
+		double sum = 0;
+		Set<ChildTaskPlan> cts;
+		for(ScheduleRealInfo sch : list){
+			if (sch.isSflj())
+				continue;
+			cts = sch.getcTasks();
+			//有子任务
+			if (cts != null && cts.size() > 0) {
+				for(ChildTaskPlan c : cts){
+					if(c.isDestroy() && c.getDestroyReason().equals(item))
+						sum = Arith.add(sum, c.getMileage());
 				}
 			}
-			return list;
-		}
-		
-		public static  double culateCJLC2(List<ScheduleRealInfo> list, String item) {
-			// TODO Auto-generated method stub
-			double sum = 0;
-	        Set<ChildTaskPlan> cts;
-	        for(ScheduleRealInfo sch : list){
-	            if (sch.isSflj())
-	                continue;
-	            cts = sch.getcTasks();
-	            //有子任务
-	            if (cts != null && cts.size() > 0) {
-	                for(ChildTaskPlan c : cts){
-	                    if(c.isDestroy() && c.getDestroyReason().equals(item))
-	                        sum = Arith.add(sum, c.getMileage());
-	                }
-	            }
 //	            else if(isInOut(sch))
 //	                continue;
-	            //主任务烂班
-	            else if(sch.getStatus() == -1){
-	                if(sch.getAdjustExps().equals(item) ||
-	                        (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){
-	                    sum = Arith.add(sum, sch.getJhlcOrig());
-	                }
-	            }
-	            else if(item.equals("其他")){
-	                double diff =  Arith.sub(sch.getJhlcOrig(), sch.getJhlc());
-	                if(diff > 0){
-	                    sum = Arith.add(sum, diff);
-	                }
-	            }
-	        }
-	        return sum;
-
-		}
-		@Override
-		public Map<String, Object> jobHzxx(Map<String, Object> map) {
-			// TODO Auto-generated method stub
-			String line="";
-			if(map.get("line")!=null){
-				line=map.get("line").toString();
-			}
-			String date="";
-			if(map.get("date")!=null){
-				date=map.get("date").toString();
-			}
-			
-			List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
-			Map<String, Object> newMap=new HashMap<String,Object>();
-			newMap.put("jhbc", culateService.culateJhbc(sList,""));
-			newMap.put("jhgl", culateService.culateJhgl(sList));
-			newMap.put("sjbc", culateService.culateSjbc(sList,""));
-			newMap.put("sjgl", culateService.culateSjgl(sList));
-			newMap.put("lbgl", culateService.culateLbgl(sList));
-			newMap.put("lbbc", culateService.culateLbbc(sList));
-			newMap.put("ljgl", culateService.culateLjgl(sList));
-			newMap.put("ljbc", culateService.culateLjbc(sList,""));
-			newMap.put("ksgl", culateService.culateKsgl(sList));
-			return newMap;
-		}
-		@Override
-		public List<Map<String, Object>> lineList() {
-			// TODO Auto-generated method stub
-			List<Map<String, Object>>  list=new ArrayList<Map<String,Object>>();
-			 Iterator<Line> iterator = lineRepository.findAll().iterator();
-			 Line line;
-			 while (iterator.hasNext()) {
-				 line = iterator.next();
-				 Map<String, Object> map=new HashMap<String,Object>();
-				 map.put("gsbm", line.getCompany());
-				 map.put("fgsbm", line.getBrancheCompany());
-				 map.put("xlbm", line.getLineCode());
-				 map.put("xlname", line.getName());
-				 list.add(map);
-			 }
-			return list;
-		}
-		@Override
-		public List<Map<String, String>> carList(Map<String, Object> maps) {
-			// TODO Auto-generated method stub
-			 // 转大写
-	        String nbbm =maps.get("nbbm").toString().toUpperCase();
-	        String gsbm="";
-	        
-	       if(maps.get("gsbm")!=null)
-	    	   gsbm= maps.get("gsbm").toString().trim();
-//	        String fgsbm=maps.get("fgsbm").toString().trim();
-	        String xlbm=maps.get("xlbm").toString().trim();
-	        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
-	        Map<String, String> map;
-	        Set<String> allSet = BasicData.nbbm2CompanyCodeMap.keySet();
-
-	        Line line;
-	        for (String k : allSet) {
-	            if (k.indexOf(nbbm) != -1) {
-	                // 所属线路
-	            	boolean fage=true;
-	                map = new HashMap<>();
-	                line = BasicData.nbbm2LineMap.get(k);
-	                String clgsdm= BasicData.nbbm2CompanyCodeMap.get(k);
-	                
-	                map.put("id", k);
-	                map.put("text", k);
-	                if (null != line) {
-	                    map.put("lineName", line.getName());
-	                    map.put("lineCode", line.getLineCode());
-	                }
-	                
-	                if(!xlbm.equals("")){
-	                	if(null!=line){
-	                		if(!line.getLineCode().equals(xlbm)){
-		                		fage=false;
-		                	}
-	                	}
-	                	
-	                }
-	                
-	                if(!gsbm.equals("")){
-	                	if(!clgsdm.equals(gsbm)){
-	                		fage=false;
-	                	}
-	                }
-	                
-	                if(fage){
-	                	 list.add(map);
-	                }
-	              
-	            }
-
-	            if (list.size() > 20)
-	                break;
-	        }
-	        return list;
-		}
-		
-		
-		@Override
-		public List<Map<String, String>> userList(Map<String, Object> maps) {
-			// TODO Auto-generated method stub
-			 // 转大写
-	        String jsy =maps.get("jsy").toString().toUpperCase();
-	        String gsbm="";
-	        if(maps.get("gsbm")!=null)
-	        	gsbm=maps.get("gsbm").toString().trim();
+			//主任务烂班
+			else if(sch.getStatus() == -1){
+				if(sch.getAdjustExps().equals(item) ||
+						(StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){
+					sum = Arith.add(sum, sch.getJhlcOrig());
+				}
+			}
+			else if(item.equals("其他")){
+				double diff =  Arith.sub(sch.getJhlcOrig(), sch.getJhlc());
+				if(diff > 0){
+					sum = Arith.add(sum, diff);
+				}
+			}
+		}
+		return sum;
+
+	}
+	@Override
+	public Map<String, Object> jobHzxx(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+
+		List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		newMap.put("jhbc", culateService.culateJhbc(sList,""));
+		newMap.put("jhgl", culateService.culateJhgl(sList));
+		newMap.put("sjbc", culateService.culateSjbc(sList,""));
+		newMap.put("sjgl", culateService.culateSjgl(sList));
+		newMap.put("lbgl", culateService.culateLbgl(sList));
+		newMap.put("lbbc", culateService.culateLbbc(sList));
+		newMap.put("ljgl", culateService.culateLjgl(sList));
+		newMap.put("ljbc", culateService.culateLjbc(sList,""));
+		newMap.put("ksgl", culateService.culateKsgl(sList));
+		return newMap;
+	}
+	@Override
+	public List<Map<String, Object>> lineList() {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>>  list=new ArrayList<Map<String,Object>>();
+		Iterator<Line> iterator = lineRepository.findAll().iterator();
+		Line line;
+		while (iterator.hasNext()) {
+			line = iterator.next();
+			Map<String, Object> map=new HashMap<String,Object>();
+			map.put("gsbm", line.getCompany());
+			map.put("fgsbm", line.getBrancheCompany());
+			map.put("xlbm", line.getLineCode());
+			map.put("xlname", line.getName());
+			list.add(map);
+		}
+		return list;
+	}
+	@Override
+	public List<Map<String, String>> carList(Map<String, Object> maps) {
+		// TODO Auto-generated method stub
+		// 转大写
+		String nbbm =maps.get("nbbm").toString().toUpperCase();
+		String gsbm="";
+
+		if(maps.get("gsbm")!=null)
+			gsbm= maps.get("gsbm").toString().trim();
 //	        String fgsbm=maps.get("fgsbm").toString().trim();
-	        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
-	        Map<String, String> map;
-//	        Set<String> allSet = BasicData.nbbm2CompanyCodeMap.keySet();
-	        Set<String> allJsy = BasicData.perMap.keySet();
-
-	        Personnel per;
-	        for (String k : allJsy) {
-	            if (k.indexOf(jsy) != -1) {
-	                map = new HashMap<>();
-	                // 通过人员查找公司
-	                per = BasicData.perMap.get(k);
-	                String rygsdm="";
-	                if(null != per){
-		                if(per.getCompanyCode()!=null){
-		                	 rygsdm = per.getCompanyCode();
-		                }
-		                String jboCode=per.getJobCode().substring(per.getJobCode().indexOf("-")+1);
-		                map.put("id", jboCode);
-		                map.put("text", jboCode+"/"+per.getPersonnelName());
-		                if(!gsbm.equals("")){
-		                	if(rygsdm.equals(gsbm)){
-		                		 list.add(map);
-		                	}
-		                }
-	                }
-	            }
-
-	            if (list.size() > 20)
-	                break;
-	        }
-	        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;
+		String xlbm=maps.get("xlbm").toString().trim();
+		List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+		Map<String, String> map;
+		Set<String> allSet = BasicData.nbbm2CompanyCodeMap.keySet();
+
+		Line line;
+		for (String k : allSet) {
+			if (k.indexOf(nbbm) != -1) {
+				// 所属线路
+				boolean fage=true;
+				map = new HashMap<>();
+				line = BasicData.nbbm2LineMap.get(k);
+				String clgsdm= BasicData.nbbm2CompanyCodeMap.get(k);
+
+				map.put("id", k);
+				map.put("text", k);
+				if (null != line) {
+					map.put("lineName", line.getName());
+					map.put("lineCode", line.getLineCode());
+				}
+
+				if(!xlbm.equals("")){
+					if(null!=line){
+						if(!line.getLineCode().equals(xlbm)){
+							fage=false;
 						}
-					});
+					}
-			} 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");
-					Long date1=0L;
-					Long date2=0L;
-					Calendar cal = Calendar.getInstance();
-					try {
-						Date dates1 = simpleDateFormat.parse(date+" 00:00:01");
-						Date dates2=simpleDateFormat.parse(date+" 23:59:59");
-						 date1=dates1.getTime();
-						 date2=dates2.getTime();
-						 cal.setTime(dates1);
-					} catch (ParseException e1) {
-						// TODO Auto-generated catch block
-						e1.printStackTrace();
+				}
+
+				if(!gsbm.equals("")){
+					if(!clgsdm.equals(gsbm)){
+						fage=false;
 					}
-					//周数，表分区字段
-					int weeks_year1 = cal.get(Calendar.WEEK_OF_YEAR);
-					List<ArrivalInfo> list = null;
-				Connection conn = null;
-				PreparedStatement ps = null;
-				ResultSet rs = null;
-				
-				String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year=? "
-						+ " AND ts >= ? AND ts <=? AND up_down=? order by device_id,ts";
-				try{
-					conn = DBUtils_MS.getConnection();
-					ps = conn.prepareStatement(sql);
-					ps.setString(1, line);
-					ps.setInt(2, weeks_year1);
-					ps.setLong(3, date1);
-					ps.setLong(4, date2);
-					ps.setInt(5, zd);
-					rs = ps.executeQuery();
-					
-					list = resultSet2Set(rs);
-				}catch(Exception e){
-					logger.error("", e);
-				}finally {
-					DBUtils_MS.close(rs, ps, conn);
 				}
-			return list;
+
+				if(fage){
+					list.add(map);
+				}
+
+			}
+
+			if (list.size() > 20)
+				break;
 		}
-		
-		//根据排班查到离站
-		@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");
-			//查询线路所有的站点
-			List<ArrivalInfo> arrInfoList=this.load3(line, date, zd);
-			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", "");
-			
-			//所有的班次信息（实际排班排序）
-			List<ScheduleRealInfo> realList= scheduleRealInfoRepository.scheduleByDateAndLineInOut(line, date,zd+"");
-			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 i = 0; i < realList.size(); i++) {
-				ScheduleRealInfo sinfo=realList.get(i);
-				String devuceId=BasicData.deviceId2NbbmMap.inverse().get(sinfo.getClZbh());
-				String sjfcsj=sinfo.getRealExecDate()+" "+sinfo.getFcsjActual()+":00";
-				String sjddsj=sinfo.getRealExecDate()+" "+sinfo.getZdsjActual()+":59";
-				
-				try {
-					Date dates1 = simpleDateFormat.parse(sjfcsj);
-					Date dates2=simpleDateFormat.parse(sjddsj);
-					Long date1=dates1.getTime();
-					Long date2=dates2.getTime();
-					List<ArrivalInfo> arrList=new ArrayList<ArrivalInfo>();
-					for (int j = 0; j < arrInfoList.size(); j++) {
-						ArrivalInfo a=arrInfoList.get(j);
-						if(a.getDeviceId().equals(devuceId) && a.getTs()>=date1 && a.getTs()<=date2){
-							arrList.add(a);
-						}
+		return list;
+	}
+
+
+	@Override
+	public List<Map<String, String>> userList(Map<String, Object> maps) {
+		// TODO Auto-generated method stub
+		// 转大写
+		String jsy =maps.get("jsy").toString().toUpperCase();
+		String gsbm="";
+		if(maps.get("gsbm")!=null)
+			gsbm=maps.get("gsbm").toString().trim();
+//	        String fgsbm=maps.get("fgsbm").toString().trim();
+		List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+		Map<String, String> map;
+//	        Set<String> allSet = BasicData.nbbm2CompanyCodeMap.keySet();
+		Set<String> allJsy = BasicData.perMap.keySet();
+
+		Personnel per;
+		for (String k : allJsy) {
+			if (k.indexOf(jsy) != -1) {
+				map = new HashMap<>();
+				// 通过人员查找公司
+				per = BasicData.perMap.get(k);
+				String rygsdm="";
+				if(null != per){
+					if(per.getCompanyCode()!=null){
+						rygsdm = per.getCompanyCode();
 					}
-					
-					Map<String, Object> map2=new HashMap<String,Object>();
-					map2.put("bc", (i+1));
-					map2.put("nbbm", sinfo.getClZbh());
-					
-					for (int j = 0; j < listStation.size(); j++) {
-						StationRoute s=listStation.get(j);
-						List<ArrivalInfo> arrivalList=new ArrayList<ArrivalInfo>();
-						for (int j2 = 0; j2 < arrList.size(); j2++) {
-							ArrivalInfo a=arrList.get(j2);
-							if(s.getStationCode().equals(a.getStopNo())){
-								arrivalList.add(a);
-							}
+					String jboCode=per.getJobCode().substring(per.getJobCode().indexOf("-")+1);
+					map.put("id", jboCode);
+					map.put("text", jboCode+"/"+per.getPersonnelName());
+					if(!gsbm.equals("")){
+						if(rygsdm.equals(gsbm)){
+							list.add(map);
 						}
-						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"));
 					}
-					inoutList.add(map2);
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
 				}
 			}
-			return inoutList;
+
+			if (list.size() > 20)
+				break;
 		}
-		
-		//根据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);
+		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");
+		Long date1=0L;
+		Long date2=0L;
+		Calendar cal = Calendar.getInstance();
+		try {
+			Date dates1 = simpleDateFormat.parse(date+" 00:00:01");
+			Date dates2=simpleDateFormat.parse(date+" 23:59:59");
+			date1=dates1.getTime();
+			date2=dates2.getTime();
+			cal.setTime(dates1);
+		} catch (ParseException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		//周数，表分区字段
+		int weeks_year1 = cal.get(Calendar.WEEK_OF_YEAR);
+		List<ArrivalInfo> list = null;
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+
+		String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year=? "
+				+ " AND ts >= ? AND ts <=? AND up_down=? order by device_id,ts";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setString(1, line);
+			ps.setInt(2, weeks_year1);
+			ps.setLong(3, date1);
+			ps.setLong(4, date2);
+			ps.setInt(5, zd);
+			rs = ps.executeQuery();
+
+			list = resultSet2Set(rs);
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		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");
+		//查询线路所有的站点
+		List<ArrivalInfo> arrInfoList=this.load3(line, date, zd);
+		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", "");
+
+		//所有的班次信息（实际排班排序）
+		List<ScheduleRealInfo> realList= scheduleRealInfoRepository.scheduleByDateAndLineInOut(line, date,zd+"");
+		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 i = 0; i < realList.size(); i++) {
+			ScheduleRealInfo sinfo=realList.get(i);
+			String devuceId=BasicData.deviceId2NbbmMap.inverse().get(sinfo.getClZbh());
+			String sjfcsj=sinfo.getRealExecDate()+" "+sinfo.getFcsjActual()+":00";
+			String sjddsj=sinfo.getRealExecDate()+" "+sinfo.getZdsjActual()+":59";
+
+			try {
+				Date dates1 = simpleDateFormat.parse(sjfcsj);
+				Date dates2=simpleDateFormat.parse(sjddsj);
+				Long date1=dates1.getTime();
+				Long date2=dates2.getTime();
+				List<ArrivalInfo> arrList=new ArrayList<ArrivalInfo>();
+				for (int j = 0; j < arrInfoList.size(); j++) {
+					ArrivalInfo a=arrInfoList.get(j);
+					if(a.getDeviceId().equals(devuceId) && a.getTs()>=date1 && a.getTs()<=date2){
+						arrList.add(a);
+					}
+				}
+
+				Map<String, Object> map2=new HashMap<String,Object>();
+				map2.put("bc", (i+1));
+				map2.put("nbbm", sinfo.getClZbh());
+
+				for (int j = 0; j < listStation.size(); j++) {
+					StationRoute s=listStation.get(j);
+					List<ArrivalInfo> arrivalList=new ArrayList<ArrivalInfo>();
+					for (int j2 = 0; j2 < arrList.size(); j2++) {
+						ArrivalInfo a=arrList.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"));
+				}
+				inoutList.add(map2);
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		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());
+		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>();
-								}
+		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);
+						}
+						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"));
+						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();
-							
-						}
-						
+						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");
-			Long in=0L;
-			Long out=0L;
-			for(int i=0;i<lists.size();i++){
-				ArrivalInfo t1=lists.get(i);
-				if(t1.getInOut()==0){
-					in=t1.getTs();
-					t1.setJzsj(sdf.format(new Date(t1.getTs())));
-					for(int j=0;j<lists.size();j++){
-						ArrivalInfo t2=lists.get(j);
-						if(t2.getInOut()==1 && t2.getDeviceId().equals(t1.getDeviceId()) 
-								&& t2.getStopNo().equals(t1.getStopNo())
-								&& t2.getTs()>t1.getTs()){
-							t1.setCzsj(sdf.format(new Date(t2.getTs())));
-							out =t2.getTs();
-							break;
-						}else{
-							t1.setCzsj("");
-							out =0l;
-						}
+
+		return inoutList;
+	}
+
+	public Map<String, String> strInOut(List<ArrivalInfo> lists,String lzsj){
+		String inout="";
+		SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+		Long in=0L;
+		Long out=0L;
+		for(int i=0;i<lists.size();i++){
+			ArrivalInfo t1=lists.get(i);
+			if(t1.getInOut()==0){
+				in=t1.getTs();
+				t1.setJzsj(sdf.format(new Date(t1.getTs())));
+				for(int j=0;j<lists.size();j++){
+					ArrivalInfo t2=lists.get(j);
+					if(t2.getInOut()==1 && t2.getDeviceId().equals(t1.getDeviceId())
+							&& t2.getStopNo().equals(t1.getStopNo())
+							&& t2.getTs()>t1.getTs()){
+						t1.setCzsj(sdf.format(new Date(t2.getTs())));
+						out =t2.getTs();
+						break;
+					}else{
+						t1.setCzsj("");
+						out =0l;
 					}
-					
-				}else{
-					out =t1.getTs();
-					t1.setCzsj(sdf.format(new Date(t1.getTs())));
-					for(int j=0;j<lists.size();j++){
-						ArrivalInfo t2=lists.get(j);
-						if(t2.getInOut()==0 && t2.getDeviceId().equals(t1.getDeviceId()) 
-								&& t2.getStopNo().equals(t1.getStopNo())
-								&& t2.getTs()>t1.getTs()){
-							in =t2.getTs();
-							t1.setJzsj(sdf.format(new Date(t2.getTs())));
-							break;
-						}
+				}
+
+			}else{
+				out =t1.getTs();
+				t1.setCzsj(sdf.format(new Date(t1.getTs())));
+				for(int j=0;j<lists.size();j++){
+					ArrivalInfo t2=lists.get(j);
+					if(t2.getInOut()==0 && t2.getDeviceId().equals(t1.getDeviceId())
+							&& t2.getStopNo().equals(t1.getStopNo())
+							&& t2.getTs()>t1.getTs()){
+						in =t2.getTs();
+						t1.setJzsj(sdf.format(new Date(t2.getTs())));
+						break;
 					}
 				}
 			}
-			
-			Map<String, String> map=new HashMap<String,String>();
-			if(in>0 ){
-				map.put("in",sdf.format(new Date(in)));
-				
+		}
+
+		Map<String, String> map=new HashMap<String,String>();
+		if(in>0 ){
+			map.put("in",sdf.format(new Date(in)));
+
+		}else{
+			map.put("in", "");
+		}
+		if(out>0){
+			map.put("out", sdf.format(new Date(out)));
+		}else{
+			map.put("out", "");
+		}
+		Long sj=1000000000L;
+		if(!lzsj.trim().equals("")){
+			sj =Long.parseLong(lzsj);
+		}
+		if(in>0 && out >0){
+			if((out-in)/1000>sj){
+				map.put("type", "y");
 			}else{
-				map.put("in", "");
+				map.put("type", "n");
+			}
+		}
+		return map;
+	}
+	@Override
+	public List<StationRoute> queryStrinon(String line, int zd) {
+		// TODO Auto-generated method stub
+		List<StationRoute> listStation= stationRouteRepository.findByLine(line,zd);
+		return listStation;
+	}
+	@Override
+	public List<Map<String, Object>> countByList(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+
+		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		//所有班次信息
+		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+		line =line.trim();
+		if(line.equals("")){
+			//查询所有线路
+			list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2,gsdm,fgsdm);
+		}else{
+			//查询单条线路
+			list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
+		}
+
+		String sql="select r.xl_bm"
+				+ " from bsth_c_s_sp_info_real r where"
+				+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
+
+
+		if(line.equals("")){
+			sql +="and r.gs_bm='"+gsdm+"' "
+					+ " and r.fgs_bm='"+fgsdm+"'";
+		}else{
+			sql += " and r.xl_bm = '"+line+"'";
+		}
+		sql += " group  by  r.xl_bm";
+
+		List<String> listLine=jdbcTemplate.query(sql, new RowMapper<String>() {
+			@Override
+			public String mapRow(ResultSet arg0, int arg1) throws SQLException {
+				String ve = arg0.getString("xl_bm");
+				return ve;
 			}
-			if(out>0){
-				map.put("out", sdf.format(new Date(out)));
+		});
+		for (int i = 0; i < listLine.size(); i++) {
+			List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
+			String lineStr=listLine.get(i);
+			for (int j = 0; j < list.size(); j++) {
+				ScheduleRealInfo s=list.get(j);
+				if(s.getXlBm().equals(lineStr)){
+					lists.add(s);
+				}
+			}
+
+			//计算线路的各项公里
+			if(lists.size()>0){
+				Map<String, Object> newMap=staticTj(lists,"z");
+				lMap.add(newMap);
+			}
+		}
+		if(list.size()>0){
+			Map<String, Object> newMap=staticTj(list,"f");
+			lMap.add(newMap);
+		}
+		if(type.equals("export")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			m.put("date1", date2);
+			String by=map.get("by").toString();
+			String xls="";
+			if(by.equals("sj")){
+				xls="countByLine.xls";
 			}else{
-				map.put("out", "");
+				xls="countByLines.xls";
 			}
-			Long sj=1000000000L;
-			if(!lzsj.trim().equals("")){
-				sj =Long.parseLong(lzsj);
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(lMap.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
+						path + "export/线路公里统计表.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
 			}
-			if(in>0 && out >0){
-				if((out-in)/1000>sj){
-					map.put("type", "y");
-				}else{
-					map.put("type", "n");
+		}
+		return lMap;
+	}
+
+
+	public final Map<String, Object> staticTj(List<ScheduleRealInfo> list,String status){
+
+		List<ScheduleRealInfo>  lists=new ArrayList<ScheduleRealInfo>();
+		for(int i=0;i<list.size();i++){
+			ScheduleRealInfo s=list.get(i);
+			Set<ChildTaskPlan> cts = s.getcTasks();
+			if(cts != null && cts.size() > 0){
+				lists.add(s);
+			}else{
+				if(s.getZdsjActual()!=null){
+					lists.add(s);
 				}
 			}
-			return map;
-		}
-		@Override
-		public List<StationRoute> queryStrinon(String line, int zd) {
-			// TODO Auto-generated method stub
-			List<StationRoute> listStation= stationRouteRepository.findByLine(line,zd);
-			return listStation;
-		}
-		@Override
-		public List<Map<String, Object>> countByList(Map<String, Object> map) {
-			// TODO Auto-generated method stub
-			
-			List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
-			String gsdm="";
-			if(map.get("gsdm")!=null){
-				gsdm=map.get("gsdm").toString();
-			}
-			String fgsdm="";
-			if(map.get("fgsdm")!=null){
-				fgsdm=map.get("fgsdm").toString();
-			}
-			String line="";
-			if(map.get("line")!=null){
-				line=map.get("line").toString();
-			}
-			String date="";
-			if(map.get("date")!=null){
-				date=map.get("date").toString();
-			}
-			String date2="";
-			if(map.get("date2")!=null){
-				date2=map.get("date2").toString();
-			}
-			String xlName="";
-			if(map.get("xlName")!=null){
-				xlName=map.get("xlName").toString();
-			}
-			String type="";
-			if(map.get("type")!=null){
-				type=map.get("type").toString();
-			}
-			//所有班次信息
-			 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-	        line =line.trim();
-	        if(line.equals("")){
-	            //查询所有线路
-	            list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2,gsdm,fgsdm);
-	        }else{
-	            //查询单条线路
-	            list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
-	        }
-	        
-	        String sql="select r.xl_bm"
-					+ " from bsth_c_s_sp_info_real r where"
-					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
-	        
-	       
-			if(line.equals("")){
-				sql +="and r.gs_bm='"+gsdm+"' "
-						+ " and r.fgs_bm='"+fgsdm+"'";
+		}
+		Map<String, Object> map = new HashMap<String, Object>();
+		if(list.size()>0){
+			if(status.equals("f")){
+				map.put("xlName","合计");
+				map.put("gs", "");
+				map.put("fgs", "");
 			}else{
-				sql += " and r.xl_bm = '"+line+"'";
+				map.put("xlName", list.get(0).getXlName());
+				map.put("gs", list.get(0).getGsName());
+				map.put("fgs", list.get(0).getFgsName());
+				map.put("jGh", list.get(0).getjGh());
+				map.put("sGh", list.get(0).getsGh()==null?"":list.get(0).getsGh());
+				map.put("nbbm",list.get(0).getClZbh());
+				map.put("line", list.get(0).getXlBm());
 			}
-		       sql += " group  by  r.xl_bm";
-		       
-		       List<String> listLine=jdbcTemplate.query(sql, new RowMapper<String>() {
-					@Override
-					public String mapRow(ResultSet arg0, int arg1) throws SQLException {
-						String ve = arg0.getString("xl_bm");
-						return ve;
+
+			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));//计划总里程
+
+			//计划内外营运
+			Map<String, Double> culateSjlcMap=culateService.culateSjlcMap(lists);
+			double jhnlc=culateSjlcMap.get("jhnlc");
+			double jhwlc=culateSjlcMap.get("jhwlc");
+			map.put("jhnlc", jhnlc);
+			map.put("jhwlc", jhwlc);
+			double zyylc=Arith.add(jhnlc, jhwlc);
+
+			//计划内外进出场
+			Map<String, Double> culateSjJcclcMap=culateService.culateSjJcclcMap(lists);
+			double jhwjcclc=culateSjJcclcMap.get("jhwlc");
+			double jhnjcclc=culateSjJcclcMap.get("jhnlc");
+			map.put("jhwjcclc", jhwjcclc);
+			map.put("jhnjcclc", jhnjcclc);
+			double zjcclc=Arith.add(jhwjcclc, jhnjcclc);
+
+			//临加公里
+			Map<String, Double> culateLjMile=culateService.culateLjMile(lists);
+			double ljyy=culateLjMile.get("ljyy");
+			double ljjcc=culateLjMile.get("ljjcc");
+			double ljkfks=culateLjMile.get("ljkfks");
+			map.put("ljyy", ljyy);
+			map.put("ljjcc", ljjcc);
+			map.put("ljkfks", ljkfks);
+
+			double ljlc=Arith.add(Arith.add(ljyy, ljjcc),ljkfks);
+
+			double lbss=culateService.culateSsMile(list);//烂班少驶
+			map.put("lbss", lbss);
+			map.put("ssgl_lz", culateService.culateSsMileXx(list, "路阻"));
+			map.put("ssgl_dm", culateService.culateSsMileXx(list, "吊慢"));
+			map.put("ssgl_gz", culateService.culateSsMileXx(list, "故障"));
+			map.put("ssgl_jf", culateService.culateSsMileXx(list, "纠纷"));
+			map.put("ssgl_zs", culateService.culateSsMileXx(list, "肇事"));
+			map.put("ssgl_qr", culateService.culateSsMileXx(list, "缺人"));
+			map.put("ssgl_qc", culateService.culateSsMileXx(list, "缺车"));
+			map.put("ssgl_kx", culateService.culateSsMileXx(list, "客稀"));
+			map.put("ssgl_qh", culateService.culateSsMileXx(list, "气候"));
+			map.put("ssgl_yw", culateService.culateSsMileXx(list, "援外"));
+			map.put("ssgl_other", culateService.culateSsMileXx(list, "其他"));
+
+
+			double zrwjcclc=culateService.culateZrwJccLc(list, "故障");
+			double zrwjcclc1=culateService.culateZrwJccLc(list, "肇事");
+			double zrwjcclc2=culateService.culateZrwJccLc(list, "纠纷");
+			double zrwjcclcqt=culateService.culateZrwJccLc(list, "其他");
+			map.put("jhwjcclc_z", Arith.add(jhwjcclc,zrwjcclcqt));
+			map.put("zrwjcclc", zrwjcclc);
+			map.put("zrwjcclc1", zrwjcclc1);
+			map.put("zrwjcclc2", zrwjcclc2);
+			map.put("zrwjcclcqt", zrwjcclcqt);
+			double zrwjcc=Arith.add(Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2),zrwjcclcqt);
+			double kfks=Arith.add(culateService.culateKfksLc(lists),culateService.culateZrwJccLc(list, "空放"));
+			map.put("kfks", kfks);
+			double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc),
+					Arith.add(zjcclc, zyylc)),kfks);
+			map.put("zlc", zlc);
+		}
+		return map;
+	}
+	@Override
+	public List<Map<String, Object>> countByBusList(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> lMaps = new ArrayList<Map<String, Object>>();
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		String zt="";
+		if(map.get("zt")!=null){
+			zt=map.get("zt").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		//所有班次信息
+		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+		line =line.trim();
+		if(line.equals("")){
+			//查询所有线路
+			list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2,gsdm,fgsdm);
+		}else{
+			//查询单条线路
+			list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
+		}
+		String ylbSql=" select * from bsth_c_ylb where rq BETWEEN '"+date+"' and '"+date2+"'";
+		if(line.equals("")){
+			ylbSql +="and ssgsdm='"+gsdm+"' "
+					+ " and fgsdm='"+fgsdm+"'";
+		}else{
+			ylbSql += " and xlbm = '"+line+"'";
+		}
+		List<Ylb> ylbList=ylbList(ylbSql);
+		String dlbSql=" select * from bsth_c_dlb where rq BETWEEN '"+date+"' and '"+date2+"'";
+		if(line.equals("")){
+			dlbSql +="and ssgsdm='"+gsdm+"' "
+					+ " and fgsdm='"+fgsdm+"'";
+		}else{
+			dlbSql += " and xlbm = '"+line+"'";
+		}
+		List<Dlb> dlbList=dlbList(dlbSql);
+		String sql="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
+				+ " from bsth_c_s_sp_info_real r where"
+				+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
+		if(line.equals("")){
+			sql +="and r.gs_bm='"+gsdm+"' "
+					+ " and r.fgs_bm='"+fgsdm+"'";
+		}else{
+			sql += " and r.xl_bm = '"+line+"'";
+		}
+		sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str,r.j_gh,r.s_gh";
+
+		List<Map<String, Object>> listGroupBy=jdbcTemplate.query(sql, 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("xl_bm"));
+				map.put("date", arg0.getString("schedule_date_str"));
+				map.put("nbbm", arg0.getString("cl_zbh"));
+				map.put("jGh", arg0.getString("j_gh"));
+				map.put("sGh", arg0.getString("s_gh"));
+				return map;
+			}
+		});
+		for (int i = 0; i < listGroupBy.size(); i++) {
+			Map<String, Object> m=listGroupBy.get(i);
+			String xl_bm=m.get("line")==null?"":m.get("line").toString();
+			String dateStr=m.get("date")==null?"":m.get("date").toString();
+			String nbbm =m.get("nbbm")==null?"":m.get("nbbm").toString();
+			String jGh= m.get("jGh")==null?"":m.get("jGh").toString();
+			String sGh= m.get("sGh")==null?"":m.get("sGh").toString();
+			List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+			for (int j = 0; j < list.size(); j++) {
+				ScheduleRealInfo s=list.get(j);
+				if(zt.equals("zbh")){
+					if(xl_bm.equals(s.getXlBm()) && nbbm.equals(s.getClZbh())){
+						lists.add(s);
 					}
-				});
-		       for (int i = 0; i < listLine.size(); i++) {
-		    	   List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
-		    	   String lineStr=listLine.get(i);
-		    	   for (int j = 0; j < list.size(); j++) {
-					   ScheduleRealInfo s=list.get(j);
-					   if(s.getXlBm().equals(lineStr)){
-						   lists.add(s);
-					   }
-				   }
-		    	   
-		    	   //计算线路的各项公里
-		    	   if(lists.size()>0){
-		    		   Map<String, Object> newMap=staticTj(lists,"z");
-		    		   lMap.add(newMap);
-		    	   }
-			   }
-		       if(list.size()>0){
-		    	   Map<String, Object> newMap=staticTj(list,"f");
-		    	   lMap.add(newMap);
-		       }
-		       if(type.equals("export")){
-		    	    List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-		            Map<String, Object> m = new HashMap<String, Object>();
-		            m.put("date", date);
-		            m.put("date1", date2);
-		            String by=map.get("by").toString();
-		            String xls="";
-		            if(by.equals("sj")){
-		            	xls="countByLine.xls";
-		            }else{
-		            	xls="countByLines.xls";
-		            }
-		            ReportUtils ee = new ReportUtils();
-		            try {
-		                listI.add(lMap.iterator());
-		                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-		                ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
-		                        path + "export/线路公里统计表.xls");
-		            } catch (Exception e) {
-		                // TODO: handle exception
-		                e.printStackTrace();
-		            }
-		       }
-			return lMap;
-		}
-		
-		
-		 public final Map<String, Object> staticTj(List<ScheduleRealInfo> list,String status){
-			    
-		        List<ScheduleRealInfo>  lists=new ArrayList<ScheduleRealInfo>();
-		        for(int i=0;i<list.size();i++){
-		            ScheduleRealInfo s=list.get(i);
-		            Set<ChildTaskPlan> cts = s.getcTasks();
-		            if(cts != null && cts.size() > 0){
-		            	lists.add(s);
-		            }else{
-			            if(s.getZdsjActual()!=null){
-			            	lists.add(s);
-			            }
-		            }
-		        }
-		        Map<String, Object> map = new HashMap<String, Object>();
-		    	if(list.size()>0){
-		    		if(status.equals("f")){
-		    			map.put("xlName","合计");
-		    			map.put("gs", "");
-				        map.put("fgs", "");
-		    		}else{
-		    			map.put("xlName", list.get(0).getXlName());
-				        map.put("gs", list.get(0).getGsName());
-				        map.put("fgs", list.get(0).getFgsName());
-				        map.put("jGh", list.get(0).getjGh());
-				        map.put("sGh", list.get(0).getsGh()==null?"":list.get(0).getsGh());
-				        map.put("nbbm",list.get(0).getClZbh());
-				        map.put("line", list.get(0).getXlBm());
-		    		}
-			        
-			        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));//计划总里程
-			        
-			        //计划内外营运
-			        Map<String, Double> culateSjlcMap=culateService.culateSjlcMap(lists);
-			        double jhnlc=culateSjlcMap.get("jhnlc");
-					double jhwlc=culateSjlcMap.get("jhwlc");
-					map.put("jhnlc", jhnlc);
-					map.put("jhwlc", jhwlc);
-					double zyylc=Arith.add(jhnlc, jhwlc);
-			        
-					//计划内外进出场
-			        Map<String, Double> culateSjJcclcMap=culateService.culateSjJcclcMap(lists);
-			        double jhwjcclc=culateSjJcclcMap.get("jhwlc");
-					double jhnjcclc=culateSjJcclcMap.get("jhnlc");
-					map.put("jhwjcclc", jhwjcclc); 
-					map.put("jhnjcclc", jhnjcclc);
-					double zjcclc=Arith.add(jhwjcclc, jhnjcclc);
-					
-					//临加公里
-					Map<String, Double> culateLjMile=culateService.culateLjMile(lists);
-					double ljyy=culateLjMile.get("ljyy");
-					double ljjcc=culateLjMile.get("ljjcc");
-					double ljkfks=culateLjMile.get("ljkfks");
-					map.put("ljyy", ljyy);
-					map.put("ljjcc", ljjcc);
-					map.put("ljkfks", ljkfks);
-					
-					double ljlc=Arith.add(Arith.add(ljyy, ljjcc),ljkfks);
-					
-					double lbss=culateService.culateSsMile(list);//烂班少驶
-					map.put("lbss", lbss);
-					map.put("ssgl_lz", culateService.culateSsMileXx(list, "路阻"));
-			        map.put("ssgl_dm", culateService.culateSsMileXx(list, "吊慢"));
-			        map.put("ssgl_gz", culateService.culateSsMileXx(list, "故障"));
-			        map.put("ssgl_jf", culateService.culateSsMileXx(list, "纠纷"));
-			        map.put("ssgl_zs", culateService.culateSsMileXx(list, "肇事"));
-			        map.put("ssgl_qr", culateService.culateSsMileXx(list, "缺人"));
-			        map.put("ssgl_qc", culateService.culateSsMileXx(list, "缺车"));
-			        map.put("ssgl_kx", culateService.culateSsMileXx(list, "客稀"));
-			        map.put("ssgl_qh", culateService.culateSsMileXx(list, "气候"));
-			        map.put("ssgl_yw", culateService.culateSsMileXx(list, "援外"));
-			        map.put("ssgl_other", culateService.culateSsMileXx(list, "其他"));
-			        
-			        
-			        double zrwjcclc=culateService.culateZrwJccLc(list, "故障");
-			        double zrwjcclc1=culateService.culateZrwJccLc(list, "肇事");
-			        double zrwjcclc2=culateService.culateZrwJccLc(list, "纠纷");
-			        double zrwjcclcqt=culateService.culateZrwJccLc(list, "其他");
-			        map.put("jhwjcclc_z", Arith.add(jhwjcclc,zrwjcclcqt)); 
-			        map.put("zrwjcclc", zrwjcclc);
-			        map.put("zrwjcclc1", zrwjcclc1);
-			        map.put("zrwjcclc2", zrwjcclc2);
-			        map.put("zrwjcclcqt", zrwjcclcqt);
-			        double zrwjcc=Arith.add(Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2),zrwjcclcqt);
-			        double kfks=Arith.add(culateService.culateKfksLc(lists),culateService.culateZrwJccLc(list, "空放"));
-			        map.put("kfks", kfks);
-			        double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc), 
-			        		Arith.add(zjcclc, zyylc)),kfks);
-			        map.put("zlc", zlc);
-		    	}
-		        return map;
-		    }
-		@Override
-		public List<Map<String, Object>> countByBusList(Map<String, Object> map) {
-			// TODO Auto-generated method stub
-			SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
-			List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
-			List<Map<String, Object>> lMaps = new ArrayList<Map<String, Object>>();
-			String gsdm="";
-			if(map.get("gsdm")!=null){
-				gsdm=map.get("gsdm").toString();
-			}
-			String fgsdm="";
-			if(map.get("fgsdm")!=null){
-				fgsdm=map.get("fgsdm").toString();
-			}
-			String line="";
-			if(map.get("line")!=null){
-				line=map.get("line").toString();
-			}
-			String date="";
-			if(map.get("date")!=null){
-				date=map.get("date").toString();
-			}
-			String date2="";
-			if(map.get("date2")!=null){
-				date2=map.get("date2").toString();
-			}
-			String xlName="";
-			if(map.get("xlName")!=null){
-				xlName=map.get("xlName").toString();
-			}
-			String zt="";
-			if(map.get("zt")!=null){
-				zt=map.get("zt").toString();
-			}
-			String type="";
-			if(map.get("type")!=null){
-				type=map.get("type").toString();
-			}
-			//所有班次信息
-			 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-	        line =line.trim();
-	        if(line.equals("")){
-	            //查询所有线路
-	            list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2,gsdm,fgsdm);
-	        }else{
-	            //查询单条线路
-	            list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
-	        }
-	        String ylbSql=" select * from bsth_c_ylb where rq BETWEEN '"+date+"' and '"+date2+"'";
-		       if(line.equals("")){
-		    	   ylbSql +="and ssgsdm='"+gsdm+"' "
-							+ " and fgsdm='"+fgsdm+"'";
 				}else{
-					ylbSql += " and xlbm = '"+line+"'";
+					if(xl_bm.equals(s.getXlBm()) && nbbm.equals(s.getClZbh())
+							&& dateStr.equals(s.getScheduleDateStr())
+							&& jGh.equals(s.getjGh()) && sGh.equals(s.getsGh())){
+						lists.add(s);
+					}
+				}
+			}
+
+			if(zt.equals("zbh")){
+				Map<String, Object> newMap=staticTj(lists, "");
+				double yhl=0.0;
+				double jzl=0.0;
+				double hyl=0.0;
+				double dhl=0.0;
+				double cdl=0.0;
+				for (int j = 0; j < ylbList.size(); j++) {
+					Ylb y=ylbList.get(j);
+					if(nbbm.equals(y.getNbbm()) && xl_bm.equals(y.getXlbm())){
+						yhl=Arith.add(yhl, y.getYh());
+						jzl=Arith.add(jzl, y.getJzl());
+						hyl=Arith.add(hyl, y.getYh());
+					}
+
 				}
-		       List<Ylb> ylbList=ylbList(ylbSql);
-		       String dlbSql=" select * from bsth_c_dlb where rq BETWEEN '"+date+"' and '"+date2+"'";
-		       if(line.equals("")){
-		    	   dlbSql +="and ssgsdm='"+gsdm+"' "
-							+ " and fgsdm='"+fgsdm+"'";
+				for (int j = 0; j < dlbList.size(); j++) {
+					Dlb d=dlbList.get(j);
+					if(nbbm.equals(d.getNbbm())&&xl_bm.equals(d.getXlbm())){
+						dhl=Arith.add(dhl, d.getHd());
+						cdl=Arith.add(cdl, d.getCdl());
+					}
+				}
+				if(date.equals(date2)){
+					newMap.put("rq",date);
 				}else{
-					dlbSql += " and xlbm = '"+line+"'";
+					newMap.put("rq",date+"至"+date2);
+				}
+				newMap.put("yhl", yhl);
+				newMap.put("jzl", jzl);
+				newMap.put("hyl", hyl);
+				newMap.put("dhl", dhl);
+				newMap.put("cdl", cdl);
+				lMap.add(newMap);
+			}else{
+				Map<String, Object> newMap=staticTj(lists, "");
+				double lc=Double.parseDouble(newMap.get("zlc").toString());
+				double yhl=0.0;
+				double jzl=0.0;
+				double hyl=0.0;
+				double dhl=0.0;
+				double cdl=0.0;
+				double zlc=0.0;
+				for (int j = 0; j < ylbList.size(); j++) {
+					Ylb y=ylbList.get(j);
+					if(nbbm.equals(y.getNbbm()) && xl_bm.equals(y.getXlbm())
+							&&dateStr.equals(sdf.format(y.getRq()))
+							&&jGh.equals(y.getName())){
+						yhl=Arith.add(yhl, y.getYh());
+						jzl=Arith.add(jzl, y.getJzl());
+						hyl=Arith.add(hyl, y.getYh());
+						zlc=Arith.add(zlc, y.getZlc());
+					}
+
+				}
+
+				for (int j = 0; j < dlbList.size(); j++) {
+					Dlb d=dlbList.get(j);
+					if(nbbm.equals(d.getNbbm())&&xl_bm.equals(d.getXlbm())
+							&&dateStr.equals(sdf.format(d.getRq()))
+							&&jGh.equals(d.getName())){
+						dhl=Arith.add(dhl, d.getHd());
+						cdl=Arith.add(cdl, d.getCdl());
+						zlc=Arith.add(zlc, d.getZlc());
+					}
 				}
-		       List<Dlb> dlbList=dlbList(dlbSql);
-	        String sql="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
-	        		+ " from bsth_c_s_sp_info_real r where"
-			        + " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
+				double div=0.0;
+				if(lc>0){
+					div=Arith.div(zlc, lc,2);
+				}
+				newMap.put("yhl", yhl*div);
+				newMap.put("jzl", jzl*div);
+				newMap.put("hyl", hyl*div);
+				newMap.put("dhl", dhl*div);
+				newMap.put("cdl", cdl*div);
+				lMaps.add(newMap);
+			}
+
+		}
+		if(!zt.equals("zbh")){
+			String sqls="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh"
+					+ " from bsth_c_s_sp_info_real r where"
+					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
 			if(line.equals("")){
-				sql +="and r.gs_bm='"+gsdm+"' "
+				sqls +="and r.gs_bm='"+gsdm+"' "
 						+ " and r.fgs_bm='"+fgsdm+"'";
 			}else{
-				sql += " and r.xl_bm = '"+line+"'";
+				sqls += " and r.xl_bm = '"+line+"'";
 			}
-			sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str,r.j_gh,r.s_gh";  
-		     
-		    List<Map<String, Object>> listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
+			sqls += " group  by  r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh";
+
+			List<Map<String, Object>> listGroupBys=jdbcTemplate.query(sqls, 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("xl_bm"));
-					map.put("date", arg0.getString("schedule_date_str"));
 					map.put("nbbm", arg0.getString("cl_zbh"));
 					map.put("jGh", arg0.getString("j_gh"));
 					map.put("sGh", arg0.getString("s_gh"));
 					return map;
 				}
 			});
-			 for (int i = 0; i < listGroupBy.size(); i++) {
-				Map<String, Object> m=listGroupBy.get(i);
-				String xl_bm=m.get("line")==null?"":m.get("line").toString();
-				String dateStr=m.get("date")==null?"":m.get("date").toString();
-				String nbbm =m.get("nbbm")==null?"":m.get("nbbm").toString();
-				String jGh= m.get("jGh")==null?"":m.get("jGh").toString();
-				String sGh= m.get("sGh")==null?"":m.get("sGh").toString();
-				List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
-				for (int j = 0; j < list.size(); j++) {
-					ScheduleRealInfo s=list.get(j);
-					if(zt.equals("zbh")){
-						if(xl_bm.equals(s.getXlBm()) && nbbm.equals(s.getClZbh())){
-							lists.add(s);
-						}
-					}else{
-						if(xl_bm.equals(s.getXlBm()) && nbbm.equals(s.getClZbh()) 
-								&& dateStr.equals(s.getScheduleDateStr())
-								&& jGh.equals(s.getjGh()) && sGh.equals(s.getsGh())){
-							lists.add(s);
-						}
-					}
+			lMap=lists(listGroupBys, lMaps, gsdm, fgsdm, date, date2);
+
+		}
+		if(type.equals("export")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			m.put("date1", date2);
+			String xls="";
+			String by=map.get("by").toString();
+
+
+			if(zt.equals("zbh")){
+				if(by.equals("sj")){
+					xls="countByBus1.xls";
+				}else{
+					xls="countByBus1s.xls";
 				}
-				
-				if(zt.equals("zbh")){
-					Map<String, Object> newMap=staticTj(lists, "");
-					double yhl=0.0;
-					double jzl=0.0;
-					double hyl=0.0;
-					double dhl=0.0;
-					double cdl=0.0;
-					for (int j = 0; j < ylbList.size(); j++) {
-						Ylb y=ylbList.get(j);
-						if(nbbm.equals(y.getNbbm()) && xl_bm.equals(y.getXlbm())){
-							yhl=Arith.add(yhl, y.getYh());
-							jzl=Arith.add(jzl, y.getJzl());
-							hyl=Arith.add(hyl, y.getYh());
-						}
-						
-					}
-					for (int j = 0; j < dlbList.size(); j++) {
-						Dlb d=dlbList.get(j);
-						if(nbbm.equals(d.getNbbm())&&xl_bm.equals(d.getXlbm())){
-							dhl=Arith.add(dhl, d.getHd());
-							cdl=Arith.add(cdl, d.getCdl());
-						}
-					}
-					if(date.equals(date2)){
-						newMap.put("rq",date);
-					}else{
-						newMap.put("rq",date+"至"+date2);
-					}
-					newMap.put("yhl", yhl);
-					newMap.put("jzl", jzl);
-					newMap.put("hyl", hyl);
-					newMap.put("dhl", dhl);
-					newMap.put("cdl", cdl);
-					lMap.add(newMap);
+			}else{
+
+				if(by.equals("sj")){
+					xls="countByBus2.xls";
 				}else{
-					Map<String, Object> newMap=staticTj(lists, "");
-					double lc=Double.parseDouble(newMap.get("zlc").toString());
-					double yhl=0.0;
-					double jzl=0.0;
-					double hyl=0.0;
-					double dhl=0.0;
-					double cdl=0.0;
-					double zlc=0.0;
-					for (int j = 0; j < ylbList.size(); j++) {
-						Ylb y=ylbList.get(j);
-						if(nbbm.equals(y.getNbbm()) && xl_bm.equals(y.getXlbm())
-								&&dateStr.equals(sdf.format(y.getRq()))
-								&&jGh.equals(y.getName())){
-							yhl=Arith.add(yhl, y.getYh());
-							jzl=Arith.add(jzl, y.getJzl());
-							hyl=Arith.add(hyl, y.getYh());
-							zlc=Arith.add(zlc, y.getZlc());
-						}
-						
-					}
-				
-					for (int j = 0; j < dlbList.size(); j++) {
-						Dlb d=dlbList.get(j);
-						if(nbbm.equals(d.getNbbm())&&xl_bm.equals(d.getXlbm())
-								&&dateStr.equals(sdf.format(d.getRq()))
-								&&jGh.equals(d.getName())){
-							dhl=Arith.add(dhl, d.getHd());
-							cdl=Arith.add(cdl, d.getCdl());
-							zlc=Arith.add(zlc, d.getZlc());
-						}
-					}
-					double div=0.0;
-					if(lc>0){
-						div=Arith.div(zlc, lc,2);
-					}
-					newMap.put("yhl", yhl*div);
-					newMap.put("jzl", jzl*div);
-					newMap.put("hyl", hyl*div);
-					newMap.put("dhl", dhl*div);
-					newMap.put("cdl", cdl*div);
-					lMaps.add(newMap);
+					xls="countByBus2s.xls";
 				}
-				
-			}
-			 if(!zt.equals("zbh")){
-				 String sqls="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh"
-			        		+ " from bsth_c_s_sp_info_real r where"
-					        + " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
-					if(line.equals("")){
-						sqls +="and r.gs_bm='"+gsdm+"' "
-								+ " and r.fgs_bm='"+fgsdm+"'";
-					}else{
-						sqls += " and r.xl_bm = '"+line+"'";
-					}
-					sqls += " group  by  r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh";  
-					
-					 List<Map<String, Object>> listGroupBys=jdbcTemplate.query(sqls, 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("xl_bm"));
-								map.put("nbbm", arg0.getString("cl_zbh"));
-								map.put("jGh", arg0.getString("j_gh"));
-								map.put("sGh", arg0.getString("s_gh"));
-								return map;
-							}
-						});
-					 lMap=lists(listGroupBys, lMaps, gsdm, fgsdm, date, date2);
-					 
-			 }
-			 if(type.equals("export")){
-		    	    List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-		            Map<String, Object> m = new HashMap<String, Object>();
-		            m.put("date", date);
-		            m.put("date1", date2);
-		            String xls="";
-		            String by=map.get("by").toString();
-		            
-		           
-		            if(zt.equals("zbh")){
-		            	 if(by.equals("sj")){
-		            		 xls="countByBus1.xls";
-			             }else{
-			            	 xls="countByBus1s.xls";
-			             }
-		            }else{
-		            	
-		            	 if(by.equals("sj")){
-		            		 xls="countByBus2.xls";
-			             }else{
-			            	 xls="countByBus2s.xls";
-			             }
-		            }
-		            ReportUtils ee = new ReportUtils();
-		            try {
-		                listI.add(lMap.iterator());
-		                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-		                ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
-		                        path + "export/路单数据统计表.xls");
-		            } catch (Exception e) {
-		                // TODO: handle exception
-		                e.printStackTrace();
-		            }
-		       }
-	        
-			return lMap;
-		}
-		
-		 public final List<Ylb> ylbList(String sql){
-			 List<Ylb> ylbList= jdbcTemplate.query(sql, new RowMapper<Ylb>() {
-					@Override
-					public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
-						Ylb y = new Ylb();
-						y.setRq(arg0.getDate("rq"));
-						y.setXlbm(arg0.getString("xlbm"));
-						y.setNbbm(arg0.getString("nbbm"));
-						y.setJzl(arg0.getDouble("jzl"));
-						y.setYh(arg0.getDouble("yh"));
-						y.setSh(arg0.getDouble("sh"));
-						return y;
-					}
-				});
-			 return ylbList;
-		 }
-		 
-		 public final List<Dlb> dlbList(String sql){
-			 List<Dlb> dlbList= jdbcTemplate.query(sql, new RowMapper<Dlb>() {
-					@Override
-					public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
-						Dlb y = new Dlb();
-						y.setRq(arg0.getDate("rq"));
-						y.setXlbm(arg0.getString("xlbm"));
-						y.setNbbm(arg0.getString("nbbm"));
-						y.setCdl(arg0.getDouble("cdl"));
-						y.setHd(arg0.getDouble("hd"));
-						y.setSh(arg0.getDouble("sh"));
-						return y;
-					}
-				});
-			 return dlbList;
-		 }
-		 
-		 public final List<Map<String, Object>> lists(List<Map<String, Object>> listGb,
-				                                      List<Map<String, Object>> listLc,
-				                                      String gsdm,String fgsdm,
-				                                      String date,String date2){
-			 List<Map<String, Object>> lMap=new ArrayList<Map<String,Object>>();
-			 for (int i = 0; i < listGb.size(); i++) {
-				 Map<String, Object> m=listGb.get(i);
-				 String xl_bm=m.get("line")==null?"":m.get("line").toString();
-				 String nbbm =m.get("nbbm")==null?"":m.get("nbbm").toString();
-				 String jGh= m.get("jGh")==null?"":m.get("jGh").toString();
-				 String sGh= m.get("sGh")==null?"":m.get("sGh").toString();
-				 double jhzlc = 0.0,jhlc= 0.0,jcclc= 0.0,zlc= 0.0,jhnlc= 0.0,jhwlc= 0.0,
-				 jhnjcclc= 0.0,jhwjcclc= 0.0,jhwjcclc_z=0.0,zrwjcclc= 0.0,zrwjcclc1= 0.0,zrwjcclc2= 0.0,
-						 zrwjcclcqt=0.0,lbss= 0.0,ssgl_lz= 0.0,
-				 ssgl_dm= 0.0,ssgl_gz= 0.0,ssgl_jf= 0.0,ssgl_zs= 0.0,ssgl_qr= 0.0,ssgl_qc= 0.0,
-				 ssgl_kx= 0.0,ssgl_qh= 0.0,ssgl_yw= 0.0,ssgl_other= 0.0,ljyy=0.0,ljjcc=0.0,
+			}
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(lMap.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
+						path + "export/路单数据统计表.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+
+		return lMap;
+	}
+
+	public final List<Ylb> ylbList(String sql){
+		List<Ylb> ylbList= jdbcTemplate.query(sql, new RowMapper<Ylb>() {
+			@Override
+			public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Ylb y = new Ylb();
+				y.setRq(arg0.getDate("rq"));
+				y.setXlbm(arg0.getString("xlbm"));
+				y.setNbbm(arg0.getString("nbbm"));
+				y.setJzl(arg0.getDouble("jzl"));
+				y.setYh(arg0.getDouble("yh"));
+				y.setSh(arg0.getDouble("sh"));
+				return y;
+			}
+		});
+		return ylbList;
+	}
+
+	public final List<Dlb> dlbList(String sql){
+		List<Dlb> dlbList= jdbcTemplate.query(sql, new RowMapper<Dlb>() {
+			@Override
+			public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Dlb y = new Dlb();
+				y.setRq(arg0.getDate("rq"));
+				y.setXlbm(arg0.getString("xlbm"));
+				y.setNbbm(arg0.getString("nbbm"));
+				y.setCdl(arg0.getDouble("cdl"));
+				y.setHd(arg0.getDouble("hd"));
+				y.setSh(arg0.getDouble("sh"));
+				return y;
+			}
+		});
+		return dlbList;
+	}
+
+	public final List<Map<String, Object>> lists(List<Map<String, Object>> listGb,
+												 List<Map<String, Object>> listLc,
+												 String gsdm,String fgsdm,
+												 String date,String date2){
+		List<Map<String, Object>> lMap=new ArrayList<Map<String,Object>>();
+		for (int i = 0; i < listGb.size(); i++) {
+			Map<String, Object> m=listGb.get(i);
+			String xl_bm=m.get("line")==null?"":m.get("line").toString();
+			String nbbm =m.get("nbbm")==null?"":m.get("nbbm").toString();
+			String jGh= m.get("jGh")==null?"":m.get("jGh").toString();
+			String sGh= m.get("sGh")==null?"":m.get("sGh").toString();
+			double jhzlc = 0.0,jhlc= 0.0,jcclc= 0.0,zlc= 0.0,jhnlc= 0.0,jhwlc= 0.0,
+					jhnjcclc= 0.0,jhwjcclc= 0.0,jhwjcclc_z=0.0,zrwjcclc= 0.0,zrwjcclc1= 0.0,zrwjcclc2= 0.0,
+					zrwjcclcqt=0.0,lbss= 0.0,ssgl_lz= 0.0,
+					ssgl_dm= 0.0,ssgl_gz= 0.0,ssgl_jf= 0.0,ssgl_zs= 0.0,ssgl_qr= 0.0,ssgl_qc= 0.0,
+					ssgl_kx= 0.0,ssgl_qh= 0.0,ssgl_yw= 0.0,ssgl_other= 0.0,ljyy=0.0,ljjcc=0.0,
 					kfks=0.0,yhl=0.0,jzl=0.0,hyl=0.0,dhl=0.0,cdl=0.0;
-				 
-				 for (int j = 0; j < listLc.size(); j++) {
-					 Map<String, Object> map=listLc.get(j);
-			         if(xl_bm.equals(map.get("line").toString())
-			    		   && nbbm.equals(map.get("nbbm").toString())
-			    		   && sGh.equals(map.get("sGh")==null?"":map.get("sGh").toString())
-			    		   && jGh.equals(map.get("jGh").toString())){
-			        	 jhzlc=Arith.add(jhzlc, map.get("jhzlc"));
-			        	 jhlc =Arith.add(jhlc, map.get("jhlc"));
-			        	 jcclc=Arith.add(jcclc, map.get("jcclc"));
-			        	 zlc=Arith.add(zlc, map.get("zlc"));
-			        	 jhnlc=Arith.add(jhnlc, map.get("jhnlc"));
-			        	 jhwlc=Arith.add(jhwlc, map.get("jhwlc"));
-			        	 jhnjcclc=Arith.add(jhnjcclc, map.get("jhnjcclc"));
-			        	 jhwjcclc=Arith.add(jhwjcclc, map.get("jhwjcclc"));
-			        	 jhwjcclc_z=Arith.add(jhwjcclc_z,  map.get("jhwjcclc_z"));
-			        	 zrwjcclc=Arith.add(zrwjcclc, map.get("zrwjcclc"));
-			        	 zrwjcclc1=Arith.add(zrwjcclc1, map.get("zrwjcclc1"));
-			        	 zrwjcclc2=Arith.add(zrwjcclc2, map.get("zrwjcclc2"));
-			        	 zrwjcclcqt=Arith.add(zrwjcclcqt, map.get("zrwjcclcqt"));
-			        	 lbss=Arith.add(lbss, map.get("lbss"));
-			        	 ssgl_lz=Arith.add(ssgl_lz, map.get("ssgl_lz"));
-			        	 ssgl_dm=Arith.add(ssgl_dm, map.get("ssgl_dm"));
-			        	 ssgl_gz=Arith.add(ssgl_gz, map.get("ssgl_gz"));
-			        	 ssgl_jf=Arith.add(ssgl_jf, map.get("ssgl_jf"));
-			        	 ssgl_zs=Arith.add(ssgl_zs, map.get("ssgl_zs"));
-			        	 ssgl_qr=Arith.add(ssgl_qr, map.get("ssgl_qr"));
-			        	 ssgl_qc=Arith.add(ssgl_qc, map.get("ssgl_qc"));
-			        	 ssgl_kx=Arith.add(ssgl_kx, map.get("ssgl_kx"));
-			        	 ssgl_qh=Arith.add(ssgl_qh, map.get("ssgl_qh"));
-			        	 ssgl_yw=Arith.add(ssgl_yw, map.get("ssgl_yw"));
-			        	 ssgl_other=Arith.add(ssgl_other, map.get("ssgl_other"));
-			        	 kfks=Arith.add(kfks, map.get("kfks"));
-			        	 ljyy=Arith.add(ljyy, map.get("ljyy"));
-			        	 ljjcc=Arith.add(ljjcc, map.get("ljjcc"));
-			        	 yhl=Arith.add(yhl, map.get("yhl"));
-			        	 jzl=Arith.add(jzl, map.get("jzl"));
-			        	 hyl=Arith.add(hyl, map.get("hyl"));
-			        	 dhl=Arith.add(dhl, map.get("dhl"));
-			        	 cdl=Arith.add(cdl, map.get("cdl"));
-			        	
-			        	 
-			         }
-				 }
-				 
-				 Map<String, Object> newMap=new HashMap<String,Object>();
-				 if(date.equals(date2)){
-					 newMap.put("rq", date);
-				 }else{
-					 newMap.put("rq", date+"至"+date2);
-				 }
-				 newMap.put("fgs", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
-				 newMap.put("xlName", BasicData.lineCode2NameMap.get(xl_bm));
-				 newMap.put("jGh", jGh);
-				 newMap.put("jName", jGh);
-				 newMap.put("sGh",sGh);
-				 newMap.put("sName", sGh);
-				 newMap.put("nbbm", nbbm);
-				 newMap.put("jhzlc", jhzlc);
-	        	 newMap.put("jhlc", jhlc);
-	        	 newMap.put("jcclc", jcclc);
-	        	 newMap.put("zlc", zlc);
-	        	 newMap.put("jhnlc", jhnlc);
-	        	 newMap.put("jhwlc", jhwlc);
-	        	 newMap.put("jhnjcclc", jhnjcclc);
-	        	 newMap.put("jhwjcclc", jhwjcclc);
-	        	 newMap.put("jhwjcclc_z", jhwjcclc_z);
-	        	 newMap.put("zrwjcclc", zrwjcclc);
-	        	 newMap.put("zrwjcclc1", zrwjcclc1);
-	        	 newMap.put("zrwjcclc2", zrwjcclc2);
-	        	 newMap.put("zrwjcclcqt", zrwjcclcqt);
-	        	 newMap.put("lbss", lbss);
-	        	 newMap.put("ssgl_lz", ssgl_lz);
-	        	 newMap.put("ssgl_dm",ssgl_dm);
-	        	 newMap.put("ssgl_gz", ssgl_gz);
-	        	 newMap.put("ssgl_jf", ssgl_jf);
-	        	 newMap.put("ssgl_zs", ssgl_zs);
-	        	 newMap.put("ssgl_qr", ssgl_qr);
-	        	 newMap.put("ssgl_qc", ssgl_qc);
-	        	 newMap.put("ssgl_kx", ssgl_kx);
-	        	 newMap.put("ssgl_qh", ssgl_qh);
-	        	 newMap.put("ssgl_yw", ssgl_yw);
-	        	 newMap.put("ssgl_other", ssgl_other);
-	        	 newMap.put("kfks", kfks);
-	        	 newMap.put("ljyy", ljyy);
-	        	 newMap.put("ljjcc", ljjcc);
-	        	 newMap.put("yhl", yhl);
-				 newMap.put("jzl", jzl);
-				 newMap.put("hyl", hyl);
-				 newMap.put("dhl", dhl);
-				 newMap.put("cdl", cdl);
-				 lMap.add(newMap);
-			}
-			 return lMap;
-		 }
-		@Override
-		public List<Map<String, Object>> countDjg(Map<String, Object> map) {
-			// TODO Auto-generated method stub
-			 List<Map<String, Object>> lMap=new ArrayList<Map<String,Object>>();
-			String line=map.get("line").toString().trim();
-			String date=map.get("date").toString();
-			String gsbm=map.get("gsbm").toString();
-			String fgsbm=map.get("fgsbm").toString();
-			String type=map.get("type").toString();
-			List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
-			if(line.equals("")){
-				list=scheduleRealInfoRepository.scheduleByDateAndLineByGs(gsbm, fgsbm, date);
-				
-			}else{
-				list=scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+
+			for (int j = 0; j < listLc.size(); j++) {
+				Map<String, Object> map=listLc.get(j);
+				if(xl_bm.equals(map.get("line").toString())
+						&& nbbm.equals(map.get("nbbm").toString())
+						&& sGh.equals(map.get("sGh")==null?"":map.get("sGh").toString())
+						&& jGh.equals(map.get("jGh").toString())){
+					jhzlc=Arith.add(jhzlc, map.get("jhzlc"));
+					jhlc =Arith.add(jhlc, map.get("jhlc"));
+					jcclc=Arith.add(jcclc, map.get("jcclc"));
+					zlc=Arith.add(zlc, map.get("zlc"));
+					jhnlc=Arith.add(jhnlc, map.get("jhnlc"));
+					jhwlc=Arith.add(jhwlc, map.get("jhwlc"));
+					jhnjcclc=Arith.add(jhnjcclc, map.get("jhnjcclc"));
+					jhwjcclc=Arith.add(jhwjcclc, map.get("jhwjcclc"));
+					jhwjcclc_z=Arith.add(jhwjcclc_z,  map.get("jhwjcclc_z"));
+					zrwjcclc=Arith.add(zrwjcclc, map.get("zrwjcclc"));
+					zrwjcclc1=Arith.add(zrwjcclc1, map.get("zrwjcclc1"));
+					zrwjcclc2=Arith.add(zrwjcclc2, map.get("zrwjcclc2"));
+					zrwjcclcqt=Arith.add(zrwjcclcqt, map.get("zrwjcclcqt"));
+					lbss=Arith.add(lbss, map.get("lbss"));
+					ssgl_lz=Arith.add(ssgl_lz, map.get("ssgl_lz"));
+					ssgl_dm=Arith.add(ssgl_dm, map.get("ssgl_dm"));
+					ssgl_gz=Arith.add(ssgl_gz, map.get("ssgl_gz"));
+					ssgl_jf=Arith.add(ssgl_jf, map.get("ssgl_jf"));
+					ssgl_zs=Arith.add(ssgl_zs, map.get("ssgl_zs"));
+					ssgl_qr=Arith.add(ssgl_qr, map.get("ssgl_qr"));
+					ssgl_qc=Arith.add(ssgl_qc, map.get("ssgl_qc"));
+					ssgl_kx=Arith.add(ssgl_kx, map.get("ssgl_kx"));
+					ssgl_qh=Arith.add(ssgl_qh, map.get("ssgl_qh"));
+					ssgl_yw=Arith.add(ssgl_yw, map.get("ssgl_yw"));
+					ssgl_other=Arith.add(ssgl_other, map.get("ssgl_other"));
+					kfks=Arith.add(kfks, map.get("kfks"));
+					ljyy=Arith.add(ljyy, map.get("ljyy"));
+					ljjcc=Arith.add(ljjcc, map.get("ljjcc"));
+					yhl=Arith.add(yhl, map.get("yhl"));
+					jzl=Arith.add(jzl, map.get("jzl"));
+					hyl=Arith.add(hyl, map.get("hyl"));
+					dhl=Arith.add(dhl, map.get("dhl"));
+					cdl=Arith.add(cdl, map.get("cdl"));
+
+
+				}
 			}
-			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+			Map<String, Object> newMap=new HashMap<String,Object>();
+			if(date.equals(date2)){
+				newMap.put("rq", date);
+			}else{
+				newMap.put("rq", date+"至"+date2);
+			}
+			newMap.put("fgs", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+			newMap.put("xlName", BasicData.lineCode2NameMap.get(xl_bm));
+			newMap.put("jGh", jGh);
+			newMap.put("jName", jGh);
+			newMap.put("sGh",sGh);
+			newMap.put("sName", sGh);
+			newMap.put("nbbm", nbbm);
+			newMap.put("jhzlc", jhzlc);
+			newMap.put("jhlc", jhlc);
+			newMap.put("jcclc", jcclc);
+			newMap.put("zlc", zlc);
+			newMap.put("jhnlc", jhnlc);
+			newMap.put("jhwlc", jhwlc);
+			newMap.put("jhnjcclc", jhnjcclc);
+			newMap.put("jhwjcclc", jhwjcclc);
+			newMap.put("jhwjcclc_z", jhwjcclc_z);
+			newMap.put("zrwjcclc", zrwjcclc);
+			newMap.put("zrwjcclc1", zrwjcclc1);
+			newMap.put("zrwjcclc2", zrwjcclc2);
+			newMap.put("zrwjcclcqt", zrwjcclcqt);
+			newMap.put("lbss", lbss);
+			newMap.put("ssgl_lz", ssgl_lz);
+			newMap.put("ssgl_dm",ssgl_dm);
+			newMap.put("ssgl_gz", ssgl_gz);
+			newMap.put("ssgl_jf", ssgl_jf);
+			newMap.put("ssgl_zs", ssgl_zs);
+			newMap.put("ssgl_qr", ssgl_qr);
+			newMap.put("ssgl_qc", ssgl_qc);
+			newMap.put("ssgl_kx", ssgl_kx);
+			newMap.put("ssgl_qh", ssgl_qh);
+			newMap.put("ssgl_yw", ssgl_yw);
+			newMap.put("ssgl_other", ssgl_other);
+			newMap.put("kfks", kfks);
+			newMap.put("ljyy", ljyy);
+			newMap.put("ljjcc", ljjcc);
+			newMap.put("yhl", yhl);
+			newMap.put("jzl", jzl);
+			newMap.put("hyl", hyl);
+			newMap.put("dhl", dhl);
+			newMap.put("cdl", cdl);
+			lMap.add(newMap);
+		}
+		return lMap;
+	}
+	@Override
+	public List<Map<String, Object>> countDjg(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>> lMap=new ArrayList<Map<String,Object>>();
+		String line=map.get("line").toString().trim();
+		String date=map.get("date").toString();
+		String gsbm=map.get("gsbm").toString();
+		String fgsbm=map.get("fgsbm").toString();
+		String type=map.get("type").toString();
+		List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
+		if(line.equals("")){
+			list=scheduleRealInfoRepository.scheduleByDateAndLineByGs(gsbm, fgsbm, date);
+
+		}else{
+			list=scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+		}
+		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 ";
- 			 if(line.equals("")){
- 				xlSql +=" where company ='"+gsbm+"'";
- 			 }else{
- 				xlSql +=" 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;
+		//查询所有线路
+		String xlSql="select line_code,spac_grade from bsth_c_line ";
+		if(line.equals("")){
+			xlSql +=" where company ='"+gsbm+"'";
+		}else{
+			xlSql +=" 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;
 				}
-			});
- 			
- 			 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> list_=new ArrayList<ScheduleRealInfo>();
- 				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)){
-							list_.add(sinfo);
-							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);
-							}
-							
+			}
+			List<ScheduleRealInfo> list_=new ArrayList<ScheduleRealInfo>();
+			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)){
+						list_.add(sinfo);
+						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){
- 					 int sjbcs=culateService.culateSjbc(list_, "")+culateService.culateLjbc(list_, "");
- 					 Map<String, Object> m=listDjg(gsbm,fgsbm,lineCode,sjbcs,peak,trough,listInfo,grade);
- 					 lMap.add(m);
- 				 }
- 				 
-			}
- 			 if(type.equals("export")){
-		    	    List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-		            Map<String, Object> m = new HashMap<String, Object>();
-		            m.put("date", date);
-		            ReportUtils ee = new ReportUtils();
-		            try {
-		                listI.add(lMap.iterator());
-		                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-		                ee.excelReplace(listI, new Object[]{m}, path + "mould/countInterval.xls",
-		                        path + "export/大间隔统计表.xls");
-		            } catch (Exception e) {
-		                // TODO: handle exception
-		                e.printStackTrace();
-		            }
-		       }
-			return lMap;
-		}
-		 
-		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;
-								}
-								
-			       	    	}
-						}
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
 			}
-			return s;
-		}
-		
-		public Map<String, Object> listDjg(String gsdm,String fgsdm,String line,int sjbcs,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>();
-			map.put("line", line);
-			map.put("xlName", BasicData.lineCode2NameMap.get(line));
-			map.put("fgsname", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
-			map.put("bcs", sjbcs);
-			map.put("djgde", grade);
-			int djgcs=0;
-			List<Map<String, Object>> mapList=new ArrayList<Map<String, Object>>();
-			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)||(fcsj>=wgf1&&fcsj<=wgf2)){
-						djg = (long) (peak*60*1000);
-						if(fscjNext-fcsjTime>djg){
-							djgcs ++;
-							Map<String, Object> m=new HashMap<String,Object>();
-							m.put("xlName", BasicData.lineCode2NameMap.get(line));
-							m.put("fgsname", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
-							m.put("djgde", grade);
-							m.put("qJh", s.getFcsj());
-							m.put("qSj", time);
-							m.put("hJh", listInfo.get(i+1).getFcsj());
-							m.put("hSj", listInfo.get(i+1).getFcsjActual());
-							m.put("djgsj", peak);
-							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
-							mapList.add(m);
-						}
-					}else{
-						djg = (long) (trough*60*1000);
-						if(fscjNext-fcsjTime>djg){
-							djgcs ++;
-							Map<String, Object> m=new HashMap<String,Object>();
-							m.put("xlName", BasicData.lineCode2NameMap.get(line));
-							m.put("fgsname", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
-							m.put("djgde", grade);
-							m.put("qJh", s.getFcsj());
-							m.put("qSj", time);
-							m.put("hJh", listInfo.get(i+1).getFcsj());
-							m.put("hSj", listInfo.get(i+1).getFcsjActual());
-							m.put("djgsj", trough);
-							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
-							mapList.add(m);
+
+			if(listInfo.size()>0){
+				int sjbcs=culateService.culateSjbc(list_, "")+culateService.culateLjbc(list_, "");
+				Map<String, Object> m=listDjg(gsbm,fgsbm,lineCode,sjbcs,peak,trough,listInfo,grade);
+				lMap.add(m);
+			}
+
+		}
+		if(type.equals("export")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(lMap.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/countInterval.xls",
+						path + "export/大间隔统计表.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		return lMap;
+	}
+
+	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;
 						}
+
 					}
 				}
 			}
-			
-			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)||(fcsj>=wgf1&&fcsj<=wgf2)){
-						djg = (long) (peak*60*1000);
-						if(fscjNext-fcsjTime>djg){
-							djgcs ++;
-							Map<String, Object> m=new HashMap<String,Object>();
-							m.put("xlName", BasicData.lineCode2NameMap.get(line));
-							m.put("fgsname", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
-							m.put("djgde", grade);
-							m.put("qJh", s.getFcsj());
-							m.put("qSj", time);
-							m.put("hJh", listInfo.get(i+1).getFcsj());
-							m.put("hSj", listInfo.get(i+1).getFcsjActual());
-							m.put("djgsj", peak);
-							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
-							mapList.add(m);
-						}
-					}else{
-						djg = (long) (trough*60*1000);
-						if(fscjNext-fcsjTime>djg){
-							djgcs ++;
-							Map<String, Object> m=new HashMap<String,Object>();
-							m.put("xlName", BasicData.lineCode2NameMap.get(line));
-							m.put("fgsname", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
-							m.put("djgde", grade);
-							m.put("qJh", s.getFcsj());
-							m.put("qSj", time);
-							m.put("hJh", listInfo.get(i+1).getFcsj());
-							m.put("hSj", listInfo.get(i+1).getFcsjActual());
-							m.put("djgsj", trough);
-							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
-							mapList.add(m);
-						}
+		}
+		return s;
+	}
+
+	public Map<String, Object> listDjg(String gsdm,String fgsdm,String line,int sjbcs,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>();
+		map.put("line", line);
+		map.put("xlName", BasicData.lineCode2NameMap.get(line));
+		map.put("fgsname", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+		map.put("bcs", sjbcs);
+		map.put("djgde", grade);
+		int djgcs=0;
+		List<Map<String, Object>> mapList=new ArrayList<Map<String, Object>>();
+		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)||(fcsj>=wgf1&&fcsj<=wgf2)){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcs ++;
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("xlName", BasicData.lineCode2NameMap.get(line));
+						m.put("fgsname", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+						m.put("djgde", grade);
+						m.put("qJh", s.getFcsj());
+						m.put("qSj", time);
+						m.put("hJh", listInfo.get(i+1).getFcsj());
+						m.put("hSj", listInfo.get(i+1).getFcsjActual());
+						m.put("djgsj", peak);
+						m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
+						mapList.add(m);
+					}
+				}else{
+					djg = (long) (trough*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcs ++;
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("xlName", BasicData.lineCode2NameMap.get(line));
+						m.put("fgsname", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+						m.put("djgde", grade);
+						m.put("qJh", s.getFcsj());
+						m.put("qSj", time);
+						m.put("hJh", listInfo.get(i+1).getFcsj());
+						m.put("hSj", listInfo.get(i+1).getFcsjActual());
+						m.put("djgsj", trough);
+						m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
+						mapList.add(m);
 					}
 				}
 			}
-			double fsl=0.0;
-			if(sjbcs>0){
-				fsl=Arith.div(djgcs,sjbcs, 2)*100;
+		}
+
+		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)||(fcsj>=wgf1&&fcsj<=wgf2)){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcs ++;
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("xlName", BasicData.lineCode2NameMap.get(line));
+						m.put("fgsname", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+						m.put("djgde", grade);
+						m.put("qJh", s.getFcsj());
+						m.put("qSj", time);
+						m.put("hJh", listInfo.get(i+1).getFcsj());
+						m.put("hSj", listInfo.get(i+1).getFcsjActual());
+						m.put("djgsj", peak);
+						m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
+						mapList.add(m);
+					}
+				}else{
+					djg = (long) (trough*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcs ++;
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("xlName", BasicData.lineCode2NameMap.get(line));
+						m.put("fgsname", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+						m.put("djgde", grade);
+						m.put("qJh", s.getFcsj());
+						m.put("qSj", time);
+						m.put("hJh", listInfo.get(i+1).getFcsj());
+						m.put("hSj", listInfo.get(i+1).getFcsjActual());
+						m.put("djgsj", trough);
+						m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
+						mapList.add(m);
+					}
+				}
 			}
-			
-			map.put("djgcs", djgcs);
-			map.put("fsl", df.format(fsl)+"%");
-			map.put("djgxx", mapList);
-			return map;
 		}
-		
+		double fsl=0.0;
+		if(sjbcs>0){
+			fsl=Arith.div(djgcs,sjbcs, 2)*100;
+		}
+
+		map.put("djgcs", djgcs);
+		map.put("fsl", df.format(fsl)+"%");
+		map.put("djgxx", mapList);
+		return map;
+	}
+
 }
 class ComparableAcuals implements Comparator<ScheduleRealInfo>{
@@ -3238,4 +3238,4 @@ class ComparableAcuals implements Comparator&lt;ScheduleRealInfo&gt;{
 		return o1.getFcsjActualTime().compareTo(o2.getFcsjActualTime());
 	}
-}
+}
 \ No newline at end of file
@@ -124,7 +124,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                     // poi读
                     String cellContent = PoiUtils.getStringValueFromCell(
                             poi_sheet.getRow(i).getCell(j)
-                    );
+                    ).replaceAll("\\s*", "");
                     // jxl写
                     sheet1.addCell(new Label(j, i, cellContent));
                 }
@@ -278,6 +278,9 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         Date start2 = new Date();
         ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan, lpInfoResults_output);
         Date end2 = new Date();
+
+        logger.info("规则计算结果={}", scheduleResults_output.showGuideboardDesc1());
+
         // 3、计划输出
         Date start3 = new Date();
         PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
@@ -433,7 +436,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         Line xl = lineRepository.findOne(schedulePlan.getXl().getId());
         logger.info("<--- 排班master线路 id={}, name={}, 开始排班", xl.getId(), xl.getName());
-        // 2、确定主线路排班（无套跑规则）
+        // 2、确定主线路排班（包含完全套跑路牌规则，所谓完全套跑路牌规则指整个路牌的班次都是套跑规则指定的）
         PlanResult planResult = schedulePlanWithOutRerun(schedulePlan);
         // 3、确定套跑规则
@@ -442,6 +445,15 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // TODO：3-1、验证排班结果
         validPlanResult(planResult, schedulePlan);
+        // TODO：3-2、去除完全套跑遗漏班次（以后放到规则中执行）
+        Iterator<SchedulePlanInfo> infoIterator = planResult.getSchedulePlanInfos().iterator();
+        while (infoIterator.hasNext()) {
+            SchedulePlanInfo schedulePlanInfo = infoIterator.next();
+            if (schedulePlanInfo.getCl() == null) {
+                infoIterator.remove();
+            }
+        }
+
         // 4、保存数据（jdbcTemplate 批量插入）
         Date start4 = new Date();
         scheduleRuleService.generateSchedulePlan(schedulePlan, planResult.getSchedulePlanInfos());
@@ -251,7 +251,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                     for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
                         Row row = sheet.getRow(i);
                         for (int j = 1; j < colNums; j++) { // 从第2列开始
-                            String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))); // trimToEmpty
+                            String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))).replaceAll("\\s*", ""); // trimToEmpty
                             if (StringUtils.isNotEmpty(bcell_con)) {
                                 Matcher m1 = p1.matcher(bcell_con.trim());
                                 Matcher m2 = p2.matcher(bcell_con.trim());
@@ -44,7 +44,7 @@ public class TTInfo_input implements Comparable&lt;TTInfo_input&gt; {
         this.ttInfoId = String.valueOf(ttInfo.getId());
         this.xlId = String.valueOf(ttInfo.getXl().getId());
         String[] days = ttInfo.getRule_days().split(",");
-        System.out.println(days.length);
+//        System.out.println(days.length);
         for (int i = 0; i < 7; i++) {
             if ("1".equals(days[i])) {
                 weekdays.add(true);
@@ -47,14 +47,14 @@ public class ValidRepeatBcFunction implements AccumulateFunction {
     @Override
     public Serializable createContext() {
-        System.out.println("create");
+//        System.out.println("create");
         return new RepeatBcInfo();
     }
     @Override
     public void init(Serializable serializable) throws Exception {
         // TODO：
-        System.out.println("init");
+//        System.out.println("init");
     }
     @Override
+package com.bsth.service.schedule.rules.validate;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 验证完全套跑路牌班次正确性。
+ * 完全套跑路牌班次指此路牌下的所有班次由其他线路完成。
+ * 记录漏掉的班次，并给出警告信息。
+ */
+public class ValidWholeRerunBcFunction implements AccumulateFunction {
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+    }
+
+    protected static class RerunBcInfo implements Externalizable {
+        /** 错误描述 */
+        public List<ValidateResults_output.ValidInfo> validInfoList = new ArrayList<>();
+        /** 内部计数Map，key：{路牌Id}_{发车时间}，value：个数 */
+        public Map<String, Integer> lpBcFcsjCount = new HashMap<>();
+
+        public RerunBcInfo() {
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(validInfoList);
+        }
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            validInfoList = (List<ValidateResults_output.ValidInfo>) in.readObject();
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+//        System.out.println("create");
+        return new RerunBcInfo();
+    }
+
+    @Override
+    public void init(Serializable serializable) throws Exception {
+        // TODO：
+//        System.out.println("init");
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object o) {
+        RerunBcInfo rerunBcInfo = (RerunBcInfo) context;
+        SchedulePlanInfo schedulePlanInfo = (SchedulePlanInfo) o;
+
+        String key = schedulePlanInfo.getLp() + "_" + schedulePlanInfo.getFcsj();
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy年MM月dd日");
+        String infoformat = "日期(%s),路牌(%s)完全套跑,班次(%s),在套跑规则中未指定";
+
+        if (schedulePlanInfo.getCl() == null) {
+            rerunBcInfo.lpBcFcsjCount.put(key, 1);
+
+            ValidateResults_output.ValidInfo validInfo = new ValidateResults_output.ValidInfo();
+            validInfo.setSd(schedulePlanInfo.getScheduleDate());
+            validInfo.setDesc(String.format(
+                    infoformat,
+                    sf.format(schedulePlanInfo.getScheduleDate()),
+                    schedulePlanInfo.getLpName(),
+                    schedulePlanInfo.getFcsj(),
+                    1));
+
+            rerunBcInfo.validInfoList.add(validInfo);
+        }
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return true;
+    }
+
+    @Override
+    public void reverse(Serializable context, Object o) throws Exception {
+        RerunBcInfo rerunBcInfo = (RerunBcInfo) context;
+        SchedulePlanInfo schedulePlanInfo = (SchedulePlanInfo) o;
+
+        String key = schedulePlanInfo.getLp() + "_" + schedulePlanInfo.getFcsj();
+        rerunBcInfo.lpBcFcsjCount.remove(key);
+
+        if (!rerunBcInfo.validInfoList.isEmpty()) { // 全部清空
+            rerunBcInfo.validInfoList.clear();
+        }
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return List.class;
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        RerunBcInfo rerunBcInfo = (RerunBcInfo) context;
+        return rerunBcInfo.validInfoList;
+    }
+}
@@ -828,7 +828,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;if &#x28;qdzname &#x21;&#x3d; &#x22;&#x51fa;&#x573a;&#x22; &#x26;&#x26; qdzname &#x21;&#x3d; &#x22;&#x8fdb;&#x573a;&#x22;&#x29; &#x7b;&#xa;	qdzname &#x3d; qdzname &#x2b; &#x22;&#x25;&#x22;&#x3b; &#x2f;&#x2f; &#x6a21;&#x7cca;&#x5339;&#x914d;&#x6807;&#x8bc6;&#x7b26;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5168;&#x90e8;&#x4fee;&#x6b63;&#x5b8c;&#x6bd5;&#x540e;&#xff0c;&#x5982;&#x679c;&#x957f;&#x5ea6;&#x4e0d;&#x662f;5&#xff0c;&#x524d;&#x9762;&#x8865;0&#xa;if &#x28;sendtime_calcu.length &#x21;&#x3d; 5&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;if &#x28;qdzname &#x21;&#x3d; &#x22;&#x51fa;&#x573a;&#x22; &#x26;&#x26; qdzname &#x21;&#x3d; &#x22;&#x8fdb;&#x573a;&#x22;&#x29; &#x7b;&#xa;	qdzname &#x3d; qdzname &#x2b; &#x22;&#x25;&#x22;&#x3b; &#x2f;&#x2f; &#x6a21;&#x7cca;&#x5339;&#x914d;&#x6807;&#x8bc6;&#x7b26;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu &#x3d; sendtime.replace&#x28;&#x2f;&#x5c;s&#x2f;g, &#x22;&#x22;&#x29;&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5168;&#x90e8;&#x4fee;&#x6b63;&#x5b8c;&#x6bd5;&#x540e;&#xff0c;&#x5982;&#x679c;&#x957f;&#x5ea6;&#x4e0d;&#x662f;5&#xff0c;&#x524d;&#x9762;&#x8865;0&#xa;if &#x28;sendtime_calcu.length &#x21;&#x3d; 5&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
         <rename>qdzname</rename>
         <type>String</type>
@@ -3052,4 +3052,4 @@
 </slave-step-copy-partition-distribution>
    <slave_transformation>N</slave_transformation>
-</transformation>
+</transformation>
 \ No newline at end of file
@@ -828,7 +828,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;if &#x28;qdzname &#x21;&#x3d; &#x22;&#x51fa;&#x573a;&#x22; &#x26;&#x26; qdzname &#x21;&#x3d; &#x22;&#x8fdb;&#x573a;&#x22;&#x29; &#x7b;&#xa;	qdzname &#x3d; qdzname &#x2b; &#x22;&#x25;&#x22;&#x3b; &#x2f;&#x2f; &#x6a21;&#x7cca;&#x5339;&#x914d;&#x6807;&#x8bc6;&#x7b26;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5168;&#x90e8;&#x4fee;&#x6b63;&#x5b8c;&#x6bd5;&#x540e;&#xff0c;&#x5982;&#x679c;&#x957f;&#x5ea6;&#x4e0d;&#x662f;5&#xff0c;&#x524d;&#x9762;&#x8865;0&#xa;if &#x28;sendtime_calcu.length &#x21;&#x3d; 5&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;if &#x28;qdzname &#x21;&#x3d; &#x22;&#x51fa;&#x573a;&#x22; &#x26;&#x26; qdzname &#x21;&#x3d; &#x22;&#x8fdb;&#x573a;&#x22;&#x29; &#x7b;&#xa;	qdzname &#x3d; qdzname &#x2b; &#x22;&#x25;&#x22;&#x3b; &#x2f;&#x2f; &#x6a21;&#x7cca;&#x5339;&#x914d;&#x6807;&#x8bc6;&#x7b26;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu &#x3d; sendtime.replace&#x28;&#x2f;&#x5c;s&#x2f;g, &#x22;&#x22;&#x29;&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5168;&#x90e8;&#x4fee;&#x6b63;&#x5b8c;&#x6bd5;&#x540e;&#xff0c;&#x5982;&#x679c;&#x957f;&#x5ea6;&#x4e0d;&#x662f;5&#xff0c;&#x524d;&#x9762;&#x8865;0&#xa;if &#x28;sendtime_calcu.length &#x21;&#x3d; 5&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
         <rename>qdzname</rename>
         <type>String</type>
@@ -3052,4 +3052,4 @@
 </slave-step-copy-partition-distribution>
    <slave_transformation>N</slave_transformation>
-</transformation>
+</transformation>
 \ No newline at end of file
@@ -26,7 +26,7 @@
         </parameter>
         <parameter>
             <name>injectktrfile</name>
-            <default_value>&#x2f;Users&#x2f;xu&#x2f;resource&#x2f;project_code&#x2f;bsth_project&#x2f;bsth_control&#x2f;src&#x2f;main&#x2f;resources&#x2f;datatools&#x2f;ktrs&#x2f;ttinfodetailDataInput.ktr</default_value>
+            <default_value>&#x2f;Users&#x2f;xu&#x2f;resource&#x2f;project_code&#x2f;bsth_project&#x2f;bsth_control_parent&#x2f;bsth_control&#x2f;src&#x2f;main&#x2f;resources&#x2f;datatools&#x2f;ktrs&#x2f;ttinfodetailDataInput.ktr</default_value>
             <description>&#x6ce8;&#x5165;&#x5143;&#x6570;&#x636e;&#x7684;ktr&#x6587;&#x4ef6;</description>
         </parameter>
         <parameter>
@@ -422,15 +422,15 @@
         <source_step>&#x589e;&#x52a0;normalize&#x5143;&#x6570;&#x636e;</source_step>
         <source_field>nfieldname</source_field>
       </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
-        <target_attribute_key>LENGTH</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
-        <source_field>length</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
         <target_attribute_key>SHEET_NAME</target_attribute_key>
         <target_detail>Y</target_detail>
         <source_step>&#x83b7;&#x53d6;excel&#x6587;&#x4ef6;&#x540d;</source_step>
         <source_field>sheetname_</source_field>
+      </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
+        <target_attribute_key>LENGTH</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
+        <source_field>length</source_field>
       </mapping>      <mapping>        <target_step_name>&#x589e;&#x52a0;&#x65f6;&#x523b;&#x8868;&#x540d;&#x5b57;&#xff0c;&#x7ebf;&#x8def;&#x540d;&#x5b57;&#xff0c;&#x505c;&#x8f66;&#x573a;&#x540d;&#x5b57;</target_step_name>
         <target_attribute_key>NAME</target_attribute_key>
         <target_detail>Y</target_detail>
@@ -446,41 +446,41 @@
         <target_detail>Y</target_detail>
         <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c;</source_step>
         <source_field>fieldName</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x884c;&#x8f6c;&#x5217;</target_step_name>
-        <target_attribute_key>VALUE</target_attribute_key>
-        <target_detail>Y</target_detail>
-        <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c; 2</source_step>
-        <source_field>fieldName</source_field>
       </mapping>      <mapping>        <target_step_name>Excel&#x8f93;&#x5165;</target_step_name>
         <target_attribute_key>TRIM_TYPE</target_attribute_key>
         <target_detail>Y</target_detail>
         <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c;</source_step>
         <source_field>trim_type</source_field>
       </mapping>      <mapping>        <target_step_name>&#x884c;&#x8f6c;&#x5217;</target_step_name>
-        <target_attribute_key>NORMALISED</target_attribute_key>
+        <target_attribute_key>VALUE</target_attribute_key>
         <target_detail>Y</target_detail>
         <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c; 2</source_step>
-        <source_field>value</source_field>
+        <source_field>fieldName</source_field>
       </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
         <target_attribute_key>REPEAT</target_attribute_key>
         <target_detail>Y</target_detail>
         <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
         <source_field>repeat</source_field>
-      </mapping>      <mapping>        <target_step_name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</target_step_name>
+      </mapping>      <mapping>        <target_step_name>&#x884c;&#x8f6c;&#x5217;</target_step_name>
         <target_attribute_key>NORMALISED</target_attribute_key>
         <target_detail>Y</target_detail>
-        <source_step>&#x589e;&#x52a0;normalize&#x5143;&#x6570;&#x636e;</source_step>
-        <source_field>valuefield</source_field>
+        <source_step>&#x5217;&#x62c6;&#x5206;&#x4e3a;&#x591a;&#x884c; 2</source_step>
+        <source_field>value</source_field>
       </mapping>      <mapping>        <target_step_name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</target_step_name>
-        <target_attribute_key>VALUE</target_attribute_key>
+        <target_attribute_key>NORMALISED</target_attribute_key>
         <target_detail>Y</target_detail>
         <source_step>&#x589e;&#x52a0;normalize&#x5143;&#x6570;&#x636e;</source_step>
-        <source_field>nfieldname</source_field>
+        <source_field>valuefield</source_field>
       </mapping>      <mapping>        <target_step_name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</target_step_name>
         <target_attribute_key>FORMAT</target_attribute_key>
         <target_detail>Y</target_detail>
         <source_step>&#x589e;&#x52a0;excel&#x5b57;&#x6bb5;&#x5176;&#x4ed6;&#x5143;&#x6570;&#x636e;</source_step>
         <source_field>format</source_field>
+      </mapping>      <mapping>        <target_step_name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</target_step_name>
+        <target_attribute_key>VALUE</target_attribute_key>
+        <target_detail>Y</target_detail>
+        <source_step>&#x589e;&#x52a0;normalize&#x5143;&#x6570;&#x636e;</source_step>
+        <source_field>nfieldname</source_field>
       </mapping>      <mapping>        <target_step_name>Excel&#x8f93;&#x5165;</target_step_name>
         <target_attribute_key>PRECISION</target_attribute_key>
         <target_detail>Y</target_detail>
@@ -495,6 +495,48 @@
     </step>
   <step>
+    <name>&#x505c;&#x8f66;&#x573a;&#x540d;&#x79f0;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_car_park</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>car_park</name>
+        <field>park_code</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>park_name</name>
+        <rename>tccname_</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>319</xloc>
+      <yloc>468</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x505c;&#x8f66;&#x573a;&#x540d;&#x79f0;metadata&#x5b57;&#x6bb5;</name>
     <type>SelectValues</type>
     <description/>
@@ -527,6 +569,48 @@
     </step>
   <step>
+    <name>&#x505c;&#x8f66;&#x573a;&#x7f16;&#x7801;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_line_information</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>lineinfoid_</name>
+        <field>id</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>car_park</name>
+        <rename>car_park</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>182</xloc>
+      <yloc>467</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x5220;&#x9664;&#x4e4b;&#x524d;&#x7684;&#x660e;&#x7ec6;&#x4fe1;&#x606f;</name>
     <type>ExecSQL</type>
     <description/>
@@ -1237,58 +1321,6 @@
     </step>
   <step>
-    <name>&#x9017;&#x53f7;&#x5207;&#x5206;&#x6210;&#x5b57;&#x6bb5;&#x540d;</name>
-    <type>SplitFieldToRows3</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-   <splitfield>fieldnames</splitfield>
-   <delimiter>,</delimiter>
-   <newfield>fieldname</newfield>
-   <rownum>N</rownum>
-   <rownum_field/>
-   <resetrownumber>Y</resetrownumber>
-   <delimiter_is_regex>N</delimiter_is_regex>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>442</xloc>
-      <yloc>153</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x9017;&#x53f7;&#x5207;&#x5206;&#x6210;&#x5b57;&#x6bb5;&#x540d; 2</name>
-    <type>SplitFieldToRows3</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-   <splitfield>normalizefieldnames_</splitfield>
-   <delimiter>,</delimiter>
-   <newfield>nfieldname</newfield>
-   <rownum>N</rownum>
-   <rownum_field/>
-   <resetrownumber>Y</resetrownumber>
-   <delimiter_is_regex>N</delimiter_is_regex>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>444</xloc>
-      <yloc>247</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
     <name>&#x83b7;&#x53d6;&#x7ebf;&#x8def;&#x6807;&#x51c6;id</name>
     <type>GetVariable</type>
     <description/>
@@ -1322,8 +1354,8 @@
     </step>
   <step>
-    <name>&#x505c;&#x8f66;&#x573a;&#x7f16;&#x7801;</name>
-    <type>DBLookup</type>
+    <name>&#x9017;&#x53f7;&#x5207;&#x5206;&#x6210;&#x5b57;&#x6bb5;&#x540d;</name>
+    <type>SplitFieldToRows3</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -1332,40 +1364,24 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_line_information</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
-        <name>lineinfoid_</name>
-        <field>id</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>car_park</name>
-        <rename>car_park</rename>
-        <default/>
-        <type>String</type>
-      </value>
-    </lookup>
+   <splitfield>fieldnames</splitfield>
+   <delimiter>,</delimiter>
+   <newfield>fieldname</newfield>
+   <rownum>N</rownum>
+   <rownum_field/>
+   <resetrownumber>Y</resetrownumber>
+   <delimiter_is_regex>N</delimiter_is_regex>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>182</xloc>
-      <yloc>467</yloc>
+      <xloc>442</xloc>
+      <yloc>153</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>&#x505c;&#x8f66;&#x573a;&#x540d;&#x79f0;</name>
-    <type>DBLookup</type>
+    <name>&#x9017;&#x53f7;&#x5207;&#x5206;&#x6210;&#x5b57;&#x6bb5;&#x540d; 2</name>
+    <type>SplitFieldToRows3</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -1374,33 +1390,17 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_car_park</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
-        <name>car_park</name>
-        <field>park_code</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>park_name</name>
-        <rename>tccname_</rename>
-        <default/>
-        <type>String</type>
-      </value>
-    </lookup>
+   <splitfield>normalizefieldnames_</splitfield>
+   <delimiter>,</delimiter>
+   <newfield>nfieldname</newfield>
+   <rownum>N</rownum>
+   <rownum_field/>
+   <resetrownumber>Y</resetrownumber>
+   <delimiter_is_regex>N</delimiter_is_regex>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>319</xloc>
-      <yloc>468</yloc>
+      <xloc>444</xloc>
+      <yloc>247</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -6,4 +6,5 @@ import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbTimeFunction gi
 import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbFcnoFunction gidfbfcno;
 import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
 import accumulate com.bsth.service.schedule.rules.ttinfo.MinRuleQyrqFunction minruleqyrq;
-import accumulate com.bsth.service.schedule.rules.validate.ValidRepeatBcFunction vrb;
 \ No newline at end of file
+import accumulate com.bsth.service.schedule.rules.validate.ValidRepeatBcFunction vrb;
+import accumulate com.bsth.service.schedule.rules.validate.ValidWholeRerunBcFunction vwrb;
@@ -16,7 +16,8 @@ import com.bsth.service.schedule.rules.ScheduleRuleService;
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.CarConfigInfo
-import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.schedule.EmployeeConfigInfo
+import javax.print.attribute.standard.DateTimeAtCompleted;
 // 全局日志类（一般使用调用此规则的service类）
 global Logger log;
@@ -75,8 +76,11 @@ rule &quot;rw2&quot;
         Line xl = new Line();
         xl.setId(Integer.valueOf($xlId));
         ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setXl(xl);
-        // id
-        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setId((new Date()).getTime());
+        // id，使用当前日期作为原始值加上路牌id最为临时id值
+        DateTime dt = new DateTime(new Date());
+        DateTime dt2 = new DateTime(dt.year().get(), dt.monthOfYear().get(), dt.dayOfMonth().get(), 0, 0, 0);
+        long id = (dt2.toDate().getTime() + Long.parseLong($lpId));
+        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setId(id);
         // 启用日期
         ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setQyrq($fromDate.toDate());
         // 车辆配置
@@ -112,6 +116,6 @@ rule &quot;rw3&quot;
     when
         $sri_wrap : Sri_Wrap($sri : sri, $xlId: xlId, $lpIds : lpIds)
     then
-        log.info("线路id={},lpids={}", $xlId, $lpIds);
+        log.info("线路id={},type={},ruleId={},lpids={}", $xlId, $sri.getsType(), $sri.getRuleId(), $lpIds);
         sriList.add($sri);
 end
 \ No newline at end of file
@@ -49,11 +49,13 @@ rule &quot;Valid_repeat_bc&quot; // 验证是否存在重复班次
         eval($sd.isBefore($ed) || $sd.isEqual($ed))
         $spiList: ArrayList() from collect (SchedulePlanInfo(scheduleDate.getTime() == $sd.getMillis()))
         $infos: ArrayList() from accumulate ($spi: SchedulePlanInfo() from $spiList, vrb($spi))
+        $infos2: ArrayList() from accumulate ($spi: SchedulePlanInfo() from $spiList, vwrb($spi))
     then
         // TODO：
-        log.info("日期={}，班次重复错误数={}", $sd, $infos.size());
+//        log.info("日期={}，班次重复错误数={}", $sd, $infos.size());
         validResult.getInfos().addAll($infos);
+        validResult.getInfos().addAll($infos2);
         // 迭代
         $lp.setStart_date($sd.plusDays(1));
@@ -875,7 +875,7 @@ var BaseFun = function() {
 					//if(bcddsj < kssj)
 					//	isLast.push(bcArray[b]);
 				}
-				if(canCf.length>0) {
+				if(canCf.length>0 && canCf[canCf.length-1].isfb == 0) { // NEW，如果班次是分班班次，就不吃饭
 					console.log('countTzsj:' + countTzsj + 'length:' + canCf.length);
 					var fxDm = baseF.dirDmToIndex(canCf[canCf.length-1].xlDir);
                     if (map.cfdd == "allYes") { // NEW，如果选择的吃饭地点是所有，则使用班次的方向作为吃饭班次的方向
@@ -37,8 +37,8 @@
 								<th width="8%">开始时间</th>
 								<th width="8%">结束时间</th>
 								<th width="8%">持续时间</th>
-								<th width="8%">查看轨迹</th>
-								<th width="6%">操作</th>
+								<!-- <th width="8%">查看轨迹</th> -->
+								<th width="9%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
@@ -68,8 +68,8 @@
 									>=<input class="form-control" type="text" name="times" style="width:50px;display:inline!important"
 									  onkeyup="(this.v=function(){this.value=this.value.replace(/[^0-9-]+/,'');}).call(this)" onblur="this.v();"/> 
 								</td>
-								<td>
-								</td>
+								<!-- <td>
+								</td> -->
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
@@ -94,7 +94,7 @@
 {{each list as obj i}}
 <tr>
 	<td style="vertical-align: middle;">
-		<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
+		{{(i+1)}}
 	</td>
 	<td>
 		{{obj.lineName}}
@@ -131,9 +131,6 @@
 			轨迹回放										
 		</a>
 	</td>
-	<td>
-		
-	</td>
 </tr>
 {{/each}}
 {{if list.length == 0}}
@@ -36,8 +36,8 @@
 								<th width="10%">开始时间</th>
 								<th width="10%">结束时间</th>
 								<th width="8%">持续时间</th>
-								<th width="8%">查看轨迹</th>
-								<th width="6%">操作</th>
+								<!-- <th width="8%">查看轨迹</th> -->
+								<th width="8%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
@@ -70,8 +70,8 @@
 									>=<input class="form-control" type="text" name="times" style="width:50px;display:inline!important"
 									  onkeyup="(this.v=function(){this.value=this.value.replace(/[^0-9-]+/,'');}).call(this)" onblur="this.v();"/> 
 								</td>
-								<td>
-								</td>
+								<!-- <td>
+								</td> -->
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
@@ -96,7 +96,7 @@
 {{each list as obj i}}
 <tr>
 	<td style="vertical-align: middle;">
-		<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
+		{{(i+1)}}
 	</td>
 	<td>
 		{{obj.lineName}}
@@ -130,9 +130,6 @@
 			查看轨迹										
 		</a>
 	</td>
-	<td>
-		
-	</td>
 </tr>
 {{/each}}
 {{if list.length == 0}}
@@ -305,7 +305,7 @@
 		</tr>
 	{{/each}}
-	{{if list.length == 0}}
+	{{if list.length == 1}}
 		<tr>
 			<td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
@@ -7,10 +7,26 @@ var gb_schedule_table = (function () {
     var line2Schedule = {};
     //车辆应发未发车辆数
     var car_yfwf_map = {};
+
+    var bcTypeOrderMap = {
+        'out':0,
+        'normal':1,
+        'region':2,
+        'major':3,
+        'venting':4,
+        'ldks':5,
+        'in':6
+    };
+    var typeOrder = function (type) {
+        return bcTypeOrderMap[type]?bcTypeOrderMap[type]:0;
+    };
     var schedule_sort = function (s1, s2) {
-        return s1.fcsjT - s2.fcsjT;
+        var diff = s1['fcsjT'] - s2['fcsjT'];
+        return diff!=0?diff:typeOrder(s1['bcType'])-typeOrder(s2['bcType']);
     };
+
+
     /**
      * 检查是否存在重复班次
      * @param list
@@ -118,17 +134,27 @@ var gb_schedule_table = (function () {
     //计算实发时间差值
     var calc_sch_real_shift = function (sch) {
-        if (sch.fcsjActualTime) {
-            var diff = parseInt((sch.fcsjActualTime - sch.dfsjT) / 1000 / 60);
-            if (diff > 0)
-                sch.fcsj_diff = '( +' + diff + ' )';
-            else if (diff < 0)
-                sch.fcsj_diff = '( ' + diff + ' )';
+        if (sch['fcsjActualTime']){
+            var diff = sch['fcsjActualTime'] - sch['dfsjT'], fcsj_diff;
+            fcsj_diff = parseInt(diff / 60000);
+            if(diff % 60000 != 0){
+                /*if(fcsj_diff > 0)
+                    fcsj_diff ++;
+                else */if(fcsj_diff < 0)
+                    fcsj_diff --;
+            }
+
+            if(fcsj_diff > 0)
+                sch.fcsj_diff = '( +' + fcsj_diff + ' )';
+            else if (fcsj_diff < 0)
+                sch.fcsj_diff = '( ' + fcsj_diff + ' )';
             else
                 sch.fcsj_diff = '';
         }
     };
+
+
     function arrayIsNull(array) {
         return !array || array.length == 0;
     }
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-08-13',
-        text: '<h5>1、修复了 “子任务-区间调头” 当上下行里程不等时，站间距公里提示错误的问题！</h5>'
+        date: '2017-08-25',
+        text: '<h5>1、修复了一个bug，这个bug导致个别班次不显示实到时间！</h5>'
     };
     var storage = window.localStorage
+/* 基础数据管理模块 */
+
+var gb_data_basic = (function () {
+
+    var stationRoutes, lineCode2NameAll, lineInformations, nbbm2deviceMap, device2nbbmMap, allPersonnel, svgAttrs;
+    var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", "nbbm2deviceId", "all_personnel", "svg_attrs"
+        , function (routes, code2Name, informations, nbbm2device, all_personnel, svgAttrMap) {
+            stationRoutes = routes;
+            lineCode2NameAll = code2Name;
+            lineInformations = informations;
+            nbbm2deviceMap = nbbm2device;
+            device2nbbmMap = gb_common.inverse(nbbm2deviceMap);
+            allPersonnel = all_personnel;
+            svgAttrs = svgAttrMap;
+            //gb_main_ep.emitLater('data-basic');
+        });
+
+    var storage = window.localStorage;
+    //激活的线路
+    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
+    //lineCode to line object
+    var codeToLine = {};
+    //lineCode idx string
+    var line_idx = (function () {
+        var str = '';
+        for (var i = 0, item; item = activeLines[i++];) {
+            str += (',' + item.lineCode);
+            codeToLine[item.lineCode] = item;
+        }
+        return str.substr(1);
+    })();
+
+    //站点路由
+    gb_common.$get('/stationroute/multiLine', {lineIds: line_idx}, function (rs) {
+        var list = rs.list;//JSON.parse(rs.list);
+        var routeData = gb_common.groupBy(list, 'lineCode');
+        //排序
+        for (var lineCode in routeData) {
+            routeData[lineCode].sort(stationRouteSort);
+        }
+        ep.emit('stationRoutes', routeData);
+    });
+
+    //线路标准信息
+    gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {
+        var informations = {};
+        $.each(rs, function () {
+            informations[this.line.lineCode] = this;
+            delete this['line'];
+        });
+        ep.emit('lineInformations', informations);
+    });
+
+    //人员信息
+    loadAllPersonnel(function (data) {
+        ep.emit('all_personnel', data);
+    });
+    function loadAllPersonnel(cb) {
+        $.get('/personnel/all_py', function (rs) {
+            //转换成自动补全组件需要的数据
+            var data = [], code;
+            for(var i =0, p; p = rs[i++];){
+                code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];
+                data.push({
+                    value: code + '/' + p.name,
+                    fullChars: p.fullChars.toUpperCase(),
+                    camelChars: p.camelChars.toUpperCase()
+                });
+            }
+            cb && cb(data);
+        });
+    }
+
+    var carparks = {};
+    //停车场数据
+    gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+        rs.list.sort(function (a, b) {
+           return a.parkName.localeCompare(b.parkName);
+        });
+        $.each(rs.list, function () {
+            carparks[this.parkCode] = this;
+        });
+    });
+
+    //车辆数据
+    var carsArray;
+    $.get('/basic/cars?t=' + Math.random(), function (rs) {
+        carsArray = rs;
+    });
+
+    var getCarparkByCode = function (code) {
+        return carparks[code];
+    };
+
+    //line code to name
+    $.get('/basic/lineCode2Name', function (rs) {
+        ep.emit('lineCode2Name', rs);
+    });
+
+    //nbbm to device id
+    $.get('/basic/nbbm2deviceId', function (rs) {
+        ep.emit('nbbm2deviceId', rs);
+    });
+    //nbbm to 车牌号
+    var nbbm2PlateMap;
+    $.get('/basic/nbbm2PlateNo', function (rs) {
+        nbbm2PlateMap = rs;
+    });
+
+    //模拟图属性数据
+    gb_common.$get('/realSchedule/svgAttr', {idx: line_idx}, function (rs) {
+        var data = {};
+        $.each(rs.list, function () {
+            this.hideStations = JSON.parse(this.hideStations);
+            this.nicknames = JSON.parse(this.nicknames);
+            data[this.lineCode] = this;
+        });
+        ep.emit('svg_attrs', data);
+    });
+
+    //站点和停车场历时、公里对照数据
+    var stat_park_data;
+    var load_stat_park_data = function () {
+        $.get('/basic/station2ParkData?t='+Math.random(), {idx: line_idx}, function (rs) {
+            stat_park_data = rs;
+        });
+    }
+    load_stat_park_data();
+
+    function findLineByCodes(codeArr) {
+        var rs = [];
+        $.each(codeArr, function () {
+            rs.push(codeToLine[this]);
+        });
+        return rs;
+    }
+
+    var findCodeByLinename = function (name) {
+        for (var code in lineCode2NameAll) {
+            if (name == lineCode2NameAll[code])
+                return code;
+        }
+
+        return null;
+    };
+
+    var getLineInformation = function (lineCode) {
+        return lineInformations[lineCode];
+    };
+
+    var stationRouteSort = function (a, b) {
+        return a.stationRouteCode - b.stationRouteCode;
+    };
+
+    return {
+        activeLines: activeLines,
+        line_idx: line_idx,
+        codeToLine: codeToLine,
+        nbbm2deviceMap: function () {
+            return nbbm2deviceMap;
+        },
+        device2nbbmMap: function () {
+            return device2nbbmMap;
+        },
+        getLineInformation: getLineInformation,
+        allInformations: function () {
+            return lineInformations;
+        },
+        stationRoutes: function (lineCode) {
+            return stationRoutes[lineCode]
+        },
+        findLineByCodes: findLineByCodes,
+        lineCode2NameAll: function () {
+            return lineCode2NameAll
+        },
+        allPersonnel: function () {
+            return allPersonnel;
+        },
+        findCodeByLinename: findCodeByLinename,
+        getCarparkByCode: getCarparkByCode,
+        getSvgAttr: function (lineCode) {
+            return svgAttrs[lineCode];
+        },
+        setSvgAttr: function (attr) {
+            attr.hideStations = JSON.parse(attr.hideStations);
+            attr.nicknames = JSON.parse(attr.nicknames);
+            svgAttrs[attr.lineCode] = attr;
+        },
+        //是否是环线
+        isLoopLine: function (lineCode) {
+            var data = gb_common.groupBy(stationRoutes[lineCode], 'directions');
+            //下行只有2个站点
+            var len = data[0].length;
+            if (len > 0 && data[1].length == 2) {
+                var first = data[0][0],
+                    end = data[0][len - 1];
+
+                /*if(first.stationName != end.stationName)
+                 return false;*/
+
+                var fPoint = {latitude: first.station.gLaty, longitude: first.station.gLonx}
+                    , ePoint = {latitude: end.station.gLaty, longitude: end.station.gLonx};
+
+                //并且上行起终点距离200米内
+                if (geolib.getDistance(fPoint, ePoint) < 200) {
+                    return true;
+                }
+            }
+
+            return false;
+        },
+        //刷新员工信息
+        refreshAllPersonnel: function (cb) {
+            loadAllPersonnel(function (data) {
+                allPersonnel = data;
+                cb && cb();
+            });
+        },
+        nbbm2PlateMap: function () {
+            return nbbm2PlateMap;
+        },
+        carsArray: function () {
+            return carsArray;
+        },
+        simpleParksArray: function () {
+            var map = {};
+            for(var code in carparks)
+                map[code] = carparks[code].parkName;
+            return map;
+        },
+        remarksMapps: function () {
+            return remarksMapps;
+        },
+        get_stat_park_data: function () {
+            return stat_park_data;
+        },
+        reload_stat_park_data: function () {
+            load_stat_park_data();
+        }
+    };
+})();
+/* gps 数据管理模块 */
+
+var gb_data_gps = (function () {
+
+    //fixed time refresh delay
+    var delay = 1000 * 7;
+    //deviceId ——> gps
+    var realData = {};
+    //refresh after callback
+    var refreshEventCallbacks = [];
+    //register callback function
+    var registerCallback = function (cb) {
+        if (cb)
+            refreshEventCallbacks.push(cb);
+    };
+
+    var refresh = function (cb) {
+        $.ajax({
+            url: '/gps/real/line',
+            data: {lineCodes: gb_data_basic.line_idx},
+            dataType: 'json',
+            success: function (rs) {
+                //用定时的gps来检测session断开
+                if(rs.status && rs.status==407){
+                    location.href = '/login.html';
+                    return;
+                }
+                refreshData(rs);
+                cb();
+            },
+            error: function (xr, t) {
+                notify_err('刷新GPS失败，稍后重试' + t);
+                cb();
+            }
+        });
+    };
+
+    var refreshData = function (rs) {
+        var old, addArr = [],
+            upArr = [],
+            upDownChange = [];
+
+        var schArray;
+        $.each(rs, function () {
+            old = realData[this.deviceId];
+            if (old) {
+                if (this.timestamp > old.timestamp) {
+                    if (old.upDown != this.upDown)
+                        upDownChange.push(this);
+                    else
+                        upArr.push(this);
+                }
+
+            } else
+                addArr.push(this);
+
+           /* //班次信息
+            if (this.schId) {
+                schArray = gb_schedule_table.findScheduleByLine(this.lineId);
+                if (schArray)
+                    this.sch = schArray[this.schId];
+            }*/
+
+            //时间格式化
+            this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
+            realData[this.deviceId] = this;
+        });
+
+        //console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
+        //CCCallFuncN
+        $.each(refreshEventCallbacks, function (i, cb) {
+            cb(addArr, upArr, upDownChange);
+        });
+
+    };
+
+    var startFixedTime;
+    var fixedTimeRefresh = function () {
+        if (startFixedTime)
+            return;
+        startFixedTime = true;
+
+        (function () {
+            var f = arguments.callee;
+            refresh(function () {
+                setTimeout(f, delay);
+            });
+        })();
+    };
+
+    var gpsByLineCode = function (lineCode) {
+        var rs = [];
+        for (var device in realData) {
+            if (realData[device].lineId == lineCode)
+                rs.push(realData[device]);
+        }
+        return rs;
+    };
+
+    var findOne = function (deviceId) {
+        return realData[deviceId];
+    };
+
+    var findGpsByNbbm = function (nbbm) {
+        return realData[gb_data_basic.nbbm2deviceMap()[nbbm]];
+    };
+
+    /**
+     * 设备掉线事件
+     */
+    var deviceOffline = function (gps) {
+        $.each(offlineCallbacks, function (i, cb) {
+            cb(gps);
+        });
+    };
+
+    //注册掉线事件回调函数
+    var offlineCallbacks = [];
+    var registerOfflineCb = function (cb) {
+        if (cb)
+            offlineCallbacks.push(cb);
+    };
+
+    return {
+        fixedTimeRefresh: fixedTimeRefresh,
+        registerCallback: registerCallback,
+        allGps: realData,
+        gpsByLineCode: gpsByLineCode,
+        findOne: findOne,
+        findGpsByNbbm: findGpsByNbbm,
+        deviceOffline: deviceOffline,
+        registerOfflineCb: registerOfflineCb
+    };
+})();
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <title>地图监控 v2.0</title>
+    <!-- uikit  core style-->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" />
+    <link rel="stylesheet"
+          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.gradient.min.css" />
+
+    <!-- main style -->
+    <link rel="stylesheet" href="/real_control_v2/css/main.css" />
+    <!-- north style -->
+    <link rel="stylesheet" href="/real_control_v2/css/north.css" />
+    <!-- home style -->
+    <link rel="stylesheet" href="/real_control_v2/css/home.css" />
+
+    <!-- js tree -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.css"  />
+
+    <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" />
+    <!-- perfect-scrollbar style -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <!-- layer 3.0.3 -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css"  />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css"  />
+
+    <!-- flatpickr -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css" >
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/themes/airbnb.css" >
+
+    <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" />
+</head>
+
+<body>
+<div class="main-container" style="height: 100%;">
+</div>
+
+<!-- 地图相关 -->
+<script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
+<script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
+<script src="/assets/js/TransGPS.js" merge="plugins"></script>
+<!-- 高德  -->
+<script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
+<!-- jquery -->
+<script src="/real_control_v2/assets/js/jquery.min.js"></script>
+<!-- jquery actual -->
+<script src="/real_control_v2/assets/js/jquery.actual.min.js" ></script>
+<!-- moment.js 日期处理类库 -->
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/zh-cn.js"></script>
+
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js"></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js"></script>
+
+<!-- perfect-scrollbar -->
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  ></script>
+<!-- common js -->
+<script src="/real_control_v2/js/common.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js" ></script>
+<!-- d3 -->
+<script src="/assets/js/d3.min.js"></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- uikit core -->
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.min.js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.min.js" ></script>
+
+<!-- js tree -->
+<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"  ></script>
+<!-- layer 3.0.3 -->
+<script src="/real_control_v2/assets/plugins/layer3.0.3/layer.js"></script>
+
+<!-- 模态框扩展 -->
+<script src="/real_control_v2/js/modal_extend.js" ></script>
+
+<script src="/real_control_v2/mapmonitor/alone_page/alone_data_basic.js" ></script>
+<script src="/real_control_v2/mapmonitor/alone_page/alone_data_gps.js" ></script>
+<script src="/real_control_v2/js/utils/ct_table.js" ></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js" ></script>
+<script>
+    (function () {
+        gb_data_gps.fixedTimeRefresh();
+        //嵌入地图页面
+        $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
+            $('.map-system-msg.flex-left').remove();
+        });
+    })();
+</script>
+</body>
+
+</html>
@@ -64,7 +64,7 @@ input[type=checkbox].disabled{
     position: absolute;
     z-index: 2;
     top: 20px;
-    background: red;
+    background: white;
     color: white;
     padding: 7px 25px 7px 7px;
     right: calc(50% - 250px);
@@ -87,14 +87,17 @@ input[type=checkbox].disabled{
     box-shadow: none;
 }
-.map-system-msg.flex-left a:before{
-    content: '老版本地图';
+.map-system-msg.flex-left a.now_map{
+    top: 35px;
+    width: 50px;
+}
+
+.map-system-msg.flex-left a:after{
     position: absolute;
     width: 100%;
     z-index: 2;
     height: 100%;
     background: #ffffff;
-    top: 0;
     left: 0;
     text-align: center;
     font-size: 12px;
@@ -102,6 +105,26 @@ input[type=checkbox].disabled{
     color: #969696;
 }
+.map-system-msg.flex-left a.old_map:after{
+    content: '老版本地图';
+    top: 0;
+}
+
+.map-system-msg.flex-left a.now_map>i{
+    font-size: 12px;
+    vertical-align: top;
+    color: #535151;
+    margin-top: -1px;
+}
+
+.map-system-msg.flex-left a.now_map:after{
+    content: '单屏地图';
+    top: 0;
+    left: 20px;
+    text-align: left;
+    text-indent: 7px;
+}
+
 .map-system-msg a:hover{
     text-decoration: none;
 }
@@ -111,6 +111,8 @@ var gb_map_config = (function () {
     function trafficSwitch(val) {
         //修改配置项
         set('traffic', this.checked);
+
+        gb_map_imap.call('transparent_line', this.checked);
         gb_map_imap.call('traffic', this.checked);
     }
@@ -57,6 +57,19 @@ var gb_map_baidu = (function(){
 			//根据ID保存映射
 			polylines[opt.id]=_pLines;
+		}
+		,
+		transparent_line: function (checked) {
+			for(var id in polylines){
+				for(var i=0,polyline;polyline=polylines[id][i++];){
+					if(polyline.isVisible()){
+						if(checked)
+							polyline.setStrokeOpacity(0.1);
+						else
+							polyline.setStrokeOpacity(0.6);
+					}
+				}
+			}
 		},
 		traffic: function (enable) {
 			if(enable)
@@ -92,6 +92,18 @@ var gb_map_gaode = (function() {
 			polylines[opt.id]=_pLines;
 		},
+		transparent_line: function (checked) {
+			for(var id in polylines){
+				for(var i=0,polyline;polyline=polylines[id][i++];){
+					if(polyline.isVisible()){
+						if(checked)
+							polyline.setStrokeOpacity(0.1);
+						else
+							polyline.setStrokeOpacity(0.6);
+					}
+				}
+			}
+		},
 		//定位到线路中间点
 		centerToLine: function (opt) {
 			var _pLines = polylines[opt.id];
@@ -6,7 +6,10 @@
 <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css" merge="map_plugins">
 <div class="map-system-msg flex-left">
-    <a class="z-depth-2" href="/pages/mapmonitor/alone/wrap.html" target="_blank"></a>
+    <a class="z-depth-2 old_map" href="/pages/mapmonitor/alone/wrap.html" target="_blank"></a>
+    <a class="z-depth-2 now_map" href="/real_control_v2/mapmonitor/alone_page/alone_wrap.html" target="_blank">
+        <i class="uk-icon-send-o"></i>
+    </a>
 </div>
 <div id="real_map_container"></div>