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

潘钊
2 parents 8aa8463f 3c109706
Showing 88 changed files with 5332 additions and 2403 deletions
pom.xml
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/controller/traffic/SKBUploadLoggerController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/schedule/thread/SubmitToTrafficManage.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/entity/traffic/SKBUploadLogger.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/repository/traffic/SKBUploadLoggerRepository.java
src/main/java/com/bsth/service/TrafficManageService.java
src/main/java/com/bsth/service/excep/impl/OutboundServiceImpl.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
@@ -24,7 +24,12 @@
 			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
@@ -229,6 +234,23 @@
 			<version>1.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-adb</artifactId>
+			<version>1.7.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-transport-local</artifactId>
+			<version>1.7.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-transport-http</artifactId>
+			<version>1.7.4</version>
+		</dependency>
+
+
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> 
 			<optional>true</optional> </dependency> -->
 		<dependency>
@@ -209,8 +209,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
         return maps;
     }
 	@RequestMapping(value="/oilListMonth")
-	public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date){
-		return yblService.oilListMonth(line, date);
+	public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date,@RequestParam String type){
+		return yblService.oilListMonth(line, date, type);
 	}
 	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
@@ -244,8 +244,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
 			m.put("jzl", y.getJzl()<=0?"0":y.getJzl());
-			m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
-			m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
+			m.put("czlc", "0");
+			m.put("jzlc", "0");
 			m.put("czyl", y.getCzyl()<=0?"0":y.getCzyl());
 			m.put("jzyl", y.getJzyl()<=0?"0":y.getJzyl());
 			m.put("yh", y.getYh()<=0?"0":y.getYh());
@@ -255,7 +255,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 				if(y.getRylx().equals("1")){rylx="负10号柴油";}
 			}
 			m.put("rylx", rylx);
-			m.put("ns", y.getNs());
+			m.put("ns", y.getNs()==null?"0":y.getNs());
 			String shyy ="无";
 			if(y.getShyy()!=null){
 				shyy=y.getShyy();
@@ -7,6 +7,7 @@ import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
@@ -317,9 +318,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value = "/correctForm")
-	public List<ScheduleRealInfo> correctForm(@RequestParam String line, @RequestParam String startDate,
-											  @RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
-		return scheduleRealInfoService.correctForm(line, startDate, endDate, lpName, code, type);
+	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
+											 @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
+		return scheduleRealInfoService.correctForm(line, date,  lpName, code, type);
 	}
 	/**
 	 * @Title queryListWaybill
@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
+
 /**
  *
  * @author BSTH
@@ -22,9 +24,9 @@ public class TrafficManageController {
     @RequestMapping(value = "/setXL", method = RequestMethod.GET)
-    public String setXL() throws Exception {
+    public String setXL(@RequestParam Map<String, Object> param) throws Exception {
         try {
-            return trManageService.setXL();
+            return trManageService.setXL(param);
         } catch (Exception exp) {
             throw new Exception(exp.getCause());
         }
@@ -57,6 +59,15 @@ public class TrafficManageController {
         }
     }
+    @RequestMapping(value = "/setLDFile", method = RequestMethod.GET)
+    public String setLDFile() throws Exception {
+        try {
+            return trManageService.setLDFile();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
     @RequestMapping(value = "/setLCYH", method = RequestMethod.GET)
     public String setLCYH() throws Exception {
         try {
+package com.bsth.controller.traffic;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.traffic.SKBUploadLogger;
+import com.bsth.service.traffic.SKBUploadLoggerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * @author BSTH
+ *
+ */
+@RestController
+@RequestMapping("skb_log")
+public class SKBUploadLoggerController extends BaseController<SKBUploadLogger,Integer> {
+
+    @Autowired
+    private SKBUploadLoggerService skbUploadLoggerService;
+
+}
@@ -274,22 +274,23 @@ public class BasicData implements CommandLineRunner {
              * 加载运管处的站点及序号
              * 上行从1开始，下行顺序续编
              */
-            List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
+            List<Map<String, String>> ygcLines = stationRouteRepository.findAllLineWithYgc();
             if(ygcLines != null && ygcLines.size() > 0){
                 int size = ygcLines.size();
-                Object[] tempArray ;
+                Map<String, String> tempMap ;
                 int num = 1;
                 String key;
                 String lineCode = "";
                 for (int i = 0; i < size; i ++){
-                    tempArray = ygcLines.get(i);
+                    tempMap = ygcLines.get(i);
                     if(lineCode.equals("")){
-                        lineCode = tempArray[0]+"";
-                    }else if(!lineCode.equals(tempArray[0]+"")){
+                        lineCode = tempMap.get("lineCode");
+                    }else if(!lineCode.equals(tempMap.get("lineCode"))){
                         num = 1;
-                        lineCode = tempArray[0]+"";
+                        lineCode = tempMap.get("lineCode");
                     }
-                    key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[3];
+                    key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
+                            + "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
                     tempStationName2YgcNumber.put(key,num++);
                 }
             }
 package com.bsth.data.schedule.thread;
 import com.bsth.service.TrafficManageService;
+import com.bsth.service.traffic.YgcBasicDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,9 @@ public class SubmitToTrafficManage extends Thread{
     @Autowired
     TrafficManageService trafficManageService;
+    @Autowired
+    YgcBasicDataService ygcBasicDataService;
+
     @Override
     public void run() {
         logger.info("开始提交数据到运管处...");
@@ -46,6 +50,12 @@ public class SubmitToTrafficManage extends Thread{
         } catch (Exception e) {
             logger.error("提交线路计划班次表到运管处失败", e);
         }
+        try {
+            // 运管处基础数据更新
+            ygcBasicDataService.updateYgcBasicData();
+        } catch (Exception e) {
+            logger.error("运管处基础数据更新失败", e);
+        }
         logger.info("提交数据到运管处结束！");
     }
 }
@@ -104,6 +104,9 @@ public class Line implements Serializable {
 	/** 开辟日期 date*/
 	@DateTimeFormat(pattern ="yyyy-MM-dd")
 	private Date openDate;
+	
+	/** 大间隔等级 */
+	private Integer spacGrade;
 	/** 线路沿革 varchar length(50) */
 	private String history;
@@ -155,6 +158,14 @@ public class Line implements Serializable {
 	/** 是否在使用 <1:是;0:否> bit length(50) */
 	private Integer inUse;
+	public Integer getSpacGrade() {
+		return spacGrade;
+	}
+
+	public void setSpacGrade(Integer spacGrade) {
+		this.spacGrade = spacGrade;
+	}
+
 	public Integer getWarrantCar() {
 		return warrantCar;
 	}
+package com.bsth.entity.traffic;
+
+import com.bsth.entity.schedule.TTInfo;
+import com.bsth.entity.sys.SysUser;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName : SKBUploadLogger(时刻表上传日志实体类)
+ * 
+ * @Author : bsth@zq
+ * 
+ * @Description :
+ * 
+ * @Data : 2016-04-27
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_t_upload_logger")
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+public class SKBUploadLogger {
+
+	// ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	/** 时刻表信息 */
+	@ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+	private TTInfo ttInfo;
+
+	/** 用户 关联 */
+	@ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+	private SysUser user;
+
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public TTInfo getTtInfo() {
+		return ttInfo;
+	}
+
+	public void setTtInfo(TTInfo ttInfo) {
+		this.ttInfo = ttInfo;
+	}
+
+	public SysUser getUser() {
+		return user;
+	}
+
+	public void setUser(SysUser user) {
+		this.user = user;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+}
@@ -159,11 +159,11 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	 */
 	@Query(value =  "SELECT " +
 					"c.directions," +
-					"ST_AsText(s.bsection_vector) as bsection_vector," +
+					"ST_AsText(s.gsection_vector) as gsection_vector," +
 					"s.speed_limit," +
 					"s.section_name " +
 					" FROM bsth_c_sectionroute c " +
-					" LEFT JOIN bsth_c_section s on c.section = s.id where c.line = ?1 and c.directions = ?2", nativeQuery=true)
+					" LEFT JOIN bsth_c_section s on c.section = s.id where c.line = ?1 and c.directions = ?2 and c.destroy = 0", nativeQuery=true)
 	List<Object[]> sectionRouteVector(Integer lineId,Integer directions);
 	@Transactional
@@ -153,7 +153,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 				   "s.station_route_code," +
 				   "s.directions," +
 				   "s.distances,"+
-				   "s.station FROM bsth_c_stationroute s where  s.line = ?1) a " +
+				   "s.station FROM bsth_c_stationroute s where  s.line = ?1 and s.destroy=0) a " +
 				   "LEFT JOIN bsth_c_station b " +
 				   " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)
 	List<Object[]> usingSingle(Integer lineId);
@@ -259,8 +259,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	@Query("select s from StationRoute s where s.destroy=0 and s.lineCode=?1")
 	List<StationRoute> findByLineCode(String lineCode);
-	@Query("SELECT " +
-			"lineCode,directions,stationName,stationCode " +
+	@Query("SELECT new map(" +
+			"lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
+			"line.linePlayType as linePlayType,s.stationMark as stationMark) " +
 			"FROM " +
 			"StationRoute s " +
 			"WHERE " +
@@ -268,7 +269,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			"and s.lineCode in(select lineCode from Line where inUse = 1) " +
 			"ORDER BY " +
 			"lineCode,directions,stationRouteCode")
-	List<Object[]> findAllLineWithYgc();
+	List<Map<String, String>> findAllLineWithYgc();
     @Modifying
     @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1 ", nativeQuery=true)
+package com.bsth.repository.traffic;
+
+import com.bsth.entity.traffic.SKBUploadLogger;
+import com.bsth.repository.BaseRepository;
+
+public interface SKBUploadLoggerRepository extends BaseRepository<SKBUploadLogger, Integer> {
+}
 package com.bsth.service;
+import java.util.Map;
+
 /**
  *
  * @Interface: LineService(线路service业务层实现接口)
@@ -22,7 +24,7 @@ public interface TrafficManageService {
 	 *
 	 * @return 调用接口返回信息
 	 */
-	String setXL();
+	String setXL(Map<String, Object> param);
 	/**
 	 * 上传车辆信息
@@ -65,6 +67,8 @@ public interface TrafficManageService {
 	String setLD();
+	String setLDFile();
+
 	String setLCYH();
 	String setDDRB();
@@ -69,7 +69,7 @@ public class OutboundServiceImpl implements OutboundService{
 			}
 		}
-		sql +=" order by id limit ?,?";
+		sql +=" limit ?,?";
 		try {
 package com.bsth.service.forms.impl;
+import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -151,6 +152,40 @@ public class FormsServiceImpl implements FormsService {
 			w.setSh(String.valueOf(sh));
 		}
+		
+		Waybillday way = new Waybillday();
+		way.setNbbm("汇总合计");
+		BigDecimal ksgl = new BigDecimal("0.0");
+		BigDecimal jzl_ = new BigDecimal("0.0");
+		BigDecimal sh_ = new BigDecimal("0.0");
+		BigDecimal lc_ = new BigDecimal("0.0");
+		BigDecimal yh_ = new BigDecimal("0.0");
+		for(Waybillday w : list){
+			if(w.getJzl1() != null && w.getJzl1().trim().length() != 0){
+				ksgl = ksgl.add(new BigDecimal(w.getJzl1().trim()));
+			}
+			if(w.getJzl() != null && w.getJzl().trim().length() != 0){
+				jzl_ = jzl_.add(new BigDecimal(w.getJzl().trim()));
+			}
+			if(w.getSh() != null && w.getSh().trim().length() != 0){
+				sh_ = sh_.add(new BigDecimal(w.getSh().trim()));
+			}
+			if(w.getZlc() != null && w.getZlc().trim().length() != 0){
+				lc_ = lc_.add(new BigDecimal(w.getZlc().trim()));
+			}
+			if(w.getYh() != null && w.getYh().trim().length() != 0){
+				yh_ = yh_.add(new BigDecimal(w.getYh().trim()));
+			}
+		}
+		way.setJzl1(ksgl.toString());
+		way.setJzl(jzl_.toString());
+		way.setjName("");
+		way.setSh(sh_.toString());
+		way.setZlc(lc_.toString());
+		way.setYh(yh_.toString());
+		if(list.size() > 0)
+			list.add(way);
+		
 		return list;
 	}
@@ -205,12 +240,15 @@ public class FormsServiceImpl implements FormsService {
 		if(map.containsKey("fgsdmManth")){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
-		String sql = "select"
-				+ " r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name "
-//				+ "r.gs_bm,r.gs_name,"
-//				+ " r.fgs_bm,r.fgs_name,r.bc_type,r.lp_name " 
-		        + " from bsth_c_s_sp_info_real r "
-		    	+ " where 1=1  ";
+		String sql ="select ";
+		if(empnames.equals("驾驶员")){
+			sql	+= "  r.j_name,r.j_gh ";
+		}else if(empnames.equals("售票员")){
+			sql += " r.s_gh,r.s_name";
+		}else{
+			sql	+= "  r.cl_zbh";
+		}
+		sql  += " from bsth_c_s_sp_info_real r where 1=1  ";
 		if(map.get("startDate")!=null&&!map.get("startDate").equals("")){
 			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
 		}
@@ -227,12 +265,16 @@ public class FormsServiceImpl implements FormsService {
 //		}
 		if(map.get("fgsdmManth")!=null&&!map.get("fgsdmManth").equals("")){
 			sql+=" and r.fgs_bm like'%"+fgsdmManth+"%' ";
-		}	
-		if(empnames.equals("售票员")){
-			sql+="and r.s_name is not null AND r.s_name !=''";
 		}
+		if(empnames.equals("驾驶员")){
 			sql	+= " GROUP BY "
-					+ "r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name ";
+					+ "r.j_name,r.j_gh";
+		}else if(empnames.equals("售票员")){
+			sql+="and r.s_name is not null AND r.s_name !='' GROUP BY r.s_gh,r.s_name";
+		}else{
+			sql	+= " GROUP BY r.cl_zbh";
+		}
+			
 //					+ ",r.gs_bm,r.gs_name,"
 //					+ "r.fgs_bm,r.fgs_name,r.bc_type ";
@@ -244,15 +286,16 @@ public class FormsServiceImpl implements FormsService {
 			public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shiftuehiclemanth shif = new Shiftuehiclemanth();
 				if(empnames.equals("驾驶员")){
-					shif.setjName(arg0.getString("j_name"));
+					shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
+					shif.setJgh(arg0.getString("j_gh"));
 				}else if(empnames.equals("售票员")){
-					shif.setjName(arg0.getString("s_name")==null ? "":arg0.getString("s_name"));
+					shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
 			        shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				}else if(empnames.equals("车辆自编号")){
 					shif.setjName(arg0.getString("cl_zbh"));
 				}
-				shif.setJgh(arg0.getString("j_gh"));
-		        shif.setZbh(arg0.getString("cl_zbh"));
+//				shif.setJgh(arg0.getString("j_gh"));
+//		        shif.setZbh(arg0.getString("cl_zbh"));
 //		        shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				return shif;
 			}
@@ -274,11 +317,11 @@ public class FormsServiceImpl implements FormsService {
 					}
 				}else if(empnames.equals("售票员")){
 					String sgh=s.getsGh()==null?"":s.getsGh();
-					if(d.getSgh().equals(sgh) && d.getZbh().equals(s.getClZbh())){
+					if(d.getSgh().equals(sgh)){
 						sList.add(s);
 					}
 				}else if(empnames.equals("车辆自编号")){
-					if(d.getZbh().equals(s.getClZbh())){
+					if(d.getjName().equals(s.getClZbh())){
 						sList.add(s);
 					}
 				}
@@ -307,6 +350,34 @@ public class FormsServiceImpl implements FormsService {
 		}
+		Shiftuehiclemanth shif = new Shiftuehiclemanth();
+		shif.setjName("汇总合计");
+		BigDecimal yylc = new BigDecimal("0.0");
+		BigDecimal kslc = new BigDecimal("0.0");
+		BigDecimal cjlc = new BigDecimal("0.0");
+		BigDecimal zjlc = new BigDecimal("0.0");
+		BigDecimal zlc = new BigDecimal("0.0");
+		int cjbc = 0, zjbc = 0, sjbc = 0;
+		for(Shiftuehiclemanth s : list){
+			yylc = yylc.add(new BigDecimal(s.getJhlc()));
+			kslc = kslc.add(new BigDecimal(s.getEmptMileage()));
+			cjlc = cjlc.add(new BigDecimal(s.getRemMileage()));
+			zjlc = zjlc.add(new BigDecimal(s.getAddMileage()));
+			zlc = zlc.add(new BigDecimal(s.getTotalm()));
+			cjbc += Integer.valueOf(s.getCjbc());
+			zjbc += Integer.valueOf(s.getLjbc());
+			sjbc += Integer.valueOf(s.getSjbc());
+		}
+		shif.setJhlc(yylc.toString());
+		shif.setEmptMileage(kslc.toString());
+		shif.setRemMileage(cjlc.toString());
+		shif.setAddMileage(zjlc.toString());
+		shif.setTotalm(zlc.toString());
+		shif.setCjbc("" + cjbc);
+		shif.setLjbc("" + zjbc);
+		shif.setSjbc("" + sjbc);
+		if(list.size() > 0)
+			list.add(shif);
 		return list;
 	}
@@ -395,7 +466,47 @@ public class FormsServiceImpl implements FormsService {
 			d.setLjbc(String.valueOf(ljbc));//增加班次
 			d.setAddMileage(String.valueOf(zjgl));//增加公里
 			d.setSjjhbc(String.valueOf(sjbc));//实际计划班次
-			}
+		}
+		
+		Shifday shif = new Shifday();
+		shif.setjName("汇总合计");
+		BigDecimal jhlc = new BigDecimal("0.0");
+		BigDecimal sjlc = new BigDecimal("0.0");
+		BigDecimal yylc = new BigDecimal("0.0");
+		BigDecimal kslc = new BigDecimal("0.0");
+		BigDecimal cjlc = new BigDecimal("0.0");
+		BigDecimal zjlc = new BigDecimal("0.0");
+		BigDecimal zlc = new BigDecimal("0.0");
+		int jhbc = 0, sjjhbc = 0, cjbc = 0, zjbc = 0, sjbc = 0;
+		for(Shifday s : list){
+			jhlc = jhlc.add(new BigDecimal(s.getJhlc()));
+			sjlc = sjlc.add(new BigDecimal(s.getSjjhlc()));
+			yylc = yylc.add(new BigDecimal(s.getYygl()));
+			kslc = kslc.add(new BigDecimal(s.getEmptMileage()));
+			cjlc = cjlc.add(new BigDecimal(s.getRemMileage()));
+			zjlc = zjlc.add(new BigDecimal(s.getAddMileage()));
+			zlc = zlc.add(new BigDecimal(s.getTotalm()));
+			jhbc += Integer.valueOf(s.getJhbc());
+			sjjhbc += Integer.valueOf(s.getSjjhbc());
+			cjbc += Integer.valueOf(s.getCjbc());
+			zjbc += Integer.valueOf(s.getLjbc());
+			sjbc += Integer.valueOf(s.getSjbc());
+		}
+		shif.setJhlc(jhlc.toString());
+		shif.setSjjhlc(sjlc.toString());
+		shif.setYygl(yylc.toString());
+		shif.setEmptMileage(kslc.toString());
+		shif.setRemMileage(cjlc.toString());
+		shif.setAddMileage(zjlc.toString());
+		shif.setTotalm(zlc.toString());
+		shif.setJhbc("" + jhbc);
+		shif.setSjjhbc("" + sjjhbc);
+		shif.setCjbc("" + cjbc);
+		shif.setLjbc("" + zjbc);
+		shif.setSjbc("" + sjbc);
+		if(list.size() > 0)
+			list.add(shif);
+		
 		return list;
 	}
@@ -866,9 +977,11 @@ public class FormsServiceImpl implements FormsService {
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany);
 		List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line.length()==0?"%"+line+"%":line);
-		
-		String sql = "select * from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
-				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+startDate+"' and '"+endDate+"' ";
+
+		String sql = "select gs_name, fgs_name, cl_zbh, fcsj, bc_type, xl_bm, xl_name, schedule_date"
+				+ " from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' "
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"' ";
 		if(line.trim().length() != 0){
 			sql += "and xl_bm = '"+line+"' ";
 		}
@@ -957,12 +1070,10 @@ public class FormsServiceImpl implements FormsService {
 			}
 		}
 		Map<String, Object> tempMap = new HashMap<String, Object>();
-		int jhcc = 0;
-		int sjcc = 0;
-		int jhbc = 0;
-		int sjbc = 0;
+		int jhcc = 0, sjcc = 0;
+		int jhbc = 0, sjbc = 0;
 		int qz = 0;
-		for(Map<String, Object> m : tempList){
+		for(Map<String, Object> m : resList){
 			jhcc += Integer.valueOf(m.get("jhcc").toString());
 			sjcc += Integer.valueOf(m.get("sjcc").toString());
 			jhbc += Integer.valueOf(m.get("jhbc").toString());
@@ -970,7 +1081,7 @@ public class FormsServiceImpl implements FormsService {
 			qz += Integer.valueOf(m.get("qz").toString());
 		}
 		tempMap.put("rq", "分类汇总");
-		tempMap.put("line", "共" + tempList.size() + "条线路");
+		tempMap.put("line", "共" + resList.size() + "条线路");
 		tempMap.put("jhcc", jhcc);
 		tempMap.put("sjcc", sjcc);
 		tempMap.put("jhbc", jhbc);
@@ -421,10 +421,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						long fcsj1 = fcsjs.get(i - 1);
 						long fcsj2 = fcsjs.get(i);
 						Long time = fcsj1/60;
-						if(!timeMap0.containsKey(time) && !timeMap1.containsKey(time)){
+						if(!timeMap0.containsKey(time)){
 							timeMap0.put(time, new ArrayList<Long>());
-							timeMap1.put(time, new ArrayList<Long>());
-							timeList.add(time);
+							if(!timeList.contains(time))
+								timeList.add(time);
 						}
 						timeMap0.get(time).add(fcsj2 - fcsj1);
 					}
@@ -432,6 +432,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						long fcsj1 = fcsjAs.get(i - 1);
 						long fcsj2 = fcsjAs.get(i);
 						Long time = fcsj1/60;
+						if(!timeMap1.containsKey(time)){
+							timeMap1.put(time, new ArrayList<Long>());
+							if(!timeList.contains(time))
+								timeList.add(time);
+						}
 						if(timeMap1.containsKey(time)){
 							timeMap1.get(time).add(fcsj2 - fcsj1);
 						}
@@ -440,9 +445,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					for(int i = 1; i < fcsjs.size(); i++){
 						long fcsj1 = fcsjs.get(i - 1);
 						long fcsj2 = fcsjs.get(i);
-						if(!temp0.containsKey(key) && !temp1.containsKey(key)){
+						if(!temp0.containsKey(key)){
 							temp0.put(key, new ArrayList<Long>());
-							temp1.put(key, new ArrayList<Long>());
 							if(!keyList.contains(key))
 								keyList.add(key);
 						}
@@ -451,6 +455,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					for(int i = 1; i < fcsjAs.size(); i++){
 						long fcsj1 = fcsjAs.get(i - 1);
 						long fcsj2 = fcsjAs.get(i);
+						if(!temp1.containsKey(key)){
+							temp1.put(key, new ArrayList<Long>());
+							if(!keyList.contains(key))
+								keyList.add(key);
+						}
+						System.out.println("key:"+key+" fcsj2:"+fcsj2+" fcsj1:"+fcsj2+" temp1:"+temp1.get(key)+" tem0:"+temp0.get(key));
 						temp1.get(key).add(fcsj2 - fcsj1);
 					}
 				}
@@ -461,14 +471,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					Map<String, Object> tempMap = new HashMap<String, Object>();
 					List<Long> fcsjs = new ArrayList<Long>();
 					List<Long> fcsjAs = new ArrayList<Long>();
-					for(Long l : timeMap0.get(time)){
-						if(l < 90)
-							fcsjs.add(l);
-					}
-					for(Long l : timeMap1.get(time)){
-						if(l < 90)
-							fcsjAs.add(l);
-					}
+					if(timeMap0.containsKey(time))
+						for(Long l : timeMap0.get(time)){
+							if(l < 90)
+								fcsjs.add(l);
+						}
+					if(timeMap1.containsKey(time))
+						for(Long l : timeMap1.get(time)){
+							if(l < 90)
+								fcsjAs.add(l);
+						}
 					Collections.sort(fcsjs);
 					Collections.sort(fcsjAs);
 					String[] split = key.split("/");
@@ -495,7 +507,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						tempMap.put("deviation", df.format(Double.valueOf(tempMap.get("sjInterval").toString())
 								- Double.valueOf(tempMap.get("jhInterval").toString())));
 					}
-					tempList.add(tempMap);
+					if(fcsjs.size() != 0 || fcsjAs.size() != 0)
+						tempList.add(tempMap);
 				}
 			}
 		}
@@ -504,11 +517,24 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			List<Long> sortList = new ArrayList<Long>();
 			Map<Long, List<Map<String, Object>>> sortMap = new HashMap<Long, List<Map<String, Object>>>();
 			for(Map<String, Object> m : tempList){
-				Long sort = Long.valueOf(m.get("times").toString().substring(0, 2));
+				String times = m.get("times").toString();
+				Long sort = Long.valueOf(times.substring(0, 2));
 				if(!sortMap.containsKey(sort)){
 					sortMap.put(sort, new ArrayList<Map<String, Object>>());
 					sortList.add(sort);
 				}
+				String[] split = times.split("-");
+				String[] split0 = split[0].split(":");
+				String[] split1 = split[1].split(":");
+				int t0 = Integer.valueOf(split0[0]);
+				int t1 = Integer.valueOf(split1[0]);
+				if(t0 >= 24){
+					t0 = t0 - 24;
+				}
+				if(t1 >= 24){
+					t1 = t1 - 24;
+				}
+				m.put("times", (t0>9?t0:("0"+t0))+":"+split0[1]+"-"+(t1>9?t1:("0"+t1))+":"+split1[1]);
 				sortMap.get(sort).add(m);
 			}
 			Collections.sort(sortList);
@@ -531,14 +557,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						Map<String, Object> tempMap = new HashMap<String, Object>();
 						List<Long> fcsjs = new ArrayList<Long>();
 						List<Long> fcsjAs = new ArrayList<Long>();
-						for(Long l : temp0.get(key)){
-							if(l < 90)
-								fcsjs.add(l);
-						}
-						for(Long l : temp1.get(key)){
-							if(l < 90)
-								fcsjAs.add(l);
-						}
+						if(temp0.containsKey(key))
+							for(Long l : temp0.get(key)){
+								if(l < 90)
+									fcsjs.add(l);
+							}
+						if(temp0.containsKey(key))
+							for(Long l : temp1.get(key)){
+								if(l < 90)
+									fcsjAs.add(l);
+							}
 						Collections.sort(fcsjs);
 						Collections.sort(fcsjAs);
 						long fcsj = 0l;
@@ -563,7 +591,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 							tempMap.put("deviation", df.format(Double.valueOf(tempMap.get("sjInterval").toString())
 									- Double.valueOf(tempMap.get("jhInterval").toString())));
 						}
-						resList.add(tempMap);
+						if(fcsjs.size() != 0 || fcsjAs.size() != 0)
+							resList.add(tempMap);
 					}
 				}
 			}
@@ -601,6 +630,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		Map<String, List<ChildTaskPlan>> cMap = new HashMap<String, List<ChildTaskPlan>>();
 		Map<String, Object> modelMap = new HashMap<String, Object>();
 		Set<Long> tsSet = new HashSet<Long>();
+		Set<Long> ttSet = new HashSet<Long>();
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
@@ -639,7 +669,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			}
 			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
+			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc,"
+					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
+					+ " from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
 					+ " and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"+where+"";
 			list = jdbcTemplate.query(sql,
@@ -652,11 +684,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
-					schedule.setBcType(rs.getString("bc_type"));
 					schedule.setBcs(rs.getInt("bcs"));
 					schedule.setBcsj(rs.getInt("bcsj"));
 					schedule.setJhlc(rs.getDouble("jhlc"));
-					schedule.setDfsj(rs.getString("dfsj"));
 					schedule.setFcsj(rs.getString("fcsj"));
 					schedule.setFcsjActual(rs.getString("fcsj_actual"));
 					schedule.setZdsj(rs.getString("zdsj"));
@@ -668,12 +698,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setRemarks(rs.getString("remarks"));
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
-					schedule.setDfAuto(rs.getBoolean("df_auto"));
-					schedule.setOnline(rs.getBoolean("online"));
-					schedule.setClZbh(rs.getString("cl_zbh"));
-					schedule.setjGh(rs.getString("j_gh"));
-					schedule.setjName(rs.getString("j_name"));
-					schedule.setStatus(rs.getInt("status"));
 					schedule.setSpId(rs.getLong("sp_id"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
@@ -726,7 +750,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			{
 				List<Map<String, String>> temp1 = new ArrayList<Map<String, String>>();
 				List<Map<String, String>> temp2 = new ArrayList<Map<String, String>>();
-				sql = "select * from bsth_c_s_sp_info where bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+				sql = "select id, lp, fcsj, xl_bm, tt_info from bsth_c_s_sp_info where bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 				if(startDate.equals(endDate)){
 					sql += " and schedule_date = '"+startDate+"'";
@@ -782,7 +806,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
-			sql = "select * from bsth_c_s_child_task order by start_date";
+			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task order by start_date";
 			cList = jdbcTemplate.query(sql,
 					new RowMapper<ChildTaskPlan>(){
@@ -798,10 +822,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					return cTask;
 				}
 			});
-			
+
 			if(model.length() != 0){
-				sql = "select sp.id from bsth_c_s_sp_info sp left join bsth_c_s_ttinfo_detail tt on sp.tt_info = tt.ttinfo and sp.xl_bm = tt.xl and sp.lp = tt.lp and sp.fcsj = tt.fcsj "
-						+ "where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+				sql = "select sp.id from "
+						+ "(select id, tt_info, xl_bm, lp, fcsj from bsth_c_s_sp_info where schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'"
+						+ " and tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks') sp"
+						+ " left join bsth_c_s_ttinfo_detail tt on sp.tt_info = tt.ttinfo and sp.xl_bm = tt.xl and sp.lp = tt.lp and sp.fcsj = tt.fcsj";
 				ttList = jdbcTemplate.query(sql,
 						new RowMapper<Map<String, Object>>(){
@@ -809,10 +835,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
 						Map<String, Object> m = new HashMap<String, Object>();
 						m.put("id", rs.getString("id"));
-						m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"0");
+//						m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"0");
 						return m;
 					}
 				});
+				
+				for(Map<String, Object> m : ttList){
+					ttSet.add(Long.valueOf(m.get("id").toString()));
+				}
 			}
 		} catch (Exception e) {
@@ -852,15 +882,21 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(schedule.getXlName()==null || schedule.getXlName().trim().length()==0)
 				continue;
 			if(model.length() != 0){
-				for(Map<String, Object> tt : ttList){
-					long id = Long.valueOf(tt.get("id").toString());
-					if(id == (long)schedule.getSpId()){
-						String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
-						if(!keyMap.containsKey(key))
-							keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-						keyMap.get(key).add(schedule);
-					}
+				if(ttSet.contains(schedule.getSpId())){
+					String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
+					if(!keyMap.containsKey(key))
+						keyMap.put(key, new ArrayList<ScheduleRealInfo>());
+					keyMap.get(key).add(schedule);
 				}
+//				for(Map<String, Object> tt : ttList){
+//					long id = Long.valueOf(tt.get("id").toString());
+//					if(id == (long)schedule.getSpId()){
+//						String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
+//						if(!keyMap.containsKey(key))
+//							keyMap.put(key, new ArrayList<ScheduleRealInfo>());
+//						keyMap.get(key).add(schedule);
+//					}
+//				}
 			}else{
 				String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
 				if(!keyMap.containsKey(key))
@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.text.DecimalFormat;
 import java.util.*;
@@ -511,57 +512,38 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	 */
 	@Override
 	public Map<String, Object> usingSingle(Map<String, Object> map) {
-		
 		// 返回值map
 		Map<String, Object> resultMap = new HashMap<String,Object>();
-		
 		try {
-			
 			// 获取线路ID
 			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
-			
 			/** 查询线路信息 @param：<lineId：线路ID> */
 			Line line = lineRepository.findOne(lineId);
-			
 			/** 查询线路信息下的站点路由信息 @param：<lineId：线路ID> */
 			List<Object[]> objects = repository.usingSingle(lineId);
-			
 			if (objects.size()>0) {
-				
 				/** 获取配置文件里的ftp登录参数 */
 				Map<String, Object> FTPParamMap = readPropertiesGetFTPParam();
-				
 				// 压缩文件名
 				String odlGzFileName = line.getLineCode() + ".txt.gz";
-				
 				// txt文件名
 				String textFileName  = line.getLineCode() + ".txt";
-				
 				// 创建一个ftp上传实例
 				FTPClientUtils clientUtils = new FTPClientUtils();
-				
 				// IP
 				String url = FTPParamMap.get("url").toString();
-				
 				// 端口
 				int port = Integer.valueOf(FTPParamMap.get("port").toString());
-				
 				// 用户名
 				String username = FTPParamMap.get("username").toString();
-				
 				// 密码
 				String password = FTPParamMap.get("password").toString();
-				
 				// 相对路径
 				String remotePath = FTPParamMap.get("remotePath").toString();
-				
 				/** 如果已存在相同行单文件名则先删除 */
 				clientUtils.deleteFtpFile(url, port, username, password, remotePath, odlGzFileName);
-				
 				clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
-				
 				String textStr = "";
-				
 				boolean tempTag = ishxType(objects);
 				if(tempTag)
@@ -575,6 +557,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				InputStream input = new ByteArrayInputStream(textStr.getBytes("gbk"));
+				// FileOutputStream fos = new FileOutputStream("test.txt");
+				/*int len = 0 ; 
+				byte[] cbuf = new byte[1024];
+				while((len = input.read(cbuf)) != -1) {
+					fos.write(cbuf, 0, len);
+				}*/
 				/** 生成txt文件，上传ftp */
 				clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
@@ -645,25 +633,23 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	 * @return String
 	 */ 
 	public String  newTextFileToFTP(List<Object[]> objects,Integer lineId) {
-		
 		// 返回值String
 		String stationRStr = "";
-		
 		// windows下的文本文件换行符
 		//String enterStr = "\r\n";
-		
 		// linux/unix下的文本文件换行符
 		String enterStr = "\r";
-		
+		int defaultZdxh = 0;
 		if(objects.size()>0) {
-			
 			for(int i = 0; i<objects.size();i++) {
-				
+				defaultZdxh ++ ;
 				// 经度
-				String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+				String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
 				// 纬度
-				String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+				String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
+				
+				Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
 				lat = "\t" +  lat;
@@ -673,23 +659,32 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				String stationMake = "";
 				if(stationMakeStr.equals("E")) {
-					
 					stationMake = "\t2";
-					
 				}else {
-					
 					stationMake ="\t1";
-					
 				}
 				// 站点序号 
-				String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				// String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				String stationNo =  String.valueOf(defaultZdxh);
 				stationNo = "\t" + stationNo;
 				// 站点编码
 				String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+				int len = stationCode.length();
+				if(len<8) {
+					int dx = 8 - len;
+					String addStr = "";
+					for(int p =0;p<dx;p++) {
+						addStr  = addStr + "0";
+					}
+					stationCode = addStr + stationCode;
+				}else if(len>8){
+					stationCode = stationCode.substring(8);
+				}
+				
 				stationCode =  "\t" +stationCode;
 				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
@@ -709,41 +704,33 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				// 限速
 				String sleepStr = "";
-				
 				// 方向
 				int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
-				
 				/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 				List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
-				
 				if(sobje.size()==1) {
-					
-					double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
-					
-					sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
-					
+					int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
+					sleepStr =  "\t" +  String.valueOf(dsleepStr);
 				}else if(sobje.size()>1){
-					
-					/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 					for(int j =0;j<sobje.size();j++) {
-						
-						String sectionName = sobje.get(j)[3].toString();
-						
-						String sectionNameA[] = sectionName.split("至");
-						
-						if(stationName.equals(sectionNameA[0])){
-							
-							/*sleepStr = sobje.get(j)[2].toString();*/
-							
-							double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
-							
-							sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
-							
+						double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+						String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
+						pointsStr = pointsStr.substring(11, pointsStr.length()-1);
+						List<Point> ps = new ArrayList<>();
+						String[] pArray = pointsStr.split(",");
+						for(int a = 0; a <pArray.length; a++) {
+							String[] tmepA = pArray[a].split(" ");
+							Point temp = new Point(Double.valueOf(tmepA[0]), Double.valueOf(tmepA[1]));
+							ps.add(temp);
+						}
+						if(GeoUtils.isInSection(ps, point)) {
+							sleepStr = "\t" + String.valueOf((int)dsleepStrt);
+							break;
 						}
-						
 					}
 				}
-				
+				if(sleepStr.equals("")) 
+					sleepStr  =  "\t" + "60";
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 			}
@@ -762,9 +749,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			for(int i = 0; i<objects.size();i++) {
 				if(Integer.valueOf(objects.get(i)[8].toString())==0) {
 					// 经度
-					String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+					String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
+					
 					// 纬度
-					String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+					String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
+					
+					Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
 					lat = "\t" +  lat;
 					// 站点类型
 					String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
@@ -779,6 +769,17 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					String stationNo = "\t" + xh;
 					// 站点编码
 					String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+					int len = stationCode.length();
+					if(len<8) {
+						int dx = 8 - len;
+						String addStr = "";
+						for(int p =0;p<dx;p++) {
+							addStr  = addStr + "0";
+						}
+						stationCode = addStr + stationCode;
+					}else if(len>8){
+						stationCode = stationCode.substring(8);
+					}
 					stationCode =  "\t" +stationCode;
 					double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
 					String tempDistc = String.valueOf((int) dis);
@@ -794,20 +795,28 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 					List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
 					if(sobje.size()==1) {
-						double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
-						sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
+						int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
+						sleepStr =  "\t" +  String.valueOf(dsleepStr);
 					}else if(sobje.size()>1){
-						/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 						for(int j =0;j<sobje.size();j++) {
-							String sectionName = sobje.get(j)[3].toString();
-							String sectionNameA[] = sectionName.split("至");
-							if(stationName.equals(sectionNameA[0])){
-								/*sleepStr = sobje.get(j)[2].toString();*/
-								double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
-								sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
+							double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+							String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
+							pointsStr = pointsStr.substring(11, pointsStr.length()-1);
+							List<Point> ps = new ArrayList<>();
+							String[] pArray = pointsStr.split(",");
+							for(int a = 0; a <pArray.length; a++) {
+								String[] tmepA = pArray[a].split(" ");
+								Point temp = new Point(Double.valueOf(tmepA[0]), Double.valueOf(tmepA[1]));
+								ps.add(temp);
+							}
+							if(GeoUtils.isInSection(ps, point)) {
+								sleepStr = "\t" + String.valueOf((int)dsleepStrt);
+								break;
 							}
 						}
 					}
+					if(sleepStr.equals("")) 
+						sleepStr  =  "\t" + "60";
 					xh++;
 					restStr = restStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 				}
@@ -8,9 +8,13 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.entity.search.CustomerSpecs;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.traffic.SKBUploadLogger;
 import com.bsth.repository.*;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.schedule.*;
+import com.bsth.repository.traffic.SKBUploadLoggerRepository;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.TrafficManageService;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
@@ -101,6 +105,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private ScheduleRealInfoRepository scheduleRealInfoRepository;
+	// 时刻表上传记录repository
+	@Autowired
+	private SKBUploadLoggerRepository skbUploadLoggerRepository;
+
 	// 运管处接口
 	private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint();
@@ -134,12 +142,19 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * 上传线路信息
 	 */
 	@Override
-	public String setXL() {
+	public String setXL(Map<String, Object> param) {
 		String result = "failure";
 		StringBuffer sBuffer = new StringBuffer();
 		try {
-			Iterator<Line> lineIterator = lineRepository.findAll().iterator();
+			Map<String,Object> map = new HashMap<String,Object>();
+			map.put("lineCode_eq", param.get("xl.lineCode_like")+"");
+			Iterator<Line> lineIterator;
 			Line line = null;
+			if(param.get("xl.lineCode_like").equals("")){
+				lineIterator = lineRepository.findAll().iterator();
+			}else {
+				line = lineRepository.findOne(new CustomerSpecs<Line>(map));
+			}
 			List<StationRoute> upStationsList = null;// 上行站点路由集
 			List<StationRoute> downStationsList = null;// 下行站点路由集
 			List<LineInformation> lineInformationsList = null;
@@ -147,14 +162,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			sBuffer.append("<Data>");
 			sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
 			sBuffer.append("<DataList>");
-			while(lineIterator.hasNext()){
-				line = lineIterator.next();
-				if(!line.getName().equals("浦江4路")){
-					continue;
-				}
-				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
+//			while(lineIterator.hasNext()){
+//				line = lineIterator.next();
+//				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
+//						|| line.getInUse() == 0){
+//					continue;
+//				}
+			if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
 						|| line.getInUse() == 0){
-					continue;
+					return result;
 				}
 				sBuffer.append("<LINE_ID>").append(line.getId()).append("</LINE_ID>");
 				sBuffer.append("<LINE_CODE>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</LINE_CODE>");
@@ -165,18 +181,24 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
 				int startId = 1;
 				startId = packagStationXml(upStationsList, sBuffer, startId);
-				// 再查下行
-				downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
-				packagStationXml(downStationsList, sBuffer, startId);
+				// 环线不查下行
+				if(line.getLinePlayType() != 1){
+					// 再查下行
+					downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
+					packagStationXml(downStationsList, sBuffer, startId);
+				}
 				sBuffer.append("</LineStationList>");
 				// 循环添加站点点位信息
 				sBuffer.append("<LinePointList>");
 				startId = 1;
 				startId = packagStationPointXml(upStationsList, sBuffer, startId);
-				packagStationPointXml(downStationsList, sBuffer, startId);
+				// 环线不查下行
+				if(line.getLinePlayType() != 1){
+					packagStationPointXml(downStationsList, sBuffer, startId);
+				}
 				sBuffer.append("</LinePointList>");
-			}
+//			}
 			sBuffer.append("</DataList>");
 			sBuffer.append("</Data>");
 			System.out.println(sBuffer.toString());
@@ -301,6 +323,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date);
 			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLDGroup(date);
 			Map<String,Object> map = new HashMap<String,Object>();
+			HashMap<String,String> paramMap;
+			HashMap<String,String> otherMap = new HashMap<String, String>();
 			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
 					//根据车辆自编号查询车牌号
@@ -347,16 +371,20 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");
 							sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
 							sf.append("<FCZDMC>"+scheduleRealInfo.getQdzName()+"</FCZDMC>");
-							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(
-									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getQdzCode()) + "</FCZDXH>");
+							// 起点站的参数
+							otherMap.put("stationMark","B");
+							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
+							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap) + "</FCZDXH>");
 							sf.append("<FCZDBM>"+scheduleRealInfo.getQdzCode()+"</FCZDBM>");
 							sf.append("<JHFCSJ>"+scheduleRealInfo.getFcsj()+"</JHFCSJ>");
 							sf.append("<DFSJ>"+scheduleRealInfo.getDfsj()+"</DFSJ>");
 							sf.append("<SJFCSJ>"+scheduleRealInfo.getFcsjActual()+"</SJFCSJ>");
 							sf.append("<FCZDLX>"+""+"</FCZDLX>");
 							sf.append("<DDZDMC>"+scheduleRealInfo.getZdzName()+"</DDZDMC>");
-							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(
-									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getZdzCode()) +"</DDZDXH>");
+							// 终点站的参数
+							otherMap.put("stationMark","E");
+							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
+							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap) +"</DDZDXH>");
 							sf.append("<DDZDBM>"+scheduleRealInfo.getZdzCode()+"</DDZDBM>");
 							sf.append("<JHDDSJ>"+scheduleRealInfo.getZdsj()+"</JHDDSJ>");
 							sf.append("<SJDDSJ>"+scheduleRealInfo.getZdsjActual()+"</SJDDSJ>");
@@ -650,6 +678,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			List<SchedulePlanInfo> schedulePlanList = schedulePlanInfoRepository.findLineScheduleBc(tomorrow);
 			int j = 0; // 初始化标识
 			if(schedulePlanList != null ){
+				HashMap<String,String> paramMap;
+				HashMap<String,String> otherMap = new HashMap<String, String>();
 				int size = schedulePlanList.size();
 				for (int i = 0; i < size; i++) {
 					schedulePlanInfo = schedulePlanList.get(i);
@@ -676,12 +706,16 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBuffer.append("<SJGH>").append(schedulePlanInfo.getjGh()).append("</SJGH>");
 						sBuffer.append("<SXX>").append(schedulePlanInfo.getXlDir()).append("</SXX>");
 						sBuffer.append("<FCZDMC>").append(schedulePlanInfo.getQdzName()).append("</FCZDMC>");
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzCode())).append("</ZDXH>");
+						// 起点站的参数
+						otherMap.put("stationMark","B");
+						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
-						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzCode())).append("</DDXH>");
+						// 起点站的参数
+						otherMap.put("stationMark","E");
+						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
 								.append("</JHDDSJ>");
 						sBuffer.append("</BC>");
@@ -737,16 +771,20 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			String[] idArray = ids.split(",");
 			StringBuffer sBufferA;
 			StringBuffer sBufferB;
+			// 上传的时刻表集合
+			List<TTInfo> ttinfoList = new ArrayList<>();
 			TTInfo ttInfo;
 			TTInfoDetail ttInfoDetail;
 			Iterator<TTInfoDetail> ttInfoDetailIterator;
 			HashMap<String,Object> param = new HashMap<String, Object>();
-			String lineCode ;
 			sBuffer.append("<SKBs>");
+			HashMap<String,String> paramMap;
+			HashMap<String,String> otherMap = new HashMap<String, String>();
 			for (int i = 0; i < idArray.length; i++) {
 				ttInfo = ttInfoRepository.findOne(Long.valueOf(idArray[i]));
 				if(ttInfo == null)
 					continue;
+				ttinfoList.add(ttInfo); // 保存时刻表
 				param.put("ttinfo.id_eq", ttInfo.getId());
 				ttInfoDetailIterator = ttInfoDetailRepository.findAll(new CustomerSpecs<TTInfoDetail>(param),
 						new Sort(Direction.ASC, "xlDir")).iterator();
@@ -774,7 +812,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							sBufferA.append("<JHYYLC>").append(ttInfoDetail.getJhlc()).append("</JHYYLC>");
 							sBuffer.append(sBufferA).append(sBufferB);
 						}
-						lineCode = ttInfoDetail.getXl().getLineCode();
 						// 如果发车时间格式错误，忽略此条
 						if(changeTimeFormat(ttInfoDetail) == null){
 							continue;
@@ -783,12 +820,16 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
 						sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
 						sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>");
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationCod())).append("</ZDXH>");
+						// 起点站的参数
+						otherMap.put("stationMark","B");
+						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>");
-						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationCod())).append("</DDXH>");
+						// 起点站的参数
+						otherMap.put("stationMark","E");
+						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBuffer.append("</BC>");
 					}
@@ -799,6 +840,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			sBuffer.append("</SKBs>");
 			if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
 				result = "success";
+				SKBUploadLogger skbUploadLogger ;
+				SysUser user = SecurityUtils.getCurrentUser();
+				// 保存时刻表上传记录
+				for(TTInfo ttInfo1 : ttinfoList){
+					skbUploadLogger = new SKBUploadLogger();
+					skbUploadLogger.setTtInfo(ttInfo1);
+					skbUploadLogger.setUser(user);
+					skbUploadLoggerRepository.save(skbUploadLogger);
+				}
 			}
 		} catch (Exception e) {
 			logger.error("setSKB:", e);
@@ -1136,6 +1186,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	private int packagStationXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
 		int size = stationsList.size();
 		StationRoute srRoute;
+		HashMap<String,String> paraMap;
 		String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
 		for (int i = 0; i < size; i++) {
 			srRoute = stationsList.get(i);
@@ -1147,10 +1198,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			}else{
 				zdlx = "2";
 			}
+			paraMap = packageYgcStationNumParam(srRoute,null);
 			sBuffer.append("<Station>");
-			sBuffer.append("<STATION_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</STATION_ID>");
+			sBuffer.append("<STATION_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</STATION_ID>");
 			sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
-			sBuffer.append("<STATION_NO>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</STATION_NO>");
+			sBuffer.append("<STATION_NO>").append(i).append("</STATION_NO>");
 			sBuffer.append("<STATION_CODE>").append(srRoute.getStationCode()).append("</STATION_CODE>");
 			sBuffer.append("<STATION_NAME>").append(srRoute.getStationName()).append("</STATION_NAME>");
 			sBuffer.append("<STATION_LON>").append(srRoute.getStation().getgLonx()).append("</STATION_LON>");
@@ -1173,6 +1225,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	private int packagStationPointXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
 		int size = stationsList.size();
 		StationRoute srRoute;
+		HashMap<String,String> paraMap;
 		String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
 		for (int i = 0; i < size; i++) {
 			srRoute = stationsList.get(i);
@@ -1184,8 +1237,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			}else{
 				zdlx = "2";
 			}
+			paraMap = packageYgcStationNumParam(srRoute,null);
 			sBuffer.append("<Point>");
-			sBuffer.append("<POINT_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</POINT_ID>");
+			sBuffer.append("<POINT_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</POINT_ID>");
 			sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
 			sBuffer.append("<POINTLON>").append(srRoute.getStation().getgLonx()).append("</POINTLON>");
 			sBuffer.append("<POINTLAT>").append(srRoute.getStation().getgLaty()).append("</POINTLAT>");
@@ -1196,15 +1250,94 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
-	 *
-	 * @param lineCode 线路编码
-	 * @param direction 线路方向
-	 * @param stationCode 让点名称
+	 *  获取运管处站点序号
+	 * @param map
 	 * @return 运管处站点序号
 	 */
-	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationCode){
-		Integer number = 0;
-		number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationCode);
+	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(HashMap<String,String> map){
+		// 线路编码
+		String lineCode = map.get("lineCode");
+		// 线路走向 0：上行  1：下行
+		String direction = map.get("direction");
+		// 站点编码
+		String stationCode = map.get("stationCode");
+		// 站点类型：B：起点站 Z：中途站 E：终点站 T：停车场
+		String stationMark = map.get("stationMark");
+		String[] marks = null;
+		// 起点站，先从起点找，找不到再从中途站找，最后从终点找
+		if(stationMark.equals("B")){
+			marks= new String[]{"B","Z","E"};
+		}else if(stationMark.equals("E")){// 终点站相反
+			marks= new String[]{"E","Z","B"};
+		}else if(stationMark.equals("Z")){
+			marks= new String[]{"Z"};
+		}
+		Integer number = null;
+		for (int i = 0 ;i < marks.length ; i ++){
+			number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationCode+"_"+marks[i]);
+			if(number != null){
+				break;
+			}
+		}
 		return number == null ? 0 : number;
 	}
+
+	/**
+	 * 封装查询站序条件
+	 * @param obj
+	 * @return
+	 */
+	private HashMap packageYgcStationNumParam(Object obj,HashMap<String,String> otherParam){
+		HashMap<String,String> map = new HashMap<String,String>();
+		String lineCode = "",direction = "",stationCode = "",stationMark = "";
+		// 站点路由
+		if(obj instanceof StationRoute){
+			StationRoute sr = (StationRoute)obj;
+			lineCode = sr.getLineCode();
+			direction = String.valueOf(sr.getDirections());
+			stationCode = sr.getStationCode();
+			stationMark = sr.getStationMark();
+		}else if(obj instanceof ScheduleRealInfo){ //实际排班计划明细。
+			ScheduleRealInfo sri = (ScheduleRealInfo)obj;
+			lineCode = sri.getXlBm();
+			direction = sri.getXlDir();
+			if(otherParam != null && otherParam.get("stationMark") != null){
+				stationMark = otherParam.get("stationMark");
+				if(stationMark.equals("B")){ // 起点站
+					stationCode = sri.getQdzCode();
+				}else if(stationMark.equals("E")){ // 终点站
+					stationCode = sri.getZdzCode();
+				}
+			}
+		}else if(obj instanceof SchedulePlanInfo){ //排班计划明细
+			SchedulePlanInfo spi = (SchedulePlanInfo)obj;
+			lineCode = spi.getXlBm();
+			direction = spi.getXlDir();
+			if(otherParam != null && otherParam.get("stationMark") != null){
+				stationMark = otherParam.get("stationMark");
+				if(stationMark.equals("B")){ // 起点站
+					stationCode = spi.getQdzCode();
+				}else if(stationMark.equals("E")){ // 终点站
+					stationCode = spi.getZdzCode();
+				}
+			}
+		}else if(obj instanceof TTInfoDetail){ //时刻表明细
+			TTInfoDetail ttid = (TTInfoDetail)obj;
+			lineCode = ttid.getXl().getLineCode();
+			direction = ttid.getXlDir();
+			if(otherParam != null && otherParam.get("stationMark") != null){
+				stationMark = otherParam.get("stationMark");
+				if(stationMark.equals("B")){ // 起点站
+					stationCode = ttid.getQdz().getStationCod();
+				}else if(stationMark.equals("E")){ // 终点站
+					stationCode = ttid.getZdz().getStationCod();
+				}
+			}
+		}
+		map.put("lineCode",lineCode);// 站点编码
+		map.put("direction",direction); // 上下行
+		map.put("stationCode",stationCode); // 站点编号
+		map.put("stationMark",stationMark); // 站点类型
+		return map;
+	}
 }
@@ -19,7 +19,7 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	String checkJsy(Map<String, Object> map);
-	List<Ylb> oilListMonth(String line,String date);
+	List<Ylb> oilListMonth(String line,String date,String type);
 	List<Ylb> listYlb(Map<String, Object> map);
 	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
@@ -315,7 +315,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				 return t;
 			 }
 		});
-		List<Ylxxb> list= ylxxbRepository.checkYlxx(rq, gsdm);
+		/*List<Ylxxb> list= ylxxbRepository.checkYlxx(rq, gsdm);
 		for (int i = 0; i < yList.size(); i++) {
 			Ylxxb t=yList.get(i);
 			Double zjzl=0.0;
@@ -327,7 +327,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 			}
 			t.setZjzl(zjzl);
-		}
+		}*/
 		return yList;
 	}
@@ -31,6 +31,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
@@ -44,6 +45,7 @@ import com.bsth.service.oil.YlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.util.Arith;
 import com.bsth.util.BatchSaveUtils;
+import com.bsth.util.ReportUtils;
 import com.github.abel533.echarts.code.Y;
 @Service
@@ -100,7 +102,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// TODO Auto-generated method stub
 			Map<String, Object> newMap=new HashMap<String,Object>();
 			//当天YLB信息
-			List<Ylb> ylList=repository.obtainYl(rq,"","","","","nbbm");
+//			List<Ylb> ylList=repository.obtainYl(rq,"","","","","nbbm");
+			List<Ylb> ylList=this.listOrderBy(rq,"","","","","nbbm");
 			//当天YLXXB信息
 	//		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
 			//前一天所有车辆最后进场班次信息
@@ -258,7 +261,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			DecimalFormat df = new DecimalFormat("#.00");
 			// TODO Auto-generated method stub
 			// 当天YLB信息
-			List<Ylb> ylList = repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+//					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 前一天所有车辆最后进场班次信息
@@ -376,18 +380,42 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())!=null){
 					}else{
-						// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
-						for (int j = 0; j < ylxxList.size(); j++) {
-							Ylxxb ylxxb = ylxxList.get(j);
+						boolean fage2=false;
+						for (int i = 0; i < ylxxList.size(); i++) {
+							Ylxxb ylxxb = ylxxList.get(i);
 							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
-									&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
-								jzl =Arith.add(jzl, ylxxb.getJzl());
+									&& ylxxb.getJylx()==1) {
+								if(ylxxb.getJzl()>0){
+									fage2=true;
+								}
+								
 							}
 						}
-						ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+						//车辆的加注量如果有任工干预，略接口过来 数据
+						if(fage2){
+							// 把当天手工输入的的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断,加油类型为1）
+							for (int j = 0; j < ylxxList.size(); j++) {
+								Ylxxb ylxxb = ylxxList.get(j);
+								if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+										&& map.get("jGh").toString().equals(ylxxb.getJsy())
+										&& ylxxb.getJylx()==1) {
+									jzl =Arith.add(jzl, ylxxb.getJzl());
+								}
+							}
+							ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+						}else{
+							// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+							for (int j = 0; j < ylxxList.size(); j++) {
+								Ylxxb ylxxb = ylxxList.get(j);
+								if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+										&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
+									jzl =Arith.add(jzl, ylxxb.getJzl());
+								}
+							}
+							ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+						}
+						
 					}
-				
-
 					t.setJzl(jzl);
 					t.setNbbm(map.get("clZbh").toString());
 					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
@@ -482,13 +510,15 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Ylb> ylbList =new ArrayList<Ylb>();
 			List<Ylb> ylbLists =new ArrayList<Ylb>();
 			List<Ylb> iterator2=new ArrayList<Ylb>();
-			if(xlbm.equals("")){
-				ylbLists=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-				iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-			}else{
-				ylbLists=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-				iterator2=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-			}
+//			if(xlbm.equals("")){
+				ylbLists=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+//						repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+				iterator2=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+//						repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+//			}else{
+//				ylbLists=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+//				iterator2=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+//			}
 			// 从排班表中计算出行驶的总里程
@@ -602,8 +632,14 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									if(j==iterator2.size()-1){
 										ylxs=czyl;
 									}else{
-										l=Math.round(nextJzyl);
-										ylxs=l*100/100;
+//										l=Math.round(nextJzyl);
+//										ylxs=l*100/100;
+										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
+											l=Math.round(nextJzyl);
+											ylxs=l*100/100;
+										}else{
+											ylxs=czyl;
+										}
 									}
 									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
@@ -833,7 +869,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			}
 //			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
 			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, gsbm, fgsbm, xlbm, nbbm);
-			List<Ylb> ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+			List<Ylb> ylbList=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+//					repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
 			for (int i = 0; i < ylxxbList.size(); i++) {
 				Boolean fage=true;
@@ -913,7 +950,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	@Override
-	public List<Ylb> oilListMonth(String line, String date) {
+	public List<Ylb> oilListMonth(String line, String date, String type) {
 		String date2=date.substring(0, 8)+"01";
 		String lineStr="";
 		if(line !=null && !line.equals("")){
@@ -943,6 +980,34 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			                return s;  
 			            }  
 					});  
+		
+		if(type != null && type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			
+			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
+			for(Ylb ylb : list){
+				Map<String, Object> m = new HashMap<String, Object>();
+				m.put("nbbm", ylb.getNbbm()!=null?ylb.getNbbm():"");
+				m.put("rq", ylb.getRq()!=null?sdfMonth.format(ylb.getRq()):"");
+				m.put("jzyl", ylb.getJzyl()!=null?ylb.getJzyl():"");
+				mapList.add(m);
+			}
+			
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(mapList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/oilListMonth.xls",
+						path+"export/月存油报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return list;
 	}
@@ -1278,8 +1343,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				map.put("nbbm_eq", nbbm_eq);
 				map.put("rq_eq", rq_eq);
-				List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
+				List<Ylb> iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
 						ylb.getNbbm(),"jcsx");
+//						repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
+//						ylb.getNbbm(),"jcsx");
 				DecimalFormat df = new DecimalFormat("#.00");
 				Double zyl = 0.0;
 				Double nextJzyl = 0.0;
@@ -1395,7 +1462,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		t.setCreatetime(new Date());
 		String[] jhsjStr = jhsj.split(":");
 		long fcsjL= Long.parseLong(jhsjStr[0])*60+Long.parseLong(jhsjStr[1]);
-		List<Ylb> list=repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+		List<Ylb> list=this.listOrderBy(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+//				repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
 		int jcsx=1;
 		if(list.size()>0){
 			for (int i = 0; i < list.size(); i++) {
@@ -1439,4 +1507,43 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		}
 		return maps;
 	}
+	
+	public  List<Ylb> listOrderBy(String rq,String gsdm,
+			String fgsdm,String xlbm,String nbbm,
+			String px) {
+		// TODO Auto-generated method stub
+		String sql="SELECT * FROM bsth_c_ylb  "
+				+ " where to_days('"+rq+"')=to_days(rq) and ssgsdm like '%"+gsdm+"%' "
+				+ " and fgsdm like '%"+fgsdm+"%'";
+		if(xlbm.equals("")){
+			sql+= " and xlbm like '%"+xlbm+"%' ";
+		}else{
+			sql+= " and xlbm = '"+xlbm+"' ";
+		}
+				
+		sql += "and nbbm like '%"+nbbm+"%' order by "+px+" asc ";
+		
+		List<Ylb> list = jdbcTemplate.query(sql, new RowMapper<Ylb>() {
+			@Override
+			public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Ylb y = new Ylb();
+				y.setId(arg0.getInt("id"));
+				return y;
+			}
+		});
+		List<Ylb> lists=new ArrayList<Ylb>();
+		List<Ylb> ylbLists=repository.obtainYl(rq,gsdm,fgsdm,xlbm,nbbm,"jcsx");
+		for (int i = 0; i < list.size(); i++) {
+			Ylb t=list.get(i);
+			for (int j = 0; j < ylbLists.size(); j++) {
+				Ylb t2=ylbLists.get(j);
+				if(t.getId().intValue()==t2.getId().intValue()){
+					lists.add(t2);
+					break;
+				}
+			}
+		}
+		
+		return lists;
+	}
 }
@@ -2,6 +2,7 @@ package com.bsth.service.realcontrol;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
@@ -104,7 +105,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> accountPx(String line,String date,String code,String xlName, String px);
-	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code, String type);
+	List<SchEditInfoDto> correctForm(String line,String date,String lpName,String code, String type);
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
@@ -16,6 +16,7 @@ import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.schedule.edit_logs.FormLogger;
 import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
 import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
@@ -58,9 +59,11 @@ import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import org.mvel2.optimizers.impl.refl.nodes.ArrayLength;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
@@ -1904,7 +1907,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return listMap;
     }
-    @Override
+   /* @Override
     public List<ScheduleRealInfo> correctForm(String line, String startDate,
                                               String endDate, String lpName, String code, String type) {
         List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line, startDate, endDate, lpName, code);
@@ -1959,8 +1962,93 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         return list;
+    }*/
+    
+    @Override
+    public List<SchEditInfoDto> correctForm(String line,String date,
+    		String lpName,String code, String type) {
+       
+//        var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班', 
+//    	'CXZX': '撤销执行', 'CXSF': '撤销实发', 'SFTZ': '实发调整', 'TZRC': '调整人车'};
+    	Map<String, Object> map=new HashMap<String,Object>();
+    	map.put("DFTZ", "待发调整");
+    	map.put("FCXXWT", "发车信息微调");
+    	map.put("JHLB", "计划烂班");
+    	map.put("CXLB", "撤销烂班");
+    	map.put("CXZX","撤销执行");
+    	map.put("CXSF", "撤销实发");
+    	map.put("SFTZ", "实发调整");
+    	map.put("TZRC", "调整人车");
+    	
+    	String cont = "";
+         cont = " and xl_bm ='"+line +"'";
+         if(!lpName.equals("")){
+        	 cont +=" and lp_name = '"+lpName+"'";
+         }
+         if(!code.equals("")){
+        	 cont +=" and cl_zbh ='"+code+"'";
+         }
+         String sql = "select t1.*, "
+         		+ "t2.fcsj,t2.lp_name,t2.cl_zbh,t2.j_gh,t2.j_name,"
+         		+ "t2.xl_dir,t2.real_exec_date from (select * from "
+         		+ "logger_sch_modify where rq=? and line_code=? )"
+         		+ " t1 INNER JOIN bsth_c_s_sp_info_real t2 on "
+         		+ "t1.sch_id=t2.id where 1=1 " + cont;
+
+         List<SchEditInfoDto> list = jdbcTemplate.query(sql, 
+        		 new BeanPropertyRowMapper(SchEditInfoDto.class),date, line);
+         List<SchEditInfoDto> lists=new ArrayList<SchEditInfoDto>();
+         for (int i = 0; i < list.size(); i++) {
+        	 SchEditInfoDto t=list.get(i);
+        	 if(map.get(t.getType())!=null){
+        		 t.setType2(t.getTimeStr()+":"+map.get(t.getType()).toString());
+        	 }else{
+        		 t.setType2("");
+        	 }
+        	 boolean fage=true;
+        	 for (int j = 0; j < lists.size(); j++) {
+				SchEditInfoDto s=lists.get(j);
+				if(s.getSchId()==t.getSchId()){
+					s.setType2(s.getType2()+" "+t.getType2());
+					fage=false;
+				}
+			}
+        	 if(fage){
+        		 lists.add(t);
+        	 }
+		 }
+         
+         if (type != null && type.length() != 0 && type.equals("export")) {
+             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                     sdfSimple = new SimpleDateFormat("yyyyMMdd");
+             List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+             Map<String, Object> m = new HashMap<String, Object>();
+             m.put("dates",date);
+             ReportUtils ee = new ReportUtils();
+             List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+             for (SchEditInfoDto d : lists) {
+            	 Map<String, Object> tempMap = new HashMap<String, Object>();
+            	 tempMap.put("lpName", d.getLpName());
+            	 tempMap.put("clZbh", d.getClZbh());
+            	 tempMap.put("jName", d.getjName()+"/"+d.getjGh());
+            	 tempMap.put("fcsj", d.getFcsj());
+            	 tempMap.put("type", d.getType2());
+                 tempList.add(tempMap);
+             }
+             try {
+                 listI.add(tempList.iterator());
+                 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                 ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
+                         path + "export/修正报表" + date+ ".xls");
+             } catch (Exception e) {
+                 // TODO: handle exception
+                 e.printStackTrace();
+             }
+//             Map<String, Object> maps = tempList.get(tempList.size() - 1);
+         }
+        return lists;
     }
-
     @Override
     public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
                                                    String lpName, String date, String line) {
@@ -3267,26 +3355,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             yesterdayDataList.get(x).put("totalKilometers", zlc);
         }
+        List<Map<String, Object>> yesterdayDataLists = new ArrayList<Map<String, Object>>();
+
         for (int i = 0; i < yesterdayDataList.size(); i++) {
         	Map<String, Object> map=yesterdayDataList.get(i);
         	 Double zlc=map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString());
-        	 if(zlc<=0){
-        		 yesterdayDataList.remove(map);
+        	 if(zlc>0){
+        		 yesterdayDataLists.add(map);
         	 }
         }
         //增加顺序号
-        for (int i = 0; i < yesterdayDataList.size(); i++) {
+        for (int i = 0; i < yesterdayDataLists.size(); i++) {
             if (i == 0) {
-                yesterdayDataList.get(i).put("seqNumber", 1);
+            	yesterdayDataLists.get(i).put("seqNumber", 1);
             } else {
-                if (yesterdayDataList.get(i - 1).get("clZbh").equals(yesterdayDataList.get(i).get("clZbh"))) {
-                    yesterdayDataList.get(i).put("seqNumber", 1 + (int) yesterdayDataList.get(i - 1).get("seqNumber"));
+                if (yesterdayDataLists.get(i - 1).get("clZbh").equals(yesterdayDataLists.get(i).get("clZbh"))) {
+                	yesterdayDataLists.get(i).put("seqNumber", 1 + (int) yesterdayDataLists.get(i - 1).get("seqNumber"));
                 } else {
-                    yesterdayDataList.get(i).put("seqNumber", 1);
+                	yesterdayDataLists.get(i).put("seqNumber", 1);
                 }
             }
         }
-        return yesterdayDataList;
+        return yesterdayDataLists;
     }
     /**
@@ -239,7 +239,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						}
 					}else{
 						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-						if(!childTaskPlans.isEmpty()){
+						if(childTaskPlans.isEmpty()){
 							double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
 							double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
 							double zjlc=Arith.sub(jhlc, jhlcOrig);
@@ -720,36 +720,40 @@ public class ReportServiceImpl implements ReportService{
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<Map<String, Object>> list2 = keyMap.get(key);
 			List<Integer> cjs = new ArrayList<Integer>();
-			int sxsj = 0, xxsj = 0, zcj = 0, tssj = 0;
-			int sxbc = 0, xxbc = 0;
-			int temp = 24*60+1;
+			int sxsj = 0, xxsj = 0, sxtssj = 0, xxtssj = 0;
+			int sxbc = 0, xxbc = 0, sxtsbc = 0, xxtsbc = 0;
+			int temp = 24*60+1, zcj = 0;
 			boolean ists = false;
 			for(Map<String, Object> m : list2){
 				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){
+					temp = fcsj;
+					ists = false;
+				}
 				if(xlDir == 0){
 					sxsj += bcsj;
 					sxbc ++;
+					if(ists){
+						sxtssj += fcsj - temp;
+						sxtsbc++;
+					}
 				} else {
 					xxsj += bcsj;
 					xxbc ++;
-				}
-				if(temp >= fcsj){
-					temp = fcsj;
-					ists = false;
-				} else {
 					if(ists){
-						tssj += fcsj - temp;
-						ists = false;
-					} else {
-						cjs.add(fcsj - temp);
+						xxtssj += fcsj - temp;
+						xxtsbc++;
 					}
+				}
+				if(temp < fcsj){
+					cjs.add(fcsj - temp);
 					temp = fcsj;
-					if(m.get("ists").equals("1")){
-						ists = true;
-					}
+				}
+				if(m.get("ists").toString().trim().equals("1")){
+					ists = true;
 				}
 			}
 			Collections.sort(cjs);
@@ -757,12 +761,14 @@ public class ReportServiceImpl implements ReportService{
 				zcj += i;
 			}
 			tempMap.put("sjd", key);
-			tempMap.put("sxsj", sxsj / sxbc);
-			tempMap.put("xxsj", xxsj / xxbc);
-			tempMap.put("fqsj", (sxsj + xxsj) / list2.size());
+			tempMap.put("sxsj", sxbc != 0 ? sxsj / sxbc : "0");
+			tempMap.put("xxsj", xxbc != 0 ? xxsj / xxbc : "0");
+			tempMap.put("sxtssj", sxtsbc != 0 ? sxtssj / sxtsbc : "0");
+			tempMap.put("xxtssj", xxtsbc != 0 ? xxtssj / xxtsbc : "0");
+			tempMap.put("fqsj", Integer.valueOf(tempMap.get("sxsj").toString()) + Integer.valueOf(tempMap.get("xxsj").toString())
+						+ Integer.valueOf(tempMap.get("sxtssj").toString()) + Integer.valueOf(tempMap.get("xxtssj").toString()));
 			tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
 			tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
-			tempMap.put("tssj", tssj);
 			maps.put(key, tempMap);
 		}
 		newList.add(maps.get("(首)——6:30"));
@@ -920,7 +926,7 @@ public class ReportServiceImpl implements ReportService{
 				} else {
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-					if (scheduleRealInfo.getStatus() == -1) {
+					/*if (scheduleRealInfo.getStatus() == -1) {
 						while (it.hasNext()) {
 							ChildTaskPlan childTaskPlan = it.next();
 							if (childTaskPlan.isDestroy()) {
@@ -947,7 +953,7 @@ public class ReportServiceImpl implements ReportService{
 							}
 						}
-					}else{
+					}else{*/
 						while (it.hasNext()) {
 							ChildTaskPlan childTaskPlan = it.next();
 							if (childTaskPlan.isDestroy()) {
@@ -974,7 +980,7 @@ public class ReportServiceImpl implements ReportService{
 							}
 						}
-					}
+//					}
 				}
 			}
@@ -4,11 +4,9 @@ import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.BaseRepository;
 import com.bsth.service.schedule.BService;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -32,10 +30,6 @@ public class BServiceImpl&lt;T, ID extends Serializable&gt; implements BService&lt;T, ID&gt;
     @Value("${hibernate.jdbc.batch_size}")
     private int batchSize;
-    @Autowired
-    @Qualifier(value = "dataToolsServiceImpl")
-    private DataToolsService dataToolsService;
-
     /** 日志记录器 */
     protected Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -516,6 +516,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String endDate = map.get("endDate").toString();
 		String model = map.get("model").toString();
 		String type = map.get("type").toString();
+		String bcType = map.get("bcType").toString();
 		if(startDate.length() == 0){
 			startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
@@ -533,7 +534,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				sql += " and gs_bm like '%"+company+"%' and fgs_bm like '%"+subCompany+"%'";
 //			}
 			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			
+			if(Integer.valueOf(bcType) == 1){
+				sql += " and bc_type != 'region'";
+			} else if(Integer.valueOf(bcType) == 2){
+				sql += " and bc_type = 'region'";
+			}
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
@@ -798,6 +803,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String line = map.get("line").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
+		String bcType = map.get("bcType").toString();
 		String nbbm = map.get("nbbm").toString();
 		String type = map.get("type").toString();
@@ -824,6 +830,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				sql += " and gs_bm like '%"+company+"%' and fgs_bm like '%"+subCompany+"%'";
 //			}
 			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			if(bcType.trim().equals("1")){
+				sql += " and bc_type != 'region'";
+			} else if(bcType.trim().equals("2")){
+				sql += " and bc_type = 'region'";
+			}
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -1180,8 +1191,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 	@Override
 	public List<Map<String, Object>> firstAndLastBus(Map<String, Object> map) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		NumberFormat nf = NumberFormat.getNumberInstance();
+		nf.setMinimumFractionDigits(2);
+		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
@@ -1190,151 +1204,173 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String type = map.get("type").toString();
 		if(date.length() == 0)
-			date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+			date = sdf.format(new Date());
-		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line, date);
+		try {
+			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
+					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
+					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'"
+					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			if(line.length() != 0)
+				sql += " and xl_bm = '"+line+"'";
+			if(company.length() != 0)
+				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+			
+			list = jdbcTemplate.query(sql,
+					new RowMapper<ScheduleRealInfo>(){
+				@Override
+				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
+					ScheduleRealInfo schedule = new ScheduleRealInfo();
+					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setRealExecDate(rs.getString("real_exec_date"));
+					schedule.setXlName(rs.getString("xl_name"));
+					schedule.setFcsj(rs.getString("fcsj"));
+					schedule.setFcsjActual(rs.getString("fcsj_actual"));
+					schedule.setZdsj(rs.getString("zdsj"));
+					schedule.setZdsjActual(rs.getString("zdsj_actual"));
+					schedule.setQdzName(rs.getString("qdz_name"));
+					schedule.setZdzName(rs.getString("zdz_name"));
+					schedule.setXlDir(rs.getString("xl_dir"));
+					schedule.setStatus(rs.getInt("status"));
+					schedule.setGsName(rs.getString("gs_name"));
+					schedule.setFgsName(rs.getString("fgs_name"));
+					
+					int startOpt = 0;
+					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
+						String[] split = rs.getString("start_opt").split(":");
+						startOpt = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+					}
+					
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
+					if(schedule.getFcsj() != null){
+						String[] split = schedule.getFcsj().split(":");
+						int fcsj = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						if(fcsj < startOpt)
+							fcsj += 1440;
+						schedule.setFcsjT((long)fcsj);
+					}
+					if(schedule.getFcsjActual() != null){
+						String[] split = schedule.getFcsjActual().split(":");
+						int fcsjA = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						if(fcsjA < startOpt || !schedule.getRealExecDate().equals(schedule.getScheduleDateStr()))
+							fcsjA += 1440;
+						schedule.setFcsjActualTime((long)fcsjA);
+					}
+					
+					return schedule;
+				}
+			});
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
-		for(ScheduleRealInfo schedule : list){
-			if(schedule.getBcType().equals("in") || schedule.getBcType().equals("out") || schedule.getBcType().equals("ldks"))
-				continue;
-			if(schedule.getStatus() == -1){
-				continue;
-			}
-			String key = schedule.getXlName();
-			if(key == null || key.trim().length() == 0)
-				continue;
-			if(!keyMap.containsKey(key))
-				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-			keyMap.get(key).add(schedule);
+		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
+		String companyName = "", subCompanyName = "";
+		
+		for(ScheduleRealInfo s : list){
+			String xlName = s.getXlName();
+			if(!keyMap.containsKey(xlName))
+				keyMap.put(xlName, new ArrayList<ScheduleRealInfo>());
+			keyMap.get(xlName).add(s);
+			if(companyName.length()==0&&s.getGsName()!=null&&s.getGsName().trim().length()!=0)
+				companyName = s.getGsName();
+			if(subCompanyName.length()==0&&s.getFgsName()!=null&&s.getFgsName().trim().length()!=0)
+				subCompanyName = s.getFgsName();
 		}
-		for(String key : keyMap.keySet()){
+		
+		for(String xlName : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
-			Map<Long, ScheduleRealInfo> temp0 = new HashMap<Long, ScheduleRealInfo>();
-			List<Long> longList0 = new ArrayList<Long>();
-			Map<Long, ScheduleRealInfo> temp1 = new HashMap<Long, ScheduleRealInfo>();
-			List<Long> longList1 = new ArrayList<Long>();
-			String companyName = "", subCompanyName = "";
-			for(ScheduleRealInfo schedule : keyMap.get(key)){
-				if(schedule.getFcsjActual() == null || schedule.getFcsjActual().trim().length() == 0){
-					continue;
-				}
-				if(schedule.getGsName() != null && companyName.length() == 0)
-					companyName = schedule.getGsName();
-				if(schedule.getFgsName() != null && subCompanyName.length() == 0)
-					subCompanyName = schedule.getFgsName();
-				String[] split = schedule.getFcsj().split(":");
-				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-				schedule.setFcsjT(min);
-				if(schedule.getXlDir().equals("0")){
-					temp0.put(min, schedule);
-					longList0.add(min);
-				} else {
-					temp1.put(min, schedule);
-					longList1.add(min);
+			tempMap.put("date", date.substring(5));
+			tempMap.put("line", xlName);
+			List<Long> up1 = new ArrayList<Long>();
+			List<Long> up2 = new ArrayList<Long>();;
+			List<Long> dn1 = new ArrayList<Long>();
+			List<Long> dn2 = new ArrayList<Long>();
+			Map<Long, ScheduleRealInfo> up1Map = new HashMap<Long, ScheduleRealInfo>();
+			Map<Long, ScheduleRealInfo> up2Map = new HashMap<Long, ScheduleRealInfo>();
+			Map<Long, ScheduleRealInfo> dn1Map = new HashMap<Long, ScheduleRealInfo>();
+			Map<Long, ScheduleRealInfo> dn2Map = new HashMap<Long, ScheduleRealInfo>();
+			for(ScheduleRealInfo s : keyMap.get(xlName)){
+				if(s.getXlDir().equals("0")){
+					up1.add(s.getFcsjT());
+					up2.add(s.getFcsjActualTime());
+					up1Map.put(s.getFcsjT(), s);
+					up2Map.put(s.getFcsjActualTime(), s);
+				} else if(s.getXlDir().equals("1")){
+					dn1.add(s.getFcsjT());
+					dn2.add(s.getFcsjActualTime());
+					dn1Map.put(s.getFcsjT(), s);
+					dn2Map.put(s.getFcsjActualTime(), s);
 				}
 			}
-			
-			if(longList0.size() == 0 && longList1.size() == 0){
-				continue;
-			}
-			
-			if(longList0.size() != 0){
-				Collections.sort(longList0);
-				ScheduleRealInfo shouban0 = temp0.get(longList0.get(0));
-				ScheduleRealInfo moban0 = temp0.get(longList0.get(longList0.size() - 1));
-				tempMap.put("qdzFirst0", shouban0.getQdzName());
-				tempMap.put("jhfcFirst0", shouban0.getFcsj());
-				tempMap.put("qdzLast0", moban0.getQdzName());
-				tempMap.put("jhfcLast0", moban0.getFcsj());
-				if(shouban0.getFcsjActual() != null){
-					String[] split = shouban0.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]); 
-					long delay = shouban0.getFcsjT() - min;
-					tempMap.put("sjfcFirst0", shouban0.getFcsjActual());
-					if(delay > 0)
-						tempMap.put("delayFirst0", "+" + delay);
-					else
-						tempMap.put("delayFirst0", delay);
-				} else {
-					tempMap.put("sjfcFirst0", "/");
-					tempMap.put("delayFirst0", "/");
-				}
-				if(moban0.getFcsjActual() != null){
-					String[] split = moban0.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-					long delay = moban0.getFcsjT() - min;
-					tempMap.put("sjfcLast0", moban0.getFcsjActual());
-					if(delay > 0)
-						tempMap.put("delayLast0", "+" + delay);
-					else
-						tempMap.put("delayLast0", delay);
-				} else {
-					tempMap.put("sjfcLast0", "/");
-					tempMap.put("delayLast0", "/");
-				}
-			}else{
+			if(up1.size() > 0 && up2.size() > 0){
+				Collections.sort(up1);
+				Collections.sort(up2);
+				ScheduleRealInfo s1 = up1Map.get(up1.get(0));
+				ScheduleRealInfo s2 = up2Map.get(up2.get(0));
+				ScheduleRealInfo s3 = up1Map.get(up1.get(up1.size()-1));
+				ScheduleRealInfo s4 = up2Map.get(up2.get(up2.size()-1));
+				long delayFirst0 = up1.get(0) - up2.get(0);
+				long delayLast0 = up1.get(up1.size()-1) - up2.get(up2.size()-1);
+				tempMap.put("qdzFirst0", s1.getQdzName());
+				tempMap.put("jhfcFirst0", s1.getFcsj());
+				tempMap.put("sjfcFirst0", s2.getFcsjActual());
+				tempMap.put("delayFirst0", delayFirst0>0?"+"+delayFirst0:delayFirst0);
+				tempMap.put("qdzLast0", s3.getQdzName());
+				tempMap.put("jhfcLast0", s3.getFcsj());
+				tempMap.put("sjfcLast0", s4.getFcsjActual());
+				tempMap.put("delayLast0", delayLast0>0?"+"+delayLast0:delayLast0);
+			} else {
 				tempMap.put("qdzFirst0", "--");
 				tempMap.put("jhfcFirst0", "/");
-				tempMap.put("qdzLast0", "--");
-				tempMap.put("jhfcLast0", "/");
 				tempMap.put("sjfcFirst0", "/");
 				tempMap.put("delayFirst0", "/");
+				tempMap.put("qdzLast0", "--");
+				tempMap.put("jhfcLast0", "/");
 				tempMap.put("sjfcLast0", "/");
 				tempMap.put("delayLast0", "/");
 			}
-			
-			if(longList1.size() != 0){
-				Collections.sort(longList1);
-				ScheduleRealInfo shouban1 = temp1.get(longList1.get(0));
-				ScheduleRealInfo moban1 = temp1.get(longList1.get(longList1.size() - 1));
-				tempMap.put("qdzFirst1", shouban1.getQdzName());
-				tempMap.put("jhfcFirst1", shouban1.getFcsj());
-				tempMap.put("qdzLast1", moban1.getQdzName());
-				tempMap.put("jhfcLast1", moban1.getFcsj());
-				if(shouban1.getFcsjActual() != null){
-					String[] split = shouban1.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]); 
-					long delay = shouban1.getFcsjT() - min;
-					tempMap.put("sjfcFirst1", shouban1.getFcsjActual());
-					if(delay > 0)
-						tempMap.put("delayFirst1", "+" + delay);
-					else
-						tempMap.put("delayFirst1", delay);
-				} else {
-					tempMap.put("sjfcFirst1", "/");
-					tempMap.put("delayFirst1", "/");
-				}
-				if(moban1.getFcsjActual() != null){
-					String[] split = moban1.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-					long delay = moban1.getFcsjT() - min;
-					tempMap.put("sjfcLast1", moban1.getFcsjActual());
-					if(delay > 0)
-						tempMap.put("delayLast1", "+" + delay);
-					else
-						tempMap.put("delayLast1", delay);
-				} else {
-					tempMap.put("sjfcLast1", "/");
-					tempMap.put("delayLast1", "/");
-				}
-			}else{
+			if(dn1.size() > 0 && dn2.size() > 0){
+				Collections.sort(dn1);
+				Collections.sort(dn2);
+				ScheduleRealInfo s1 = dn1Map.get(dn1.get(0));
+				ScheduleRealInfo s2 = dn2Map.get(dn2.get(0));
+				ScheduleRealInfo s3 = dn1Map.get(dn1.get(dn1.size()-1));
+				ScheduleRealInfo s4 = dn2Map.get(dn2.get(dn2.size()-1));
+				long delayFirst1 = dn1.get(0) - dn2.get(0);
+				long delayLast1 = dn1.get(dn1.size()-1) - dn2.get(dn2.size()-1);
+				tempMap.put("qdzFirst1", s1.getQdzName());
+				tempMap.put("jhfcFirst1", s1.getFcsj());
+				tempMap.put("sjfcFirst1", s2.getFcsjActual());
+				tempMap.put("delayFirst1", delayFirst1>0?"+"+delayFirst1:delayFirst1);
+				tempMap.put("qdzLast1", s3.getQdzName());
+				tempMap.put("jhfcLast1", s3.getFcsj());
+				tempMap.put("sjfcLast1", s4.getFcsjActual());
+				tempMap.put("delayLast1", delayLast1>0?"+"+delayLast1:delayLast1);
+			} else {
 				tempMap.put("qdzFirst1", "--");
 				tempMap.put("jhfcFirst1", "/");
-				tempMap.put("qdzLast1", "--");
-				tempMap.put("jhfcLast1", "/");
 				tempMap.put("sjfcFirst1", "/");
 				tempMap.put("delayFirst1", "/");
+				tempMap.put("qdzLast1", "--");
+				tempMap.put("jhfcLast1", "/");
 				tempMap.put("sjfcLast1", "/");
 				tempMap.put("delayLast1", "/");
 			}
-			
-			tempMap.put("date", date);
 			tempMap.put("company", companyName);
 			tempMap.put("subCompany", subCompanyName);
-			tempMap.put("line", key);
+			tempMap.put("date", date);
+			tempMap.put("line", xlName);
 			resList.add(tempMap);
 		}
-		
+
 		if(type.equals("export")){
 			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
 					sdfSimple = new SimpleDateFormat("yyyyMMdd");
@@ -1357,164 +1393,248 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 	@Override
 	public List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		NumberFormat nf = NumberFormat.getNumberInstance();
 		nf.setMinimumFractionDigits(2);
+		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
 		String line = map.get("line").toString();
-		String date = map.get("date").toString();
+//		String date = map.get("date").toString();
+		String startDate = map.get("startDate").toString();
+		String endDate = map.get("endDate").toString();
 		String type = map.get("type").toString();
-		if(date.length() == 0)
-			date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-		
-		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line, date);
+		if(startDate.length() == 0)
+			startDate = sdf.format(new Date());
+		if(endDate.length() == 0)
+			endDate = sdf.format(new Date());
-		for(ScheduleRealInfo schedule : list){
-			if(schedule.getBcType().equals("in") || schedule.getBcType().equals("out") || schedule.getBcType().equals("ldks"))
-				continue;
-			if(schedule.getStatus() == -1){
-				continue;
-			}
-			String key = schedule.getXlName();
-			if(key == null || key.trim().length() == 0)
-				continue;
-			if(!keyMap.containsKey(key))
-				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-			keyMap.get(key).add(schedule);
+		String dates = "";
+		if(startDate.equals(endDate)){
+			String[] split = startDate.split("-");
+			dates = split[0]+"年"+split[1]+"月"+split[2]+"日";
+		} else {
+			String[] split1 = startDate.split("-");
+			String[] split2 = endDate.split("-");
+			dates = split1[0]+"年"+split1[1]+"月"+split1[2]+"日--"
+					+split2[0]+"年"+split2[1]+"月"+split2[2]+"日";
 		}
-		for(String key : keyMap.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			Map<String, Object> m = new HashMap<String, Object>();
-			Map<Long, ScheduleRealInfo> temp0 = new HashMap<Long, ScheduleRealInfo>();
-			List<Long> longList0 = new ArrayList<Long>();
-			Map<Long, ScheduleRealInfo> temp1 = new HashMap<Long, ScheduleRealInfo>();
-			List<Long> longList1 = new ArrayList<Long>();
-			String companyName = "", subCompanyName = "";
-			for(ScheduleRealInfo schedule : keyMap.get(key)){
-				if(schedule.getFcsjActual() == null || schedule.getFcsjActual().trim().length() == 0){
-					continue;
-				}
-				if(schedule.getGsName() != null && companyName.length() == 0)
-					companyName = schedule.getGsName();
-				if(schedule.getFgsName() != null && subCompanyName.length() == 0)
-					subCompanyName = schedule.getFgsName();
-				String[] split = schedule.getFcsj().split(":");
-				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-				schedule.setFcsjT(min);
-				if(schedule.getXlDir().equals("0")){
-					temp0.put(min, schedule);
-					longList0.add(min);
-				} else {
-					temp1.put(min, schedule);
-					longList1.add(min);
+		
+		try {
+			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
+					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
+					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"
+					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			if(line.length() != 0)
+				sql += " and xl_bm = '"+line+"'";
+			if(company.length() != 0)
+				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+			
+			list = jdbcTemplate.query(sql,
+					new RowMapper<ScheduleRealInfo>(){
+				@Override
+				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
+					ScheduleRealInfo schedule = new ScheduleRealInfo();
+					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setRealExecDate(rs.getString("real_exec_date"));
+					schedule.setXlName(rs.getString("xl_name"));
+					schedule.setFcsj(rs.getString("fcsj"));
+					schedule.setFcsjActual(rs.getString("fcsj_actual"));
+					schedule.setZdsj(rs.getString("zdsj"));
+					schedule.setZdsjActual(rs.getString("zdsj_actual"));
+					schedule.setQdzName(rs.getString("qdz_name"));
+					schedule.setZdzName(rs.getString("zdz_name"));
+					schedule.setXlDir(rs.getString("xl_dir"));
+					schedule.setStatus(rs.getInt("status"));
+					schedule.setGsName(rs.getString("gs_name"));
+					schedule.setFgsName(rs.getString("fgs_name"));
+					
+					int startOpt = 0;
+					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
+						String[] split = rs.getString("start_opt").split(":");
+						startOpt = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+					}
+					
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
+					if(schedule.getFcsj() != null){
+						String[] split = schedule.getFcsj().split(":");
+						int fcsj = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						if(fcsj < startOpt)
+							fcsj += 1440;
+						schedule.setFcsjT((long)fcsj);
+					}
+					if(schedule.getFcsjActual() != null){
+						String[] split = schedule.getFcsjActual().split(":");
+						int fcsjA = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						if(fcsjA < startOpt || !schedule.getRealExecDate().equals(schedule.getScheduleDateStr()))
+							fcsjA += 1440;
+						schedule.setFcsjActualTime((long)fcsjA);
+					}
+					
+					return schedule;
 				}
-			}
+			});
-			if(longList0.size() == 0 && longList1.size() == 0){
-				continue;
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+		
+		Map<String, Map<String, List<ScheduleRealInfo>>> keyMap = new HashMap<String, Map<String,List<ScheduleRealInfo>>>();
+		String companyName = "", subCompanyName = "";
+		
+		for(ScheduleRealInfo s : list){
+			String xlName = s.getXlName();
+			String date = s.getScheduleDateStr();
+			if(!keyMap.containsKey(xlName))
+				keyMap.put(xlName, new HashMap<String, List<ScheduleRealInfo>>());
+			if(!keyMap.get(xlName).containsKey(date))
+				keyMap.get(xlName).put(date, new ArrayList<ScheduleRealInfo>());
+			keyMap.get(xlName).get(date).add(s);
+			if(companyName.length()==0&&s.getGsName()!=null&&s.getGsName().trim().length()!=0)
+				companyName = s.getGsName();
+			if(subCompanyName.length()==0&&s.getFgsName()!=null&&s.getFgsName().trim().length()!=0)
+				subCompanyName = s.getFgsName();
+		}
+		
+		for(String xlName : keyMap.keySet()){
+			List<Map<String, Object>> tempList = new ArrayList<Map<String,Object>>();
+			Map<String, Object> tempMap = new HashMap<String, Object>();
+			Map<Long, String> dateMap = new HashMap<Long, String>();
+			List<Long> Longs = new ArrayList<Long>();
+			int jhbc = 0, sjbc = 0;
+			for(String date : keyMap.get(xlName).keySet()){
+				String[] split = date.split("-");
+				long l = Long.valueOf(split[0])*10000 + Long.valueOf(split[1])*100 + Long.valueOf(split[2]);
+				dateMap.put(l, date);
+				Longs.add(l);
 			}
-			int jhbc = 0;
-			int sjbc = 0;
-			
-			if(longList0.size() != 0){
-				Collections.sort(longList0);
-				ScheduleRealInfo shouban0 = temp0.get(longList0.get(0));
-				ScheduleRealInfo moban0 = temp0.get(longList0.get(longList0.size() - 1));
-				if(shouban0.getFcsjActual() != null){
-					jhbc++;
-					String[] split = shouban0.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]); 
-					long delay = shouban0.getFcsjT() - min;
-					if(delay >= -3 && delay <= 1){
-						sjbc++;
+			Collections.sort(Longs);
+			for(long l : Longs){
+				String date = dateMap.get(l);
+				Map<String, Object> temp = new HashMap<String, Object>();
+				temp.put("date", date.substring(5));
+				temp.put("line", xlName);
+				List<Long> up1 = new ArrayList<Long>();
+				List<Long> up2 = new ArrayList<Long>();;
+				List<Long> dn1 = new ArrayList<Long>();
+				List<Long> dn2 = new ArrayList<Long>();
+				Map<Long, ScheduleRealInfo> up1Map = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> up2Map = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> dn1Map = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> dn2Map = new HashMap<Long, ScheduleRealInfo>();
+				for(ScheduleRealInfo s : keyMap.get(xlName).get(date)){
+					if(s.getXlDir().equals("0")){
+						up1.add(s.getFcsjT());
+						up2.add(s.getFcsjActualTime());
+						up1Map.put(s.getFcsjT(), s);
+						up2Map.put(s.getFcsjActualTime(), s);
+					} else if(s.getXlDir().equals("1")){
+						dn1.add(s.getFcsjT());
+						dn2.add(s.getFcsjActualTime());
+						dn1Map.put(s.getFcsjT(), s);
+						dn2Map.put(s.getFcsjActualTime(), s);
 					}
-					m.put("qdzFirst0", shouban0.getQdzName());
-					m.put("jhfcFirst0", shouban0.getFcsj());
-					m.put("sjfcFirst0", shouban0.getFcsjActual());
-					m.put("delayFirst0", delay>0?"+"+delay:delay);
 				}
-				
-				if(moban0.getFcsjActual() != null){
-					jhbc++;
-					String[] split = moban0.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-					long delay = moban0.getFcsjT() - min;
-					if(delay >= -3 && delay <= 1){
+				if(up1.size() > 0 && up2.size() > 0){
+					Collections.sort(up1);
+					Collections.sort(up2);
+					ScheduleRealInfo s1 = up1Map.get(up1.get(0));
+					ScheduleRealInfo s2 = up2Map.get(up2.get(0));
+					ScheduleRealInfo s3 = up1Map.get(up1.get(up1.size()-1));
+					ScheduleRealInfo s4 = up2Map.get(up2.get(up2.size()-1));
+					long delayFirst0 = up1.get(0) - up2.get(0);
+					long delayLast0 = up1.get(up1.size()-1) - up2.get(up2.size()-1);
+					temp.put("qdzFirst0", s1.getQdzName());
+					temp.put("jhfcFirst0", s1.getFcsj());
+					temp.put("sjfcFirst0", s2.getFcsjActual());
+					temp.put("delayFirst0", delayFirst0>0?"+"+delayFirst0:delayFirst0);
+					temp.put("qdzLast0", s3.getQdzName());
+					temp.put("jhfcLast0", s3.getFcsj());
+					temp.put("sjfcLast0", s4.getFcsjActual());
+					temp.put("delayLast0", delayLast0>0?"+"+delayLast0:delayLast0);
+					jhbc += 2;
+					if(delayFirst0 <= 1l && delayFirst0 >= -3l)
 						sjbc++;
-					}
-					m.put("qdzLast0", moban0.getQdzName());
-					m.put("jhfcLast0", moban0.getFcsj());
-					m.put("sjfcLast0", moban0.getFcsjActual());
-					m.put("delayLast0", delay>0?"+"+delay:delay);
-				}
-			} else {
-				m.put("qdzFirst0", "--");
-				m.put("jhfcFirst0", "/");
-				m.put("sjfcFirst0", "/");
-				m.put("delayFirst0", "/");
-				m.put("qdzLast0", "--");
-				m.put("jhfcLast0", "/");
-				m.put("sjfcLast0", "/");
-				m.put("delayLast0", "/");
-			}
-			
-			if(longList1.size() != 0){
-				Collections.sort(longList1);
-				ScheduleRealInfo shouban1 = temp1.get(longList1.get(0));
-				ScheduleRealInfo moban1 = temp1.get(longList1.get(longList1.size() - 1));
-				if(shouban1.getFcsjActual() != null){
-					jhbc++;
-					String[] split = shouban1.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]); 
-					long delay = shouban1.getFcsjT() - min;
-					if(delay >= -3 && delay <= 1){
+					if(delayLast0 <= 1l && delayLast0 >= -3l)
 						sjbc++;
-					}
-					m.put("qdzFirst1", shouban1.getQdzName());
-					m.put("jhfcFirst1", shouban1.getFcsj());
-					m.put("sjfcFirst1", shouban1.getFcsjActual());
-					m.put("delayFirst1", delay>0?"+"+delay:delay);
+				} else {
+					temp.put("qdzFirst0", "--");
+					temp.put("jhfcFirst0", "/");
+					temp.put("sjfcFirst0", "/");
+					temp.put("delayFirst0", "/");
+					temp.put("qdzLast0", "--");
+					temp.put("jhfcLast0", "/");
+					temp.put("sjfcLast0", "/");
+					temp.put("delayLast0", "/");
 				}
-				
-				if(moban1.getFcsjActual() != null){
-					jhbc++;
-					String[] split = moban1.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-					long delay = moban1.getFcsjT() - min;
-					if(delay >= -3 && delay <= 1){
+				if(dn1.size() > 0 && dn2.size() > 0){
+					Collections.sort(dn1);
+					Collections.sort(dn2);
+					ScheduleRealInfo s1 = dn1Map.get(dn1.get(0));
+					ScheduleRealInfo s2 = dn2Map.get(dn2.get(0));
+					ScheduleRealInfo s3 = dn1Map.get(dn1.get(dn1.size()-1));
+					ScheduleRealInfo s4 = dn2Map.get(dn2.get(dn2.size()-1));
+					long delayFirst1 = dn1.get(0) - dn2.get(0);
+					long delayLast1 = dn1.get(dn1.size()-1) - dn2.get(dn2.size()-1);
+					temp.put("qdzFirst1", s1.getQdzName());
+					temp.put("jhfcFirst1", s1.getFcsj());
+					temp.put("sjfcFirst1", s2.getFcsjActual());
+					temp.put("delayFirst1", delayFirst1>0?"+"+delayFirst1:delayFirst1);
+					temp.put("qdzLast1", s3.getQdzName());
+					temp.put("jhfcLast1", s3.getFcsj());
+					temp.put("sjfcLast1", s4.getFcsjActual());
+					temp.put("delayLast1", delayLast1>0?"+"+delayLast1:delayLast1);
+					jhbc += 2;
+					if(delayFirst1 <= 1l && delayFirst1 >= -3l)
 						sjbc++;
-					}
-					m.put("qdzLast1", moban1.getQdzName());
-					m.put("jhfcLast1", moban1.getFcsj());
-					m.put("sjfcLast1", moban1.getFcsjActual());
-					m.put("delayLast1", delay>0?"+"+delay:delay);
+					if(delayLast1 <= 1l && delayLast1 >= -3l)
+						sjbc++;
+				} else {
+					temp.put("qdzFirst1", "--");
+					temp.put("jhfcFirst1", "/");
+					temp.put("sjfcFirst1", "/");
+					temp.put("delayFirst1", "/");
+					temp.put("qdzLast1", "--");
+					temp.put("jhfcLast1", "/");
+					temp.put("sjfcLast1", "/");
+					temp.put("delayLast1", "/");
 				}
-			} else {
-				m.put("qdzFirst1", "--");
-				m.put("jhfcFirst1", "/");
-				m.put("sjfcFirst1", "/");
-				m.put("delayFirst1", "/");
-				m.put("qdzLast1", "--");
-				m.put("jhfcLast1", "/");
-				m.put("sjfcLast1", "/");
-				m.put("delayLast1", "/");
+				tempList.add(temp);
 			}
-
-			m.put("line", key);
-			tempMap.put("map", m);
+			tempMap.put("map", tempList);
+			tempMap.put("company", companyName);
+			tempMap.put("subCompany", subCompanyName);
+			tempMap.put("date", dates);
+			tempMap.put("line", xlName);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
 			tempMap.put("zdl", nf.format((float) sjbc / jhbc *100) + "%");
-			tempMap.put("date", date);
-			tempMap.put("company", companyName);
-			tempMap.put("subCompany", subCompanyName);
-			tempMap.put("line", key);
 			resList.add(tempMap);
 		}
+
+		Map<String, Object> tempMap = new HashMap<String, Object>();
+		if(resList.size() > 0){
+			tempMap.put("date", "合计汇总");
+			int jhbc = 0, sjbc = 0;
+			for(Map<String, Object> m : resList){
+				jhbc += Integer.valueOf(m.get("jhbc").toString());
+				sjbc += Integer.valueOf(m.get("sjbc").toString());
+			}
+			tempMap.put("jhbc", jhbc);
+			tempMap.put("sjbc", sjbc);
+			tempMap.put("zdl", nf.format((float) sjbc / jhbc *100) + "%");
+			if(!type.equals("export"))
+				resList.add(tempMap);
+		}
 		if(type.equals("export")){
 			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -1525,8 +1645,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			try {
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus_sum.xls",
-						path+"export/线路首末班准点率" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_sum.xls",
+						path+"export/线路首末班准点率" + sdfSimple.format(sdfMonth.parse(startDate)) +
+						(startDate.equals(endDate)?"":"-"+sdfSimple.format(sdfMonth.parse(endDate))) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
+package com.bsth.service.traffic;
+
+import com.bsth.entity.traffic.SKBUploadLogger;
+import com.bsth.service.BaseService;
+
+
+/**
+ * 时刻模板上传日志
+ */
+public interface SKBUploadLoggerService extends BaseService<SKBUploadLogger,Integer> {
+
+}
+package com.bsth.service.traffic;
+
+/**
+ * 运管处基础数据操作接口类
+ * Created by zlz on 2017/6/16.
+ */
+public interface YgcBasicDataService {
+    /**
+     * 更新运管处基础数据
+     */
+    void updateYgcBasicData();
+}
+
+package com.bsth.service.traffic.impl;
+
+import com.bsth.entity.traffic.SKBUploadLogger;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.traffic.SKBUploadLoggerService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类)
+ *
+ * @Extends : BaseService
+ *
+ * @Description:
+ *
+ * @Author bsth@zq
+ *
+ * @Date 2016年10月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ *
+ */
+
+@Service
+public class SKBUploadLoggerServiceImpl extends BaseServiceImpl<SKBUploadLogger,Integer> implements SKBUploadLoggerService{
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+}
+package com.bsth.service.traffic.impl;
+
+import com.bsth.service.impl.TrafficManageServiceImpl;
+import com.bsth.service.traffic.YgcBasicDataService;
+import com.bsth.util.db.DBUtils_oldSystem;
+import org.apache.axiom.om.*;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.client.ServiceClient;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+import javax.activation.DataHandler;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+
+/**
+ * 运管处基础数据操作类
+ * Created by zq on 2017/6/15.
+ */
+@Service
+public class YgcBasicDataServiceImpl implements YgcBasicDataService{
+    Logger logger = LoggerFactory.getLogger(TrafficManageServiceImpl.class);
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    private static String IP = "218.242.195.76:9091";
+    private static String targetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl";
+    private static String namespace = "http://service.shygc.com";
+    private static String userName = "admin";
+    private static String passWord = "000000";
+    private static EndpointReference targetEPR;
+    {
+        try {
+            targetEPR = new EndpointReference(targetEndpoint);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 更新运管处基础数据
+     */
+    public void updateYgcBasicData(){
+        String saveFile = "ygcBasicData.zip";
+        String flag = "failure";
+        try {
+            // 调用接口下载基础数据
+            if(download(userName, DigestUtils.md5Hex(passWord), saveFile)){
+                // 读取基础数据zip
+                StringBuffer sb = readZipFile(saveFile);
+                // 解析xml
+                List<HashMap<String,String>> result = parseXml(sb);
+                // 插入数据库
+                if(result != null && result.size() > 0){
+                    insertRecord(result);
+                }
+            }
+            flag = "success";
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        finally {
+            // 删除文件
+            File fill = new File(saveFile);
+            logger.info("updateYgcBasicData:"+fill.getAbsolutePath());
+            logger.info("updateYgcBasicData:"+flag);
+            if(fill.exists()){
+                fill.delete();
+            }
+        }
+    }
+    /**
+     *  下载基础数据，并生成rar文件
+     * @param userName
+     * @param password
+     * @param saveFile
+     * @return
+     */
+    private boolean download(String userName, String password,  String saveFile)
+    {
+        try
+        {
+            OMElement data = buildDownloadEnvelope(userName, password);
+            ServiceClient sender = new ServiceClient();
+            Options options = sender.getOptions();
+            options.setProperty("SO_TIMEOUT", Integer.valueOf(1800000));
+            options.setTo(targetEPR);
+            sender.setOptions(options);
+            System.out.println("The data in method download: " + data);
+            data.build();
+            OMElement ome = sender.sendReceive(data);
+
+            OMText binaryNode = (OMText)ome.getFirstOMChild();
+            binaryNode.setOptimize(true);
+            DataHandler actualDH = (DataHandler)binaryNode.getDataHandler();
+            FileOutputStream imageOutStream = new FileOutputStream(saveFile);
+            InputStream is = actualDH.getInputStream();
+            int read ;
+            byte[] buffer = new byte[1024];
+            while ((read = is.read(buffer)) != -1) {
+                imageOutStream.write(buffer, 0, read);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }return false;
+    }
+
+    /**
+     * 构建webservice接口参数
+     * @param userName
+     * @param password
+     * @return
+     */
+    private OMElement buildDownloadEnvelope(String userName, String password)
+    {
+        OMFactory fac = OMAbstractFactory.getOMFactory();
+        OMNamespace omNs = fac.createOMNamespace(namespace,
+                "ser");
+        OMElement data = fac.createOMElement("downloadAllDataFile", omNs);
+        OMElement _userName = fac.createOMElement("userName", omNs);
+        _userName.setText(userName);
+        OMElement _passWord = fac.createOMElement("passWord", omNs);
+        _passWord.setText(String.valueOf(password));
+
+        data.addChild(_userName);
+        data.addChild(_passWord);
+
+        OMElement soap = fac.createOMElement("downloadAllDataFile", omNs);
+        soap.addChild(data);
+        return soap;
+    }
+
+    /**
+     * 读取zip文件的内容
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    public StringBuffer readZipFile(String file) throws Exception {
+        ZipFile zf = new ZipFile(file);
+        InputStream in = new BufferedInputStream(new FileInputStream(file));
+        ZipInputStream zin = new ZipInputStream(in);
+        ZipEntry ze;
+        StringBuffer sb = new StringBuffer();
+        while ((ze = zin.getNextEntry()) != null) {
+            System.out.print(ze);
+            if (ze.isDirectory()) {
+            } else {
+                System.err.println("file - " + ze.getName() + " : "
+                        + ze.getSize() + " bytes");
+                long size = ze.getSize();
+                if (size > 0) {
+                    BufferedReader br = new BufferedReader(
+                            new InputStreamReader(zf.getInputStream(ze),"GBK"));
+                    String line;
+                    boolean addFlag = false;
+                    while ((line = br.readLine()) != null) {
+                        if(line.indexOf("BusLineList") != -1){
+                            addFlag = true;
+                        }
+                        if(addFlag){
+                            sb.append(line);
+                        }
+
+                        if(line.indexOf("/BusLineList") != -1){
+                            break;
+                        }
+                    }
+                    br.close();
+                }
+            }
+        }
+        zin.closeEntry();
+        return  sb;
+    }
+
+    /**
+     * 解析xml
+     * @param sb
+     */
+    private List<HashMap<String,String>> parseXml(StringBuffer sb){
+        List<HashMap<String,String>> list = new ArrayList<>();
+        HashMap<String,String> map;
+        try {
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            Document doc = builder.parse(new ByteArrayInputStream(sb.toString().getBytes()));
+            NodeList nl = doc.getElementsByTagName("BusLine");
+            String lineName; //线路名称
+            String lineId; // 线路ID
+            String abbreviation ; // 公司名称
+            String ddfs ; // 调度方式
+            String lineStandardCode; // 上海市线路编码
+            String parentUnitName ; // 总公司
+            for (int i = 0; i < nl.getLength(); i++) {
+                parentUnitName = doc.getElementsByTagName("ParentUnitName").item(i).getFirstChild() == null ?"":
+                        doc.getElementsByTagName("ParentUnitName").item(i).getFirstChild().getNodeValue();
+                if(parentUnitName.indexOf("浦东") != -1){// 只查找浦东的数据
+                    lineName = doc.getElementsByTagName("LineName").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("LineName").item(i).getFirstChild().getNodeValue();
+                    lineId = doc.getElementsByTagName("LineId").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("LineId").item(i).getFirstChild().getNodeValue();
+                    abbreviation = doc.getElementsByTagName("Abbreviation").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("Abbreviation").item(i).getFirstChild().getNodeValue();
+                    ddfs = doc.getElementsByTagName("DDFS").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("DDFS").item(i).getFirstChild().getNodeValue();
+                    lineStandardCode = doc.getElementsByTagName("LineStandardCode").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("LineStandardCode").item(i).getFirstChild().getNodeValue();
+                    map = new HashMap<>();
+                    map.put("lineName",lineName);
+                    map.put("lineId",lineId);
+                    map.put("abbreviation",abbreviation);
+                    map.put("ddfs",ddfs);
+                    map.put("lineStandardCode",lineStandardCode);
+                    list.add(map);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();;
+        }
+        return list;
+    }
+
+    /**
+     * 批量插入用法
+     * @param list
+     */
+    public boolean insertRecord(List<HashMap<String,String>> list)
+    {
+        boolean flag = false;
+        final List<HashMap<String,String>> tempList=list;
+        String sql="INSERT INTO JJWGPS_T_SHSXLFILE(XLID,SHSXLBM,XLMC,GSMC,DDFS,CREATETIME,XLMC_ALL) VALUES (?,?,?,?,?,SYSDATE,?)";
+        jdbcTemplate = new JdbcTemplate(DBUtils_oldSystem.getDataSource());
+        jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter()
+        {
+            public void setValues(PreparedStatement ps, int i)throws SQLException
+            {
+                String lineId =tempList.get(i).get("lineId");
+                String lineStandardCode =tempList.get(i).get("lineStandardCode");
+                String lineName =tempList.get(i).get("lineName");
+                String abbreviation =tempList.get(i).get("abbreviation");
+                String ddfs =tempList.get(i).get("ddfs");
+                String lineNameAll = lineName;
+                if(ddfs.equals("2")){
+                    lineNameAll = lineName+"区间（走向部分在全程线路之外）";
+                }else if(ddfs.equals("7")){
+                    lineNameAll = lineName+"区间（走向在全程线路之内）";
+                }
+                ps.setString(1, lineId);
+                ps.setString(2, lineStandardCode);
+                ps.setString(3, lineName);
+                ps.setString(4, abbreviation);
+                ps.setString(5, ddfs);
+                ps.setString(6, lineNameAll);
+            }
+            public int getBatchSize()
+            {
+                return tempList.size();
+            }
+        });
+        flag = true;
+        return flag;
+    }
+}
+<?xml version="1.0" encoding="UTF-8"?>
+<transformation>
+  <info>
+    <name>&#x6392;&#x73ed;&#x89c4;&#x5219;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</name>
+    <description/>
+    <extended_description/>
+    <trans_version/>
+    <trans_type>Normal</trans_type>
+    <trans_status>0</trans_status>
+    <directory>&#x2f;</directory>
+    <parameters>
+        <parameter>
+            <name>erroroutputdir</name>
+            <default_value>&#x2f;Users&#x2f;xu&#x2f;resource&#x2f;project_code&#x2f;bsth_project&#x2f;bsth_control_etl&#x2f;&#x5bfc;&#x5165;&#x5bfc;&#x51fa;1</default_value>
+            <description>ktr step&#x914d;&#x7f6e;&#x7684;&#x9519;&#x8bef;&#x8f93;&#x51fa;&#x76ee;&#x5f55;</description>
+        </parameter>
+        <parameter>
+            <name>filepath</name>
+            <default_value>&#x2f;Users&#x2f;xu&#x2f;resource&#x2f;project_code&#x2f;bsth_project&#x2f;bsth_control_etl&#x2f;&#x5bfc;&#x5165;&#x5bfc;&#x51fa;1&#x2f;&#x6392;&#x7248;&#x89c4;&#x5219;&#x4fe1;&#x606f;.xls</default_value>
+            <description>&#x5f85;&#x5904;&#x7406;&#x5bfc;&#x5165;&#x7684;excel&#x6587;&#x4ef6;</description>
+        </parameter>
+    </parameters>
+    <log>
+<trans-log-table><connection/>
+<schema/>
+<table/>
+<size_limit_lines/>
+<interval/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STATUS</id><enabled>Y</enabled><name>STATUS</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name><subject/></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name><subject/></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name><subject/></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name><subject/></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name><subject/></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name><subject/></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>STARTDATE</id><enabled>Y</enabled><name>STARTDATE</name></field><field><id>ENDDATE</id><enabled>Y</enabled><name>ENDDATE</name></field><field><id>LOGDATE</id><enabled>Y</enabled><name>LOGDATE</name></field><field><id>DEPDATE</id><enabled>Y</enabled><name>DEPDATE</name></field><field><id>REPLAYDATE</id><enabled>Y</enabled><name>REPLAYDATE</name></field><field><id>LOG_FIELD</id><enabled>Y</enabled><name>LOG_FIELD</name></field><field><id>EXECUTING_SERVER</id><enabled>N</enabled><name>EXECUTING_SERVER</name></field><field><id>EXECUTING_USER</id><enabled>N</enabled><name>EXECUTING_USER</name></field><field><id>CLIENT</id><enabled>N</enabled><name>CLIENT</name></field></trans-log-table>
+<perf-log-table><connection/>
+<schema/>
+<table/>
+<interval/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>SEQ_NR</id><enabled>Y</enabled><name>SEQ_NR</name></field><field><id>LOGDATE</id><enabled>Y</enabled><name>LOGDATE</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STEPNAME</id><enabled>Y</enabled><name>STEPNAME</name></field><field><id>STEP_COPY</id><enabled>Y</enabled><name>STEP_COPY</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>INPUT_BUFFER_ROWS</id><enabled>Y</enabled><name>INPUT_BUFFER_ROWS</name></field><field><id>OUTPUT_BUFFER_ROWS</id><enabled>Y</enabled><name>OUTPUT_BUFFER_ROWS</name></field></perf-log-table>
+<channel-log-table><connection/>
+<schema/>
+<table/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>LOGGING_OBJECT_TYPE</id><enabled>Y</enabled><name>LOGGING_OBJECT_TYPE</name></field><field><id>OBJECT_NAME</id><enabled>Y</enabled><name>OBJECT_NAME</name></field><field><id>OBJECT_COPY</id><enabled>Y</enabled><name>OBJECT_COPY</name></field><field><id>REPOSITORY_DIRECTORY</id><enabled>Y</enabled><name>REPOSITORY_DIRECTORY</name></field><field><id>FILENAME</id><enabled>Y</enabled><name>FILENAME</name></field><field><id>OBJECT_ID</id><enabled>Y</enabled><name>OBJECT_ID</name></field><field><id>OBJECT_REVISION</id><enabled>Y</enabled><name>OBJECT_REVISION</name></field><field><id>PARENT_CHANNEL_ID</id><enabled>Y</enabled><name>PARENT_CHANNEL_ID</name></field><field><id>ROOT_CHANNEL_ID</id><enabled>Y</enabled><name>ROOT_CHANNEL_ID</name></field></channel-log-table>
+<step-log-table><connection/>
+<schema/>
+<table/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STEPNAME</id><enabled>Y</enabled><name>STEPNAME</name></field><field><id>STEP_COPY</id><enabled>Y</enabled><name>STEP_COPY</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>LOG_FIELD</id><enabled>N</enabled><name>LOG_FIELD</name></field></step-log-table>
+<metrics-log-table><connection/>
+<schema/>
+<table/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>METRICS_DATE</id><enabled>Y</enabled><name>METRICS_DATE</name></field><field><id>METRICS_CODE</id><enabled>Y</enabled><name>METRICS_CODE</name></field><field><id>METRICS_DESCRIPTION</id><enabled>Y</enabled><name>METRICS_DESCRIPTION</name></field><field><id>METRICS_SUBJECT</id><enabled>Y</enabled><name>METRICS_SUBJECT</name></field><field><id>METRICS_TYPE</id><enabled>Y</enabled><name>METRICS_TYPE</name></field><field><id>METRICS_VALUE</id><enabled>Y</enabled><name>METRICS_VALUE</name></field></metrics-log-table>
+    </log>
+    <maxdate>
+      <connection/>
+      <table/>
+      <field/>
+      <offset>0.0</offset>
+      <maxdiff>0.0</maxdiff>
+    </maxdate>
+    <size_rowset>10000</size_rowset>
+    <sleep_time_empty>50</sleep_time_empty>
+    <sleep_time_full>50</sleep_time_full>
+    <unique_connections>N</unique_connections>
+    <feedback_shown>Y</feedback_shown>
+    <feedback_size>50000</feedback_size>
+    <using_thread_priorities>Y</using_thread_priorities>
+    <shared_objects_file/>
+    <capture_step_performance>N</capture_step_performance>
+    <step_performance_capturing_delay>1000</step_performance_capturing_delay>
+    <step_performance_capturing_size_limit>100</step_performance_capturing_size_limit>
+    <dependencies>
+    </dependencies>
+    <partitionschemas>
+    </partitionschemas>
+    <slaveservers>
+    </slaveservers>
+    <clusterschemas>
+    </clusterschemas>
+  <created_user>-</created_user>
+  <created_date>2017&#x2f;01&#x2f;09 10&#x3a;10&#x3a;36.915</created_date>
+  <modified_user>-</modified_user>
+  <modified_date>2017&#x2f;01&#x2f;09 10&#x3a;10&#x3a;36.915</modified_date>
+    <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA&#x3d;</key_for_session_key>
+    <is_key_private>N</is_key_private>
+  </info>
+  <notepads>
+  </notepads>
+  <connection>
+    <name>192.168.168.1_jwgl_dw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl_dw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb13b977d2adabcd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>bus_control_variable</name>
+    <server>&#x24;&#x7b;v_db_ip&#x7d;</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>&#x24;&#x7b;v_db_dname&#x7d;</database>
+    <port>3306</port>
+    <username>&#x24;&#x7b;v_db_uname&#x7d;</username>
+    <password>&#x24;&#x7b;v_db_pwd&#x7d;</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>bus_control_&#x516c;&#x53f8;_201</name>
+    <server>localhost</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>control</database>
+    <port>3306</port>
+    <username>root</username>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>bus_control_&#x672c;&#x673a;</name>
+    <server>localhost</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>control</database>
+    <port>3306</port>
+    <username>root</username>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>xlab_mysql_youle</name>
+    <server>101.231.124.8</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>xlab_youle</database>
+    <port>45687</port>
+    <username>xlab-youle</username>
+    <password>Encrypted 2be98afc86aa78a88aa1be369d187a3df</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>45687</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>xlab_mysql_youle&#xff08;&#x672c;&#x673a;&#xff09;</name>
+    <server>localhost</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>xlab_youle</database>
+    <port>3306</port>
+    <username>root</username>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>xlab_youle</name>
+    <server/>
+    <type>MYSQL</type>
+    <access>JNDI</access>
+    <database>xlab_youle</database>
+    <port>1521</port>
+    <username/>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <order>
+  <hop> <from>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</from><to>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</from><to>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;</from><to>&#x8def;&#x724c;id&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</from><to>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x8def;&#x724c;id</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x8def;&#x724c;id</from><to>&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;</from><to>&#x62c6;&#x5206;&#x5206;&#x73ed;&#x642d;&#x73ed;&#x7f16;&#x7801;&#x5b57;&#x6bb5;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x62c6;&#x5206;&#x5206;&#x73ed;&#x642d;&#x73ed;&#x7f16;&#x7801;&#x5b57;&#x6bb5;</from><to>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</from><to>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2; 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</from><to>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</from><to>&#x8fc7;&#x6ee4;&#x7ebf;&#x8def;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8fc7;&#x6ee4;&#x7ebf;&#x8def;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</from><to>&#x8fc7;&#x6ee4;&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8fc7;&#x6ee4;&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8def;&#x724c;id&#x67e5;&#x8be2;</from><to>&#x8fc7;&#x6ee4;&#x8def;&#x724c;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8fc7;&#x6ee4;&#x8def;&#x724c;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2; 2</from><to>&#x8fc7;&#x6ee4;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8fc7;&#x6ee4;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x5408;&#x5e76;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5408;&#x5e76;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55; 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6392;&#x5e8f;&#x8bb0;&#x5f55; 2</from><to>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x63d2;&#x5165; &#x2f; &#x66f4;&#x65b0;bsth_c_s_sr1_flat</from><to>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</from><to>&#x542f;&#x7528;&#x65e5;&#x671f;&#x8f6c;&#x6362;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x542f;&#x7528;&#x65e5;&#x671f;&#x8f6c;&#x6362;</from><to>&#x63d2;&#x5165; &#x2f; &#x66f4;&#x65b0;bsth_c_s_sr1_flat</to><enabled>Y</enabled> </hop>
+  </order>
+  <step>
+    <name>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</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>Y</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_ecinfo</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>xl</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>dbbm1</name>
+        <field>dbbm</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>isCancel</name>
+        <field>is_cancel</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>id</name>
+        <rename>rycid1</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>904</xloc>
+      <yloc>101</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2; 2</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>Y</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_ecinfo</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>xl</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>dbbm2</name>
+        <field>dbbm</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>isCancel</name>
+        <field>is_cancel</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>id</name>
+        <rename>rycid2</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>778</xloc>
+      <yloc>103</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</name>
+    <type>GroupBy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <all_rows>N</all_rows>
+      <ignore_aggregate>N</ignore_aggregate>
+      <field_ignore/>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>grp</prefix>
+      <add_linenr>N</add_linenr>
+      <linenr_fieldname/>
+      <give_back_row>N</give_back_row>
+      <group>
+        <field>
+          <name>xlid</name>
+        </field>
+        <field>
+          <name>cid</name>
+        </field>
+        <field>
+          <name>lpnames</name>
+        </field>
+        <field>
+          <name>lpids</name>
+        </field>
+        <field>
+          <name>&#x8d77;&#x59cb;&#x8def;&#x724c;</name>
+        </field>
+        <field>
+          <name>&#x8d77;&#x59cb;&#x4eba;&#x5458;</name>
+        </field>
+        <field>
+          <name>&#x4eba;&#x5458;&#x8303;&#x56f4;</name>
+        </field>
+        <field>
+          <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
+        </field>
+        <field>
+          <name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</name>
+        </field>
+        <field>
+          <name>isCancel</name>
+        </field>
+      </group>
+      <fields>
+        <field>
+          <aggregate>rycids</aggregate>
+          <subject>rycid</subject>
+          <type>CONCAT_STRING</type>
+          <valuefield>,</valuefield>
+        </field>
+        <field>
+          <aggregate>rybms</aggregate>
+          <subject>rybm</subject>
+          <type>CONCAT_STRING</type>
+          <valuefield>,</valuefield>
+        </field>
+      </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>780</xloc>
+      <yloc>291</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x8def;&#x724c;id</name>
+    <type>GroupBy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <all_rows>N</all_rows>
+      <ignore_aggregate>N</ignore_aggregate>
+      <field_ignore/>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>grp</prefix>
+      <add_linenr>N</add_linenr>
+      <linenr_fieldname/>
+      <give_back_row>N</give_back_row>
+      <group>
+        <field>
+          <name>xlid</name>
+        </field>
+        <field>
+          <name>cid</name>
+        </field>
+        <field>
+          <name>&#x8d77;&#x59cb;&#x8def;&#x724c;</name>
+        </field>
+        <field>
+          <name>&#x8d77;&#x59cb;&#x4eba;&#x5458;</name>
+        </field>
+        <field>
+          <name>&#x4eba;&#x5458;&#x8303;&#x56f4;</name>
+        </field>
+        <field>
+          <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
+        </field>
+        <field>
+          <name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</name>
+        </field>
+        <field>
+          <name>isCancel</name>
+        </field>
+      </group>
+      <fields>
+        <field>
+          <aggregate>lpids</aggregate>
+          <subject>lpid</subject>
+          <type>CONCAT_STRING</type>
+          <valuefield>,</valuefield>
+        </field>
+        <field>
+          <aggregate>lpnames</aggregate>
+          <subject>lpname</subject>
+          <type>CONCAT_STRING</type>
+          <valuefield>,</valuefield>
+        </field>
+      </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>653</xloc>
+      <yloc>119</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name>
+    <type>ExcelInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <header>Y</header>
+    <noempty>Y</noempty>
+    <stoponempty>N</stoponempty>
+    <filefield/>
+    <sheetfield/>
+    <sheetrownumfield/>
+    <rownumfield/>
+    <sheetfield/>
+    <filefield/>
+    <limit>0</limit>
+    <encoding/>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <accept_filenames>Y</accept_filenames>
+    <accept_field>filepath_</accept_field>
+    <accept_stepname>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</accept_stepname>
+    <file>
+      <name/>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+      <field>
+        <name>&#x7ebf;&#x8def;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8d77;&#x59cb;&#x8def;&#x724c;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8def;&#x724c;&#x8303;&#x56f4;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8d77;&#x59cb;&#x4eba;&#x5458;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x4eba;&#x5458;&#x8303;&#x56f4;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+    </fields>
+    <sheets>
+      <sheet>
+        <name>&#x5de5;&#x4f5c;&#x8868;1</name>
+        <startrow>0</startrow>
+        <startcol>0</startcol>
+        </sheet>
+    </sheets>
+    <strict_types>N</strict_types>
+    <error_ignored>N</error_ignored>
+    <error_line_skipped>N</error_line_skipped>
+    <bad_line_files_destination_directory/>
+    <bad_line_files_extension>warning</bad_line_files_extension>
+    <error_line_files_destination_directory/>
+    <error_line_files_extension>error</error_line_files_extension>
+    <line_number_files_destination_directory/>
+    <line_number_files_extension>line</line_number_files_extension>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <spreadsheet_type>JXL</spreadsheet_type>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>208</xloc>
+      <yloc>21</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5408;&#x5e76;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var rycid&#x3b;&#xa;var rybm&#x3b;&#xa;&#xa;if &#x28;rycid2 &#x3d;&#x3d; null&#x29; &#x7b;&#xa;	rycid &#x3d; rycid1&#x3b;&#xa;	rybm &#x3d; dbbm1&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	rycid &#x3d; rycid1 &#x2b; &#x22;-&#x22; &#x2b; rycid2&#x3b;&#xa;	rybm &#x3d; dbbm1 &#x2b; &#x22;-&#x22; &#x2b; dbbm2&#x3b;&#xa;&#x7d;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>rycid</name>
+        <rename>rycid</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>rybm</name>
+        <rename>rybm</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>917</xloc>
+      <yloc>201</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x542f;&#x7528;&#x65e5;&#x671f;&#x8f6c;&#x6362;</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>        <select_unspecified>N</select_unspecified>
+      <meta>        <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
+        <rename>&#x542f;&#x7528;&#x65e5;&#x671f;</rename>
+        <type>Timestamp</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask>yyyy-MM-dd</conversion_mask>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>777</xloc>
+      <yloc>368</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</name>
+    <type>Constant</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>
+      <field>
+        <name>isCancel</name>
+        <type>Integer</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <nullif>0</nullif>
+        <length>-1</length>
+        <precision>-1</precision>
+        <set_empty_string>N</set_empty_string>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>361</xloc>
+      <yloc>22</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;</name>
+    <type>SplitFieldToRows3</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+   <splitfield>&#x4eba;&#x5458;&#x8303;&#x56f4;</splitfield>
+   <delimiter>,</delimiter>
+   <newfield>dbbm</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>777</xloc>
+      <yloc>22</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x62c6;&#x5206;&#x5206;&#x73ed;&#x642d;&#x73ed;&#x7f16;&#x7801;&#x5b57;&#x6bb5;</name>
+    <type>FieldSplitter</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+   <splitfield>dbbm</splitfield>
+   <delimiter>-</delimiter>
+   <enclosure/>
+    <fields>      <field>        <name>dbbm1</name>
+        <id/>
+        <idrem>N</idrem>
+        <type>String</type>
+        <format/>
+        <group/>
+        <decimal/>
+        <currency/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <nullif/>
+        <ifnull/>
+        <trimtype>none</trimtype>
+      </field>      <field>        <name>dbbm2</name>
+        <id/>
+        <idrem>N</idrem>
+        <type>String</type>
+        <format/>
+        <group/>
+        <decimal/>
+        <currency/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <nullif/>
+        <ifnull/>
+        <trimtype>none</trimtype>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>901</xloc>
+      <yloc>22</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;</name>
+    <type>SplitFieldToRows3</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+   <splitfield>&#x8def;&#x724c;&#x8303;&#x56f4;</splitfield>
+   <delimiter>,</delimiter>
+   <newfield>lpname</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>364</xloc>
+      <yloc>259</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
+    <type>SortRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>out</prefix>
+      <sort_size>1000000</sort_size>
+      <free_memory/>
+      <compress>N</compress>
+      <compress_variable/>
+      <unique_rows>N</unique_rows>
+    <fields>
+      <field>
+        <name>xlid</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>cid</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>&#x8d77;&#x59cb;&#x8def;&#x724c;</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>&#x8d77;&#x59cb;&#x4eba;&#x5458;</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>&#x4eba;&#x5458;&#x8303;&#x56f4;</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>isCancel</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>516</xloc>
+      <yloc>119</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55; 2</name>
+    <type>SortRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>out</prefix>
+      <sort_size>1000000</sort_size>
+      <free_memory/>
+      <compress>N</compress>
+      <compress_variable/>
+      <unique_rows>N</unique_rows>
+    <fields>
+      <field>
+        <name>xlid</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>cid</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>lpnames</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>lpids</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>&#x8d77;&#x59cb;&#x8def;&#x724c;</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>&#x8d77;&#x59cb;&#x4eba;&#x5458;</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>&#x4eba;&#x5458;&#x8303;&#x56f4;</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>isCancel</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>919</xloc>
+      <yloc>289</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x63d2;&#x5165; &#x2f; &#x66f4;&#x65b0;bsth_c_s_sr1_flat</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <commit>100</commit>
+    <update_bypassed>N</update_bypassed>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_sr1_flat</table>
+      <key>
+        <name>xlid</name>
+        <field>xl</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>cid</name>
+        <field>car_config_info</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>xl</name>
+        <rename>xlid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>car_config_info</name>
+        <rename>cid</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>lp_names</name>
+        <rename>lpnames</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>lp_ids</name>
+        <rename>lpids</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>lp_start</name>
+        <rename>&#x8d77;&#x59cb;&#x8def;&#x724c;</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>ry_start</name>
+        <rename>&#x8d77;&#x59cb;&#x4eba;&#x5458;</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>ry_dbbms</name>
+        <rename>rybms</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>qyrq</name>
+        <rename>&#x542f;&#x7528;&#x65e5;&#x671f;</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>ry_config_ids</name>
+        <rename>rycids</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>fbgs</name>
+        <rename>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</rename>
+        <update>Y</update>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>532</xloc>
+      <yloc>297</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</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>Y</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_line</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>&#x7ebf;&#x8def;</name>
+        <field>name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>isCancel</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>id</name>
+        <rename>xlid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>359</xloc>
+      <yloc>110</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</name>
+    <type>GetVariable</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>
+      <field>
+        <name>filepath_</name>
+        <variable>&#x24;&#x7b;filepath&#x7d;</variable>
+        <type>String</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+      </field>
+      <field>
+        <name>erroroutputdir_</name>
+        <variable>&#x24;&#x7b;erroroutputdir&#x7d;</variable>
+        <type>String</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>53</xloc>
+      <yloc>23</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8def;&#x724c;id&#x67e5;&#x8be2;</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>Y</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_gbi</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>xl</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>lpname</name>
+        <field>lp_name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>isCancel</name>
+        <field>is_cancel</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>id</name>
+        <rename>lpid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>516</xloc>
+      <yloc>21</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</name>
+    <type>DBJoin</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <rowlimit>1</rowlimit>
+    <sql>select t1.id as cid from bsth_c_s_ccinfo t1 left join bsth_c_cars t2 on t1.cl &#x3d; t2.id&#xa;where t1.xl &#x3d; &#x3f; and t2.inside_code &#x3d; &#x3f; and t1.is_cancel &#x3d; &#x3f;</sql>
+    <outer_join>Y</outer_join>
+    <replace_vars>N</replace_vars>
+    <parameter>
+      <field>
+        <name>xlid</name>
+        <type>Integer</type>
+      </field>
+      <field>
+        <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
+        <type>String</type>
+      </field>
+      <field>
+        <name>isCancel</name>
+        <type>Integer</type>
+      </field>
+    </parameter>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>360</xloc>
+      <yloc>184</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8fc7;&#x6ee4;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to/>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <conditions>
+  <condition>
+   <negated>N</negated>
+   <leftvalue>rycid1</leftvalue>
+   <function>IS NOT NULL</function>
+   <rightvalue/>
+   </condition>
+  <condition>
+   <negated>N</negated>
+   <operator>OR</operator>
+   <leftvalue>rycid2</leftvalue>
+   <function>IS NOT NULL</function>
+   <rightvalue/>
+   </condition>
+  </conditions>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>776</xloc>
+      <yloc>204</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8fc7;&#x6ee4;&#x7ebf;&#x8def;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to>&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</send_true_to>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <leftvalue>xlid</leftvalue>
+ <function>IS NOT NULL</function>
+ <rightvalue/>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>203</xloc>
+      <yloc>110</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8fc7;&#x6ee4;&#x8def;&#x724c;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</send_true_to>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <leftvalue>lpid</leftvalue>
+ <function>IS NOT NULL</function>
+ <rightvalue/>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>653</xloc>
+      <yloc>23</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8fc7;&#x6ee4;&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;</send_true_to>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <leftvalue>cid</leftvalue>
+ <function>IS NOT NULL</function>
+ <rightvalue/>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>208</xloc>
+      <yloc>182</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</name>
+    <type>ExcelOutput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <header>Y</header>
+    <footer>N</footer>
+    <encoding>UTF-8</encoding>
+    <append>N</append>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <file>
+      <name>&#x24;&#x7b;erroroutputdir&#x7d;&#x2f;&#x6392;&#x7248;&#x89c4;&#x5219;&#x4fe1;&#x606f;&#x5bfc;&#x5165;_&#x9519;&#x8bef;</name>
+      <extention>xls</extention>
+      <do_not_open_newfile_init>N</do_not_open_newfile_init>
+      <create_parent_folder>N</create_parent_folder>
+      <split>N</split>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <SpecifyFormat>N</SpecifyFormat>
+      <date_time_format/>
+      <sheetname>Sheet1</sheetname>
+      <autosizecolums>N</autosizecolums>
+      <nullisblank>N</nullisblank>
+      <protect_sheet>N</protect_sheet>
+      <password>Encrypted </password>
+      <splitevery>0</splitevery>
+      <usetempfiles>N</usetempfiles>
+      <tempdirectory/>
+      </file>
+    <template>
+      <enabled>N</enabled>
+      <append>N</append>
+      <filename>template.xls</filename>
+    </template>
+    <fields>
+      <field>
+        <name>xlid</name>
+        <type>Integer</type>
+        <format/>
+      </field>
+      <field>
+        <name>cid</name>
+        <type>Integer</type>
+        <format/>
+      </field>
+      <field>
+        <name>lpnames</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>lpids</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x8d77;&#x59cb;&#x8def;&#x724c;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x8d77;&#x59cb;&#x4eba;&#x5458;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x4eba;&#x5458;&#x8303;&#x56f4;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
+        <type>Timestamp</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>isCancel</name>
+        <type>Integer</type>
+        <format/>
+      </field>
+      <field>
+        <name>rycids</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>rybms</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>error_count</name>
+        <type>Integer</type>
+        <format/>
+      </field>
+      <field>
+        <name>error_desc</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>error_column1</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>error_column2</name>
+        <type>String</type>
+        <format/>
+      </field>
+    </fields>
+    <custom>
+    <header_font_name>arial</header_font_name>
+    <header_font_size>10</header_font_size>
+    <header_font_bold>N</header_font_bold>
+    <header_font_italic>N</header_font_italic>
+    <header_font_underline>no</header_font_underline>
+    <header_font_orientation>horizontal</header_font_orientation>
+    <header_font_color>black</header_font_color>
+    <header_background_color>none</header_background_color>
+    <header_row_height>255</header_row_height>
+    <header_alignment>left</header_alignment>
+    <header_image/>
+    <row_font_name>arial</row_font_name>
+    <row_font_size>10</row_font_size>
+    <row_font_color>black</row_font_color>
+    <row_background_color>none</row_background_color>
+      </custom>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>534</xloc>
+      <yloc>392</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step_error_handling>
+      <error>
+        <source_step>&#x63d2;&#x5165; &#x2f; &#x66f4;&#x65b0;bsth_c_s_sr1_flat</source_step>
+        <target_step>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</target_step>
+        <is_enabled>Y</is_enabled>
+        <nr_valuename>error_count</nr_valuename>
+        <descriptions_valuename>error_desc</descriptions_valuename>
+        <fields_valuename>error_column1</fields_valuename>
+        <codes_valuename>error_column2</codes_valuename>
+        <max_errors/>
+        <max_pct_errors/>
+        <min_pct_rows/>
+      </error>
+  </step_error_handling>
+   <slave-step-copy-partition-distribution>
+</slave-step-copy-partition-distribution>
+   <slave_transformation>N</slave_transformation>
+
+</transformation>
@@ -290,9 +290,11 @@
   <hop> <from>&#x8fc7;&#x6ee4;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x5408;&#x5e76;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x5408;&#x5e76;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55; 2</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x6392;&#x5e8f;&#x8bb0;&#x5f55; 2</from><to>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x63d2;&#x5165; &#x2f; &#x66f4;&#x65b0;bsth_c_s_sr1_flat</from><to>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</from><to>&#x542f;&#x7528;&#x65e5;&#x671f;&#x8f6c;&#x6362;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x542f;&#x7528;&#x65e5;&#x671f;&#x8f6c;&#x6362;</from><to>&#x63d2;&#x5165; &#x2f; &#x66f4;&#x65b0;bsth_c_s_sr1_flat</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x542f;&#x7528;&#x65e5;&#x671f;&#x8f6c;&#x6362;</from><to>&#x5220;&#x9664;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5220;&#x9664;</from><to>&#x963b;&#x585e;&#x6570;&#x636e;&#x76f4;&#x5230;&#x6b65;&#x9aa4;&#x90fd;&#x5b8c;&#x6210;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x963b;&#x585e;&#x6570;&#x636e;&#x76f4;&#x5230;&#x6b65;&#x9aa4;&#x90fd;&#x5b8c;&#x6210;</from><to>&#x89c4;&#x5219;&#x8868;&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x89c4;&#x5219;&#x8868;&#x8f93;&#x51fa;</from><to>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</to><enabled>Y</enabled> </hop>
   </order>
   <step>
     <name>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</name>
@@ -1075,94 +1077,6 @@
     </step>
   <step>
-    <name>&#x63d2;&#x5165; &#x2f; &#x66f4;&#x65b0;bsth_c_s_sr1_flat</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <connection>bus_control_variable</connection>
-    <commit>100</commit>
-    <update_bypassed>N</update_bypassed>
-    <lookup>
-      <schema/>
-      <table>bsth_c_s_sr1_flat</table>
-      <key>
-        <name>xlid</name>
-        <field>xl</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>cid</name>
-        <field>car_config_info</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>xl</name>
-        <rename>xlid</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>car_config_info</name>
-        <rename>cid</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>lp_names</name>
-        <rename>lpnames</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>lp_ids</name>
-        <rename>lpids</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>lp_start</name>
-        <rename>&#x8d77;&#x59cb;&#x8def;&#x724c;</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>ry_start</name>
-        <rename>&#x8d77;&#x59cb;&#x4eba;&#x5458;</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>ry_dbbms</name>
-        <rename>rybms</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>qyrq</name>
-        <rename>&#x542f;&#x7528;&#x65e5;&#x671f;</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>ry_config_ids</name>
-        <rename>rycids</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>fbgs</name>
-        <rename>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>532</xloc>
-      <yloc>297</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
     <name>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</name>
     <type>DBLookup</type>
     <description/>
@@ -1527,7 +1441,7 @@
         <format/>
       </field>
       <field>
-        <name>&#x8def;&#x724c;&#x8303;&#x56f4;</name>
+        <name>lpnames</name>
         <type>String</type>
         <format/>
       </field>
@@ -1572,6 +1486,11 @@
         <format/>
       </field>
       <field>
+        <name>rybms</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
         <name>error_count</name>
         <type>Integer</type>
         <format/>
@@ -1611,15 +1530,149 @@
       </custom>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>534</xloc>
-      <yloc>392</yloc>
+      <xloc>253</xloc>
+      <yloc>501</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5220;&#x9664;</name>
+    <type>Delete</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <commit>100</commit>
+    <lookup>
+      <schema/>
+      <table>bsth_c_s_sr1_flat</table>
+      <key>
+        <name>xlid</name>
+        <field>xl</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>619</xloc>
+      <yloc>370</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x963b;&#x585e;&#x6570;&#x636e;&#x76f4;&#x5230;&#x6b65;&#x9aa4;&#x90fd;&#x5b8c;&#x6210;</name>
+    <type>BlockUntilStepsFinish</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <steps>
+      <step>
+        <name>&#x5220;&#x9664;</name>
+        <CopyNr>0</CopyNr>
+        </step>
+      </steps>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>450</xloc>
+      <yloc>370</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x89c4;&#x5219;&#x8868;&#x8f93;&#x51fa;</name>
+    <type>TableOutput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <schema/>
+    <table>bsth_c_s_sr1_flat</table>
+    <commit>1000</commit>
+    <truncate>N</truncate>
+    <ignore_errors>N</ignore_errors>
+    <use_batch>Y</use_batch>
+    <specify_fields>Y</specify_fields>
+    <partitioning_enabled>N</partitioning_enabled>
+    <partitioning_field/>
+    <partitioning_daily>N</partitioning_daily>
+    <partitioning_monthly>Y</partitioning_monthly>
+    <tablename_in_field>N</tablename_in_field>
+    <tablename_field/>
+    <tablename_in_table>Y</tablename_in_table>
+    <return_keys>N</return_keys>
+    <return_field/>
+    <fields>
+        <field>
+          <column_name>xl</column_name>
+          <stream_name>xlid</stream_name>
+        </field>
+        <field>
+          <column_name>car_config_info</column_name>
+          <stream_name>cid</stream_name>
+        </field>
+        <field>
+          <column_name>lp_names</column_name>
+          <stream_name>lpnames</stream_name>
+        </field>
+        <field>
+          <column_name>lp_ids</column_name>
+          <stream_name>lpids</stream_name>
+        </field>
+        <field>
+          <column_name>lp_start</column_name>
+          <stream_name>&#x8d77;&#x59cb;&#x8def;&#x724c;</stream_name>
+        </field>
+        <field>
+          <column_name>ry_start</column_name>
+          <stream_name>&#x8d77;&#x59cb;&#x4eba;&#x5458;</stream_name>
+        </field>
+        <field>
+          <column_name>qyrq</column_name>
+          <stream_name>&#x542f;&#x7528;&#x65e5;&#x671f;</stream_name>
+        </field>
+        <field>
+          <column_name>fbgs</column_name>
+          <stream_name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</stream_name>
+        </field>
+        <field>
+          <column_name>ry_dbbms</column_name>
+          <stream_name>rybms</stream_name>
+        </field>
+        <field>
+          <column_name>ry_config_ids</column_name>
+          <stream_name>rycids</stream_name>
+        </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>259</xloc>
+      <yloc>369</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step_error_handling>
       <error>
-        <source_step>&#x63d2;&#x5165; &#x2f; &#x66f4;&#x65b0;bsth_c_s_sr1_flat</source_step>
+        <source_step>&#x89c4;&#x5219;&#x8868;&#x8f93;&#x51fa;</source_step>
         <target_step>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</target_step>
         <is_enabled>Y</is_enabled>
         <nr_valuename>error_count</nr_valuename>
@@ -289,14 +289,20 @@
 	                </div>
 	                <!-- 线路规划类型 (* 必填项) END -->
-	                 <!-- 开辟日期 START　-->
+	                <!--大间隔等级 START　-->
 					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
 	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                     	<select name="spacGrade" class="form-control" id="spacGradeSelect">
+								<option value="">-- 请选择大间隔等级 --</option>
+								<option value="1">一级</option>
+								<option value="2">二级</option>
+								<option value="3">三级</option>
+								<option value="4">四级</option>
+							</select>
 	                    </div>
 	                </div>
-	                <!-- 开辟日期 END　-->
+	                <!-- 大间隔等级END　-->
                  </div>
                  <!-- 表单分组组件 form-group START -->
@@ -398,6 +404,15 @@
 	                    </div>
 	                </div>
 	                <!-- 空调车辆数 END -->
+	                
+	                <!-- 开辟日期 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                    </div>
+	                </div>
+	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
@@ -282,14 +282,20 @@
 	                </div>
 	                <!-- 线路规划类型 (* 必填项) END -->
-	                 <!-- 开辟日期 START　-->
+	                 <!--大间隔等级 START　-->
 					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
 	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                     	<select name="spacGrade" class="form-control" id="spacGradeSelect">
+								<option value="">-- 请选择大间隔等级 --</option>
+								<option value="1">一级</option>
+								<option value="2">二级</option>
+								<option value="3">三级</option>
+								<option value="4">四级</option>
+							</select>
 	                    </div>
 	                </div>
-	                <!-- 开辟日期 END　-->
+	                <!-- 大间隔等级END　-->
                  </div>
                  <!-- 表单分组组件 form-group START -->
@@ -391,6 +397,15 @@
 	                    </div>
 	                </div>
 	                <!-- 空调车辆数 END -->
+	                
+	                <!-- 开辟日期 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                    </div>
+	                </div>
+	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
@@ -290,14 +290,20 @@
 	                </div>
 	                <!-- 线路规划类型 (* 必填项) END -->
-	                 <!-- 开辟日期 START　-->
+	                <!--大间隔等级 START　-->
 					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
 	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                     	<select name="spacGrade" class="form-control" id="spacGradeSelect">
+								<option value="">-- 请选择大间隔等级 --</option>
+								<option value="1">一级</option>
+								<option value="2">二级</option>
+								<option value="3">三级</option>
+								<option value="4">四级</option>
+							</select>
 	                    </div>
 	                </div>
-	                <!-- 开辟日期 END　-->
+	                <!-- 大间隔等级END　-->
                  </div>
                  <!-- 表单分组组件 form-group START -->
@@ -399,6 +405,15 @@
 	                    </div>
 	                </div>
 	                <!-- 空调车辆数 END -->
+	                
+	                 <!-- 开辟日期 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="openDate" id="openDateInput" placeholder="开辟日期">
+	                    </div>
+	                </div>
+	                <!-- 开辟日期 END　-->
                  </div>
                  <!-- 表单分组组件 form-group END -->
@@ -18,9 +18,10 @@
 							<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_bctz">
 								<thead>
 									<tr role="row" class="heading">
-										<th width="33%">路牌</th>
-										<th width="33%">当前班次数</th>
-										<th width="33%">调整班次数</th>
+										<th width="25%">路牌编码</th>
+										<th width="25%">路牌名称</th>
+										<th width="25%">当前班次数</th>
+										<th width="25%">调整班次数</th>
 									</tr>
 								</thead>
 								<tbody></tbody>
@@ -40,13 +41,16 @@
 {{each list as obj i }}
 	<tr role="row" class="filter">
 		<td>
-			<input type="text" readonly  class="form-control form-filter input-sm" name="lpname_{{i+1}}" value="{{obj.lpNo}}">
+			<input type="text" readonly  class="form-control form-filter input-sm" name="lpno_{{i+1}}" value="{{obj.lpNo}}">
+		</td>
+		<td>
+			<input type="text" readonly  class="form-control form-filter input-sm" name="lpname_{{i+1}}" value="{{obj.lpName}}">
 		</td>
 		<td>
 			<input type="text" readonly class="form-control form-filter input-sm" name="dqbc_{{i+1}}" value="{{obj.bcs}}">
 		</td>
 		<td>
-			<input type="number" class="form-control form-filter input-sm" name="{{i+1}}" value="{{obj.bcs}}">
+			<input type="number" class="form-control form-filter input-sm" name="{{i+1}}" value="{{obj.bcs}}" min="0">
 		</td>
 	</tr>
 {{/each}}
@@ -57,230 +61,239 @@
 	{{/if}}
 </script>
 <script type="text/javascript">
-$('#tzbc_mobal').on('tzbcMobal.show', function(e,obj,cardata,bf){
-	setTimeout(function(){
-		// 加载延迟200毫秒显示mobal
-		$('#tzbc_mobal').modal({show : true,backdrop: 'static', keyboard: false});
-	},200);
-	// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
-	$('#tzbc_mobal').on('show.bs.modal', function () {
-		// 把数据填充到模版中
-		var tbodyHtml = template('bctz_temp',{list:cardata});
-		// 把渲染好的模版html文本追加到表格中
-		$('#datatable_bctz tbody').html(tbodyHtml);
-	});
-	// 获取表单元素
-	var form = $('#tzbcForm');
-	// 错误提示元素
-	var tzbcAlert = $('#tzbcAlert', form);
-	// 下一步点击事件
-	$('#tzbcnext').on('click', function() {
-		form.submit();// 表单提交
-	});
-	// 表单验证
-	form.validate({
-		errorElement : 'span', 
-		errorClass : 'help-block help-block-error', 
-		focusInvalid : false, 
-		rules : {
-		},
-		invalidHandler : function(event, validator) {  
-			tzbcAlert.show();
-			App.scrollTo(reladplusname, -200);
-		},
-		highlight : function(element) { 
-			$(element).closest('.form-group').addClass('has-error'); 
-		},
-		unhighlight : function(element) { 
-			$(element).closest('.form-group').removeClass('has-error'); 
-		},
-		success : function(label) {
-			label.closest('.form-group').removeClass('has-error'); 
-		},
-		submitHandler : function(f) {
-			// 1、 获取表单内容,并序列化
-			var params = form.serializeJSON();
-			// 2、 调整路牌对应的班次总数
-			updFormParams(params);
-			// 3、调整班次.并重新给定班次序号和发车序号.再确定首末班车时间.最后渲染数据
-			obj.data(bf.tzsmbcsj(bf.setbcsAndfcno(tzbcDate()),
-					obj.configuration.dataMap.smbcsjArr,
-					obj.configuration.dataMap.ccsjArr,
-					obj.configuration.dataMap.cclcArr,
-					obj.configuration.dataMap.qdzArr,
-					obj.configuration.dataMap.lbsj));
-			// 3、记录早操.并保存历史班次数据
-			obj.addHistory();
-			// 5、隐藏错误提示
-			tzbcAlert.hide();
-			// 6、隐藏 reladplus_mobal 弹出层 
-			$('#tzbc_mobal').modal('hide');
-		}
-	});
-	
-	/**
-	 * @description : (TODO) 调整路牌对应的班次总数.
-	 *
-	 *				    ❀  根据路牌对应班次的数值，把路牌对应的当前班次总数修改成调整后的班次总数,并转为数值类型以及把空值转为0.
-	 * 
-	 * @params : [p--表单序列化对象].
-	 */
-	function updFormParams(p) {
-		for(var i= 0;i<cardata.length;i++) {
-			if(p[i+1] != undefined) {
-				if(p[i+1]=='')
-					cardata[i].tzbc = 0;
-				else 
-					cardata[i].tzbc = parseInt(p[i+1]);
+$('#tzbc_mobal').on('tzbcMobal.show', function(e,obj,cardata,bf,error){
+	if(obj != null && obj !='' && bf != null && bf!='' && cardata.length>0){
+		// 延迟200毫秒显示mobal
+		setTimeout(function(){$('#tzbc_mobal').modal({show : true,backdrop: 'static', keyboard: false});},200);
+		// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
+		$('#tzbc_mobal').on('show.bs.modal', function () {
+			// 把数据填充到模版中
+			var tbodyHtml = template('bctz_temp',{list:cardata});
+			// 把渲染好的模版html文本追加到表格中
+			$('#datatable_bctz tbody').html(tbodyHtml);
+		});
+		// 获取表单元素
+		var form = $('#tzbcForm');
+		// 错误提示元素
+		var tzbcAlert = $('#tzbcAlert', form);
+		// 下一步点击事件
+		$('#tzbcnext').on('click', function() {
+			form.submit();// 表单提交
+		});
+		// 表单验证
+		form.validate({
+			errorElement : 'span', 
+			errorClass : 'help-block help-block-error', 
+			focusInvalid : false, 
+			rules : {
+			},
+			invalidHandler : function(event, validator) {  
+				tzbcAlert.show();
+				App.scrollTo(reladplusname, -200);
+			},
+			highlight : function(element) { 
+				$(element).closest('.form-group').addClass('has-error'); 
+			},
+			unhighlight : function(element) { 
+				$(element).closest('.form-group').removeClass('has-error'); 
+			},
+			success : function(label) {
+				label.closest('.form-group').removeClass('has-error'); 
+			},
+			submitHandler : function(f) {
+				// 1、 获取表单内容,并序列化
+				var params = form.serializeJSON();
+				var dataMap = obj.configuration.dataMap;
+				// 2、 调整路牌对应的班次总数
+				updFormParams(params);
+				// 3、调整班次.并重新给定班次序号和发车序号.再确定首末班车时间.最后渲染数据.
+				var jar = bf.tzsmbcsj01(bf.setbcsAndfcno(tzbcDate()),
+								  obj.configuration.dataMap.smbcsjArr,
+								  obj.configuration.dataMap.ccsjArr,
+								  obj.configuration.dataMap.cclcArr,
+								  obj.configuration.dataMap.qdzArr,
+								  obj.configuration.dataMap.lbsj,dataMap);
+				obj.data(bf.addjcclcbc01(obj.configuration.taskTypes,jar,dataMap,
+							obj.configuration.stopAraay,obj.configuration.dataMap.map));
+				// 3、记录早操.并保存历史班次数据
+				obj.addHistory();
+				// 5、隐藏错误提示
+				tzbcAlert.hide();
+				// 6、隐藏 reladplus_mobal 弹出层 
+				$('#tzbc_mobal').modal('hide');
+			}
+		});
+		
+		/**
+		 * @description : (TODO) 调整路牌对应的班次总数.
+		 *
+		 *				    ❀  根据路牌对应班次的数值，把路牌对应的当前班次总数修改成调整后的班次总数,并转为数值类型以及把空值转为0.
+		 * 
+		 * @params : [p--表单序列化对象].
+		 */
+		function updFormParams(p) {
+			for(var i= 0;i<cardata.length;i++) {
+				if(p[i+1] != undefined) {
+					if(p[i+1]=='')
+						cardata[i].tzbc = 0;
+					else 
+						cardata[i].tzbc = parseInt(p[i+1]);
+				}
 			}
 		}
-	}
-	
-	/**
-	 * @description : (TODO)调整班次.
-	 *
-	 * @return : 返回一个数组.这里返回的是一个调整完班次数后的数组.
-	 */
-	function tzbcDate() {
-		 // 1、获取当前所有的班次数.
-		 var dr = obj.getDataArray(),
-		 	 result = new Array();// 定义返回数组对象.
-		 // 2、遍历路牌对应的班次总数.
-		 for(var i = 0 ; i<cardata.length;i++) {
-			 var zcbcsz = new Array(),// 定义当前路牌下的正常班次数组.
-			 	 zwlbbcsz = new Array(),// 定义当前路牌下的早晚例保、吃饭班次数组.
-			 	 jccbcs = 0,// 进出场班次数.这个值是为了计算总班次数时除去时间为空的班次
-			 	 jccbcsz = new Array();// 定义当前路牌下的进出场班次数组.
-			 // 3、遍历当前所有的班次数.
-			 for(var j = 0 ;j<dr.length;j++) {
-				 // 4、判断当前遍历的班次是否属于当前路牌对应的班次数组对象.
-				 if(cardata[i].lpNo == dr[j].parent && dr[j].bcsj>0 ){
-					 // 5、把当前班次添加到上序定义的不同班次数组中.
-					 if(dr[j].bcType =='bd' || dr[j].bcType=='lc' || dr[j].bcType =='cf')
-						 zwlbbcsz.push(dr[j]);// 添加到早晚例保、吃饭班次数组中.
-					 else if(dr[j].bcType=='in' || dr[j].bcType =='out')
-						 jccbcs++;
-					 else
-						 zcbcsz.push(dr[j]);// 添加到正常班次数组.
-				 }
-				 if(cardata[i].lpNo == dr[j].parent && (dr[j].bcType=='in' || dr[j].bcType =='out')) {
-					 jccbcsz.push(dr[j]);// 添加到进出场班次数组中.
+		
+		/**
+		 * @description : (TODO)调整班次.
+		 *
+		 * @return : 返回一个数组.这里返回的是一个调整完班次数后的数组.
+		 */
+		function tzbcDate() {
+			 // 1、获取当前所有的班次数.
+			 var dr = obj.getDataArray(),
+			 	 result = new Array();// 定义返回数组对象.
+			 // 2、遍历路牌对应的班次总数.
+			 for(var i = 0 ; i<cardata.length;i++) {
+				 var zcbcsz = new Array(),// 定义当前路牌下的正常班次数组.
+				 	 zwlbbcsz = new Array(),// 定义当前路牌下的早晚例保、吃饭班次数组.
+				 	 jccbcs = 0,// 进出场班次数.这个值是为了计算总班次数时除去时间为空的班次
+				 	 jccbcsz = new Array();// 定义当前路牌下的进出场班次数组.
+				 // 3、遍历当前所有的班次数.
+				 for(var j = 0 ;j<dr.length;j++) {
+					 // 4、判断当前遍历的班次是否属于当前路牌对应的班次数组对象.
+					 if(cardata[i].lpNo == dr[j].parent && dr[j].bcsj>0 ){
+						 // 5、把当前班次添加到上序定义的不同班次数组中.
+						 if(dr[j].bcType =='bd' || dr[j].bcType=='lc' || dr[j].bcType =='cf')
+							 zwlbbcsz.push(dr[j]);// 添加到早晚例保、吃饭班次数组中.
+						 else if(dr[j].bcType=='in' || dr[j].bcType =='out')
+							 jccbcs++;
+						 else
+							 zcbcsz.push(dr[j]);// 添加到正常班次数组.
+					 }
+					 if(cardata[i].lpNo == dr[j].parent && (dr[j].bcType=='in' || dr[j].bcType =='out')) {
+						 jccbcsz.push(dr[j]);// 添加到进出场班次数组中.
+					 }
 				 }
-			 }
-			 // 6、调整班次
-			 result = result.concat(tcbcgz(bf.pxarr(zcbcsz),cardata[i].tzbc,zwlbbcsz,bf.pxarr(jccbcsz),jccbcs,cardata[i]));
+				 // 6、调整班次
+				 result = result.concat(tcbcgz(bf.pxarr(zcbcsz),cardata[i].tzbc,zwlbbcsz,bf.pxarr(jccbcsz),jccbcs,cardata[i]));
+			}
+			return result;
 		}
-		return result;
-	}
-	
-	/**
-	 * @description : (TODO)
-	 *
-	 * @params : [ar-- 当前路牌下的正常班次数组;num--当前路牌对应的班次总数;qa--当前路牌下的早晚例保、吃饭班次数组,ja--当前路牌下的进出场班次数组]
-	 *
-	 * @return : 返回一个数组.这里返回一个根据班次总数调整过车班次数组
-	 */
-	function tcbcgz(ar,num,qa,ja,jccbcs,cara) {
-		 var rsbcA = new Array();
-		 if(ar.length>0) {
-			 var ra_ = new Array();
-			 var _dx = num-jccbcs;// 班次总数值 - 进出时间大于零的班次 = 正常班次数
-			 var lastbcsjStr = ar[ar.length-1].ARRIVALTIME;// 标记调整班次之前最后一个班次的达到时间
-			 var fcno_ = Math.abs(ar.length+jccbcs-num),// 调整班次差
-				 tempS = '';// 标记调整班次是添加还是剔除[jq--剔除;add--添加]
-			 var fxdm = bf.dirDmToIndex(ar[ar.length-1].xlDir);// 标记调整班次之前最后一个班次的方向
-			 // 如果调整班次差是成对的,那么方向一致.否则改变方向
-			 if(fcno_%2!=0)
-				 fxdm =  bf.getfx(1,fxdm);// 改变方向
-			 // 如果当前路牌的班次总数大于等于调整后的班次总数则截取班次,反之添加班次
-			 if(ar.length>=_dx) {
-				 ra_ = ar.splice(0,_dx);// 截取班次数(这里从下标0开始截取到 对应的班次总数值)
-				 tempS = 'jq';
-			 }else if(ar.length<_dx) {
-				 var tzsj_ = obj.configuration.dataMap.ztjxA[fxdm],sh = ar[ar.length-1];
-				 var startTime = new Date();
-				 var strArray = sh.ARRIVALTIME.split(':');
-				 startTime.setHours(parseInt(strArray[0]));
-				 startTime.setMinutes(parseInt(strArray[1]) + tzsj_);
-				 bf.addbc(obj,sh,startTime,tzsj_,sh.fcno + 1,ar,_dx - ar.length);
-				 ra_ = ar;
-				tempS = 'add';
-			 } 
-			 rsbcA =  tzsj(ra_,qa,ja,lastbcsjStr,fcno_,tempS,fxdm);
-		 }else if(ar.length==0) {
-			 rsbcA =  bf.addlpbc(obj,bf,cara.lpNo,num);
+		
+		/**
+		 * @description : (TODO)
+		 *
+		 * @params : [ar-- 当前路牌下的正常班次数组;num--当前路牌对应的班次总数;qa--当前路牌下的早晚例保、吃饭班次数组,ja--当前路牌下的进出场班次数组]
+		 *
+		 * @return : 返回一个数组.这里返回一个根据班次总数调整过车班次数组
+		 */
+		function tcbcgz(ar,num,qa,ja,jccbcs,cara) {
+			 var rsbcA = new Array();
+			 if(ar.length>0) {
+				 var ra_ = new Array();
+				 var _dx = num-jccbcs;// 班次总数值 - 进出时间大于零的班次 = 正常班次数
+				 var lastbcsjStr = ar[ar.length-1].ARRIVALTIME;// 标记调整班次之前最后一个班次的达到时间
+				 var fcno_ = Math.abs(ar.length+jccbcs-num),// 调整班次差
+					 tempS = '';// 标记调整班次是添加还是剔除[jq--剔除;add--添加]
+				 var fxdm = bf.dirDmToIndex(ar[ar.length-1].xlDir);// 标记调整班次之前最后一个班次的方向
+				 // 如果调整班次差是成对的,那么方向一致.否则改变方向
+				 if(fcno_%2!=0)
+					 fxdm =  bf.getfx(1,fxdm);// 改变方向
+				 // 如果当前路牌的班次总数大于等	于调整后的班次总数则截取班次,反之添加班次
+				 if(ar.length>=_dx) {
+					 ra_ = ar.splice(0,_dx);// 截取班次数(这里从下标0开始截取到 对应的班次总数值)
+					 tempS = 'jq';
+				 }else if(ar.length<_dx) {
+					 var sh = ar[ar.length-1];
+					 var cctag = bf.dirDmToIndex(ar[ar.length-1].xlDir);// 标记调整班次之前最后一个班次的方向
+					 cctag =  bf.getfx(1,cctag);// 改变方向
+					 var startTime = new Date();
+					 var strArray = sh.ARRIVALTIME.split(':');
+					 startTime.setHours(parseInt(strArray[0]));
+					 startTime.setMinutes(parseInt(strArray[1]));
+					 var tzjx =  bf.isgfsjd01(startTime,obj.configuration.dataMap) ?  obj.configuration.dataMap.gftzsj[cctag] : obj.configuration.dataMap.dgtzsj[cctag];
+					 startTime.setMinutes(parseInt(strArray[1]) + tzjx);
+					 bf.addbc(obj , sh , startTime , tzjx, (sh.fcno + 1),ar, (_dx - ar.length));
+					 ra_ = ar;
+					tempS = 'add';
+				 } 
+				 // rsbcA =  tzsj(ra_,qa,ja,lastbcsjStr,fcno_,tempS,fxdm);
+				 rsbcA = ra_;
+			 }else if(ar.length==0) {
+				 rsbcA =  bf.addlpbc(obj,bf,cara.lpNo,num);
+			 }
+			 return rsbcA;
 		 }
-		 return rsbcA;
-	 }
-	
-	/**
-	 * @description : (TODO) 调整时间
-	 *
-	 * @params : [a1-- 当前路牌下的正常班次数组;a2--当前路牌下的早晚例保、吃饭班次数组;a3--当前路牌下的进出场班次数组]
-	 * 
-	 * @return : 返回一个数组.这里返回的是一个调整时间后的班次数组
-	 */
-	function tzsj(a1,a2,a3,sjstr,fcno_,tempS,fxdm) {
-		return a1.concat(jsjclc(a1[a1.length-1].ARRIVALTIME,a2,a3,sjstr,fcno_,tempS,fxdm));
-	}
-	
-	/**
-	 * @description : (TODO)调整进出场、离场班次
-	 *
-	 * @params : [st--当前路牌最后一个班次的到达时间;ar--当前路牌下的早晚例保、吃饭班次数组,pa--当前路牌下的进出场班次数组]
-	 *
-	 * @return
-	 */
-	 function jsjclc(st,ar,pa,sjstr,fcno_,tempS,fxdm) {
-		 console.log('{' + tempS +  '......}')
-		 // 1、修改进出场班次.
-		 for(var p = 0;p<pa.length;p++) {
-			// A）、如果当前班次的发车时间等于 在没有调整班次总数之前的最后一个班次的到达时间,则这个班次是在没有调整班次之前的那个进场班次
-			if(pa[p].fcsj == sjstr && pa[p].bcType =='in') {
-				pa[p].fcsj = st;
-				pa[p].bcsj = obj.configuration.dataMap.ccsjArr[fxdm];
-				pa[p].xlDir = obj.configuration.dataMap.dira[fxdm];
-				var _s = bf.getDateTime(st);
-				var _tt = new Date(_s);
-				_tt.setMinutes(_tt.getMinutes()+pa[p].bcsj);
-				var ddsjStr = bf.getTimeStr(_tt);
-				pa[p].ARRIVALTIME = ddsjStr;
-				if(tempS =='add')
-					pa[p].fcno = pa[p].fcno+fcno_;
-				else if(tempS =='jq')
-					pa[p].fcno = pa[p].fcno-fcno_;
-			}
-			// B）、剔除掉 当前班次的到达时间大于调整班次过后最后一个班次到达时间的班次
-			if((bf.getDateTime(pa[p].ARRIVALTIME)-bf.getDateTime(st))/60000 > pa[p].bcsj) {
-				console.log('{' + pa[p].lpNo + '----' + pa[p].ARRIVALTIME + '----' +  st +  '}');
-				console.log('修改进出场班次时...该班次的到达时间大于了最后一个班次的到达时间,应该剔除掉！');
-				pa.splice(p,1);
-			} 
+		
+		/**
+		 * @description : (TODO) 调整时间
+		 *
+		 * @params : [a1-- 当前路牌下的正常班次数组;a2--当前路牌下的早晚例保、吃饭班次数组;a3--当前路牌下的进出场班次数组]
+		 * 
+		 * @return : 返回一个数组.这里返回的是一个调整时间后的班次数组
+		 */
+		function tzsj(a1,a2,a3,sjstr,fcno_,tempS,fxdm) {
+			return a1.concat(jsjclc(a1[a1.length-1].ARRIVALTIME,a2,a3,sjstr,fcno_,tempS,fxdm));
 		}
-		// 2、修改晚例保班次.
-		for(var i = 0 ; i<ar.length;i++) {
-			// A）、修改离场班次属性值
-			if(ar[i].bcType=='lc') {
-				ar[i].fcsj =  ddsjStr;
-				ar[i].xlDir = obj.configuration.dataMap.dira[fxdm];
-				var _lcs = bf.getDateTime(ddsjStr);
-				var _lctt = new Date(_lcs);
-				_lctt.setMinutes(_lctt.getMinutes()+ar[i].bcsj);
-				ar[i].ARRIVALTIME = bf.getTimeStr(_lctt);
-				if(tempS =='add')
-					ar[i].fcno = ar[i].fcno+fcno_;
-				else if(tempS =='jq')
-					ar[i].fcno = ar[i].fcno-fcno_;
+		
+		/**
+		 * @description : (TODO)调整进出场、离场班次
+		 *
+		 * @params : [st--当前路牌最后一个班次的到达时间;ar--当前路牌下的早晚例保、吃饭班次数组,pa--当前路牌下的进出场班次数组]
+		 *
+		 * @return
+		 */
+		 function jsjclc(st,ar,pa,sjstr,fcno_,tempS,fxdm) {
+			 // 1、修改进出场班次.
+			 for(var p = 0;p<pa.length;p++) {
+				// A）、如果当前班次的发车时间等于 在没有调整班次总数之前的最后一个班次的到达时间,则这个班次是在没有调整班次之前的那个进场班次
+				if(pa[p].fcsj == sjstr && pa[p].bcType =='in') {
+					pa[p].fcsj = st;
+					pa[p].bcsj = obj.configuration.dataMap.ccsjArr[fxdm];
+					pa[p].xlDir = obj.configuration.dataMap.dira[fxdm];
+					var _s = bf.getDateTime(st);
+					var _tt = new Date(_s);
+					_tt.setMinutes(_tt.getMinutes()+pa[p].bcsj);
+					var ddsjStr = bf.getTimeStr(_tt);
+					pa[p].ARRIVALTIME = ddsjStr;
+					if(tempS =='add')
+						pa[p].fcno = pa[p].fcno+fcno_;
+					else if(tempS =='jq')
+						pa[p].fcno = pa[p].fcno-fcno_;
+				}
+				// B）、剔除掉 当前班次的到达时间大于调整班次过后最后一个班次到达时间的班次
+				if((bf.getDateTime(pa[p].ARRIVALTIME)-bf.getDateTime(st))/60000 > pa[p].bcsj) {
+					console.log('{' + pa[p].lpNo + '----' + pa[p].ARRIVALTIME + '----' +  st +  '}');
+					console.log('修改进出场班次时...该班次的到达时间大于了最后一个班次的到达时间,应该剔除掉！');
+					pa.splice(p,1);
+				} 
 			}
-			// B）、剔除掉 当前班次的到达时间大于调整班次过后最后一个班次到达时间的班次
-			if(bf.getDateTime(ar[i].ARRIVALTIME)>bf.getDateTime(st) && ar[i].bcType!='lc') {
-				console.log('{' + ar[i].lpNo + '----' + ar[i].ARRIVALTIME + '----' +  st +  '}')
-				console.log('修改晚例保班次时...该班次的到达时间大于了最后一个班次的到达时间,应该剔除掉！');
-				ar.splice(i,1);
+			// 2、修改晚例保班次.
+			for(var i = 0 ; i<ar.length;i++) {
+				// A）、修改离场班次属性值
+				if(ar[i].bcType=='lc') {
+					ar[i].fcsj =  ddsjStr;
+					ar[i].xlDir = obj.configuration.dataMap.dira[fxdm];
+					var _lcs = bf.getDateTime(ddsjStr);
+					var _lctt = new Date(_lcs);
+					_lctt.setMinutes(_lctt.getMinutes()+ar[i].bcsj);
+					ar[i].ARRIVALTIME = bf.getTimeStr(_lctt);
+					if(tempS =='add')
+						ar[i].fcno = ar[i].fcno+fcno_;
+					else if(tempS =='jq')
+						ar[i].fcno = ar[i].fcno-fcno_;
+				}
+				// B）、剔除掉 当前班次的到达时间大于调整班次过后最后一个班次到达时间的班次
+				if(bf.getDateTime(ar[i].ARRIVALTIME)>bf.getDateTime(st) && ar[i].bcType!='lc') {
+					console.log('{' + ar[i].lpNo + '----' + ar[i].ARRIVALTIME + '----' +  st +  '}')
+					console.log('修改晚例保班次时...该班次的到达时间大于了最后一个班次的到达时间,应该剔除掉！');
+					ar.splice(i,1);
+				}
 			}
-		}
-		// 3、合并进出场、例保班次,并返回.
-		return pa.concat(ar);
-	 }
+			// 3、合并进出场、例保班次,并返回.
+			return pa.concat(ar);
+		 }
+	} else{
+		error.show('参数异常!','【 obj：' + obj + ' , cardata：' + cardata + ' , bf：' + bf + '】');
+	}
 });
 </script>
 \ No newline at end of file
+<!-- 修改路牌名称 -->
+<div class="modal fade" id="editlp_mobal" tabindex="-1" role="basic" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+				<h4 class="modal-title">修改路牌名称</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" action="/" method="post" id="editlpForm" role="form">
+					<!-- alert-danger 组件START -->
+					<div class="alert alert-danger display-hide" id="editlpAlert">
+						<button class="close" data-close="alert"></button>
+							您的输入有误，请检查下面的输入项
+					</div>
+					<div class="portlet-body">
+						<div class="table-container" style="margin-top: 10px">
+							<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_bctz">
+								<thead>
+									<tr role="row" class="heading">
+										<th width="50%">当前路牌名称</th>
+										<th width="50%" style="text-align: center;max-width: 50px;min-width: 40px;padding-left: 0;padding-right: 0;">修改路牌名称</th>
+									</tr>
+								</thead>
+								<tbody></tbody>
+							</table>
+						</div>
+					</div>
+			    </form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary" id="editlpnext">确定</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/html" id="editlp_temp">
+{{each list as obj i }}
+	<tr role="row" class="filter">
+		<td>
+			<input type="text" readonly  class="form-control form-filter input-sm" name="lpname_{{i+1}}" value="{{obj.lpName}}">
+		</td>
+		<td>
+			<input type="text" class="form-control form-filter input-sm" name="{{i+1}}" value="{{obj.lpName}}" required>
+		</td>
+	</tr>
+{{/each}}
+{{if list.length == 0}}
+		<tr>
+			<td colspan=3><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/javascript">
+$('#editlp_mobal').on('editlpMobal.show', function(e,obj,bf){
+	var lpArray =  obj.configuration.taskTypes;
+	setTimeout(function(){
+		// 加载延迟200毫秒显示mobal
+		$('#editlp_mobal').modal({show : true,backdrop: 'static', keyboard: false});
+	},200);
+	// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
+	$('#editlp_mobal').on('show.bs.modal', function () {
+		// 把数据填充到模版中
+		var tbodyHtml = template('editlp_temp',{list:lpArray});
+		// 把渲染好的模版html文本追加到表格中
+		$('#datatable_bctz tbody').html(tbodyHtml);
+	});
+	// 获取表单元素
+	var form = $('#editlpForm');
+	// 错误提示元素
+	var editlpAlert = $('#editlpAlert', form);
+	// 下一步点击事件
+	$('#editlpnext').on('click', function() {
+		form.submit();// 表单提交
+	});
+	// 表单验证
+	form.validate({
+		errorElement : 'span', 
+		errorClass : 'help-block help-block-error', 
+		focusInvalid : false, 
+		rules : {
+		},
+		invalidHandler : function(event, validator) {  
+			editlpAlert.show();
+			App.scrollTo(editlpAlert, -200);
+		},
+		highlight : function(element) { 
+			$(element).closest('.form-group').addClass('has-error'); 
+		},
+		unhighlight : function(element) { 
+			$(element).closest('.form-group').removeClass('has-error'); 
+		},
+		success : function(label) {
+			label.closest('.form-group').removeClass('has-error'); 
+		},
+		submitHandler : function(f) {
+			// 1、 获取表单内容,并序列化
+			var params = form.serializeJSON();
+			var data = obj.getDataArray();
+			// 2、 调整路牌对应的班次总数
+			updFormParams(params,data);
+			// 删除图形.
+   		 	$('svg.svg-chart').remove();
+   		 	// 重新创建图形.
+   		 	var graph_ = d3.select('#ganttSvg').relationshipGraph(obj.configuration);
+   		 	// 根据数据重新渲染图形.
+   		 	obj.data(data);
+   			// 记录早操.并保存历史班次数据
+			obj.addHistory();
+			// 隐藏错误提示
+			editlpAlert.hide();
+			// 隐藏 reladplus_mobal 弹出层 
+			$('#editlp_mobal').modal('hide');
+			layer.msg('修改路牌名称成功!');
+		}
+	});
+	function updFormParams(p,data) {
+		for(var i= 0;i<lpArray.length;i++) {
+			if(p[i+1] != undefined) {
+				if(lpArray[i].lpName != p[i+1]) {
+					for(var d = 0 ; d< data.length;d++) {
+						if(data[d].lpName == lpArray[i].lpName) {
+							data[d].lpName = p[i+1];
+						}
+							
+					}
+					lpArray[i].lpName = p[i+1];
+					obj.configuration.lpNameA[i] = p[i+1];
+				}
+			}
+		}
+	}
+});
+</script>
 \ No newline at end of file
@@ -87,7 +87,7 @@
                             </li>
                             <li>
                                 <a href="javascript:" class="tool-action aboutread">
-                                    <i class="fa fa-arrows-v"></i>&nbsp;调整班次
+                                    <i class="fa fa-arrows-v"></i>&nbsp;班次调整
                                 </a>
                             </li>
                         </ul>
@@ -116,4 +116,5 @@
 <script src="/pages/base/timesmodel/js/ContextJS/js/context.js"></script>
 <script src="/pages/base/timesmodel/js/base-fun.js"></script>
 <script src="/pages/base/timesmodel/js/d3.relationshipgraph.js"></script>
+<script src="/pages/base/timesmodel/js/errorinfo.js"></script>
 <script src="/pages/base/timesmodel/js/gantt.js"></script>
 \ No newline at end of file
@@ -46,7 +46,8 @@
 			obj.jhlc = d[i].jhlc;// 计划里程
 			obj.lp = d[i].lp==null ? null : d[i].lp.id;// 路牌id
 			obj.lpType = d[i].lp==null ? null : d[i].lp.lpType;// 路牌类型
-			obj.parent = d[i].lp.lpName;// 路牌名称
+			obj.parent = d[i].lp.lpNo;// 路牌名称
+			obj.lpName = d[i].lp.lpName;
 			obj.lpNo = d[i].lp.lpNo;// 路牌编码
 			obj.tcc = d[i].tcc==null ? null : d[i].tcc.id;// 停车场id
 			obj.ttinfo = d[i].ttinfo==null ? null : d[i].ttinfo.id;// 时刻表id
@@ -60,7 +61,7 @@
 			resultD.push(obj);
 			if(lpA.indexOf(obj.lpNo)<0) {
 				lpA.push(obj.lpNo);
-				rsLpA.push({'lp':obj.lp,'lpNo':obj.lpNo,'lpName':obj.parent,'lpType':obj.lpType});
+				rsLpA.push({'lp':obj.lp,'lpNo':obj.lpNo,'lpName':obj.lpName,'lpType':obj.lpType});
 			}
 		}
 		// 返回渲染图形的数据格式.
@@ -407,7 +407,9 @@ var SKBFormWizard = function() {
 			obj.jhlc = d[i].jhlc;// 计划里程
 			obj.lp = d[i].lp==null ? null : d[i].lp.id;// 路牌id
 			obj.lpType = d[i].lp==null ? null : d[i].lp.lpType;// 路牌类型
-			obj.parent = d[i].lp.lpName;// 路牌名称
+			// obj.parent = d[i].lp.lpName;// 路牌名称
+			// obj.parent = parseInt(d[i].lp.lpNo);// 路牌名称
+			obj.lpName = d[i].lp.lpName;
 			obj.lpNo = d[i].lp.lpNo;// 路牌编码
 			obj.tcc = d[i].tcc==null ? null : d[i].tcc.id;// 停车场id
 			obj.ttinfo = d[i].ttinfo==null ? null : d[i].ttinfo.id;// 时刻表id
@@ -421,7 +423,7 @@ var SKBFormWizard = function() {
 			resultD.push(obj);
 			if(lpA.indexOf(obj.lpNo)<0) {
 				lpA.push(obj.lpNo);
-				rsLpA.push({'lp':obj.lp,'lpNo':obj.lpNo,'lpName':obj.parent,'lpType':obj.lpType});
+				rsLpA.push({'lp':obj.lp,'lpNo':obj.lpNo,'lpName':obj.lpName,'lpType':obj.lpType});
 			}
 		}
 		// 返回渲染图形的数据格式.
@@ -332,6 +332,8 @@ var BaseFun = function() {
 				var rs = new Array(),bxrcgs= new Array();
 				// 遍历已分配好路牌的班型人次数组.	
 				for(var x = 0 ; x < bxrclist.length; x++) {
+					/*if(x>0)
+						continue;*/
 					// 定义当前班型人次下的路牌数组.
 					var cla = bxrclist[x].sslp;
 					var dsdnmb = bxrclist[x].rs/bxrclist[x].fpcls;
@@ -339,12 +341,13 @@ var BaseFun = function() {
 					var hoursV = bxrclist[x].hoursV*dsdnmb;
 					// 遍历路牌
 					for(var s = 0 ; s < cla.length; s++) {
+						/*if(s>1 || s==0)
+							continue;*/
 						//cla[s].lpName =  bxrclist[x].type;
 						// 获取路牌编号.
 						var lpNo = cla[s].lpNo;
 						// 定义路牌下的所有班次.
 						var lpbc = new Array();
-						bxrcgs.push({'lpNo':lpNo,'hoursV':hoursV,'type':bxrclist[x].type});
 						// 遍历班次数.
 						for(var i =0 ; i <jsonArray.length; i++) {
 							// 判断当期遍历的班次是否属于当前的路牌.
@@ -359,10 +362,20 @@ var BaseFun = function() {
 								cara[l].lpName = bxrclist[x].type + '_' + lpNo ;
 							}
 						}
+						var _obj = baseF.getsxAndxxbc(lpbc,dataMap);
+						baseF.tcbc(_obj.sxbc,dataMap.smbcsjArr[0].kssj,dataMap.smbcsjArr[0].jssj);// 剔除上行不在时间范围内的班次
+						baseF.tcbc(_obj.xxbc,dataMap.smbcsjArr[1].kssj,dataMap.smbcsjArr[1].jssj);// 剔除下行不在时间范围内的班次
+						var tcnofwlpbc = _obj.sxbc.concat(_obj.xxbc);
 						// 按照发车序号顺序排序.
-						lpbc.sort(function(a,b){return b.fcno-a.fcno});
+						tcnofwlpbc.sort(function(a,b){return b.fcno-a.fcno});
+						/*var gsv = 0 ;
+						for(var z = 0 ;z < tza.length;z++) {
+							gsv = gsv + tza[z].bcsj + tza[z].STOPTIME;
+						}*/
+						// parseFloat((gsv/60).toFixed(2))
+						bxrcgs.push({'lpNo':lpNo,'hoursV':hoursV,'type':bxrclist[x].type});
 						// 调整班次数.也就是说调整工时.
-						rs = rs.concat(baseF.tzlpgs01(lpbc,hoursV,map,dataMap,lpNo,saa,bxrclist[x].type,lpNo,cara.length));
+						rs = rs.concat(baseF.tzlpgs01(tcnofwlpbc,hoursV,map,dataMap,lpNo,saa,bxrclist[x].type,lpNo,cara.length));
 					}
 				}
 				var jar01 = baseF.tzsmbcsj01(
@@ -375,25 +388,329 @@ var BaseFun = function() {
 				var jar = baseF.tzsmbcsj01(
 						baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar01,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
 								dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
-				var resultJA = new Array();
+			    // return {'json':jar,'bxrcgs':bxrcgs};
+				for(var r = 0 ; r < bxrcgs.length; r++) {
+					var lpNo = bxrcgs[r].lpNo;
+					var gsv = 0 , bczs = 0;
+					for(var g = 0 ; g< jar.length; g++) {
+						if(jar[g].lpNo == lpNo) {
+							gsv = gsv + jar[g].bcsj + jar[g].STOPTIME;
+							bczs++;
+						}
+					}
+					bxrcgs[r].sjgsV = gsv;
+					bxrcgs[r].bczs = bczs;
+				}
+				//debugger;
+				var jar3 = baseF.dqbcsAndgs(bxrcgs,jar,dataMap,cara.length);
+				// return {'json':jar3,'bxrcgs':bxrcgs};
+				/*var jar4 =  baseF.tzsmbcsj01(
+							baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar3,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
+									dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);*/
+				var rsjar = baseF.tzsztest(cara,jar3,dataMap);
+				// return {'json':rsjar,'bxrcgs':bxrcgs};
+				return {'json':baseF.addjcclcbc01(cara,rsjar,dataMap,saa,map),'bxrcgs':bxrcgs};
+			},
+			
+			addjcclcbc01 : function(cara,rsjar,dataMap,saa,map) {
+				var resultJA = new Array(),bcs = 0;
 				for(var m = 0 ; m < cara.length; m++) {
 					// 获取路牌编号.
 					var lpNo_ = cara[m].lpNo;
 					// 定义路牌下的所有班次.
 					var lpbc_ = new Array();
 					// 遍历班次数.
-					for(var x =0 ; x <jar.length; x++) {
+					for(var x =0 ; x <rsjar.length; x++) {
 						// 判断当期遍历的班次是否属于当前的路牌.
-						if(jar[x].lpNo == lpNo_) {
-							delete jar[x].fcint;
-							lpbc_.push(jar[x]);
+						if(rsjar[x].lpNo == lpNo_) {
+							delete rsjar[x].fcint;
+							lpbc_.push(rsjar[x]);
 						}
 					}
 					// 按照发车序号顺序排序.
 					lpbc_.sort(function(a,b){return a.fcno-b.fcno});
-					resultJA = resultJA.concat(baseF.addjclbbc01(lpbc_,dataMap,saa[0].lbsj,map));
+					baseF.addcfbc01(lpbc_,dataMap,map);
+					// 按照发车序号顺序排序.
+					// lpbc_.sort(function(a,b){return a.fcno-b.fcno});
+					var tt = baseF.addjclbbc01(lpbc_,dataMap,saa[0].lbsj,map);
+					bcs = baseF.updfcno01(tt,bcs);
+					resultJA = resultJA.concat(tt);
+				}
+				return resultJA;
+			},
+			
+			updfcno01 : function(bcArr,bcs) {
+				for(var i =0; i < bcArr.length;i++) {
+					bcArr[i].fcint = baseF.getDateTime(bcArr[i].fcsj).getTime();
+				}
+				bcArr.sort(function(a,b){return a.fcint-b.fcint});
+				for(var t = 0 ; t <bcArr.length;t++) {
+					bcs++;
+					bcArr[t].bcs = bcs;
+					bcArr[t].fcno = t+1;
+					delete bcArr[t].fcint;
+				}
+				return bcs;
+			},
+			
+			addcfbc01 : function(lpbcar,dataMap,map) {
+				var gs = 0 ,sicftag = true;
+				for(var g = 0 ; g <lpbcar.length-1;g++ ) {
+					if( parseInt((baseF.getDateTime(lpbcar[g+1].fcsj)  - baseF.getDateTime(lpbcar[g].ARRIVALTIME))/60000) > 80 
+							&& lpbcar[g].STOPTIME==0  ) {
+						lpbcar[g].isfb = 1;
+					}
+					/*gs = gs + lpbcar[g].bcsj + lpbcar[g].STOPTIME;
+					if(lpbcar[g].STOPTIME==0 && g>0 && g<(lpbcar.length-1)) {
+						debugger;
+						lpbcar[g].isfb = 1;
+						sicftag = false;
+					}*/
+				}
+				/*if(sicftag) {
+					for(var j = 0 ; j <lpbcar.length;j ++ ) {
+						var kssj =  baseF.getDateTime(lpbcar[j].fcsj);
+						var tzsj =  lpbcar[j].STOPTIME;
+						var cctag = baseF.dirDmToIndex(lpbcar[j].xlDir);
+						var cfdd = baseF.getcfdd(map.cfdd,cctag);
+						if(kssj> new Date (baseF.getCFDate(10,30)) && 
+								kssj<new Date (baseF.getCFDate(11,30))  && cfdd == cctag) {
+							console.log(tzsj,lpbcar[j].fcsj);
+							rs.push(baseF.getbcObj(
+									kssj,dataMap.zwcArr[0],cara[c],dataMap.bcTypeArr.cf,
+									dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0)); 
+							
+						}else if(kssj > new Date (baseF.getCFDate(18,30)) && 
+									kssj < new Date (baseF.getCFDate(19,30))  && cfdd == cctag ) {
+							console.log(tzsj,lpbcar[j].fcsj);
+							rs.push(baseF.getbcObj(
+									kssj,dataMap.zwcArr[1],cara[c],dataMap.bcTypeArr.cf,
+									dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0)); 
+							
+						}
+					}
+				}*/
+			},
+			
+			dqbcsAndgs : function(bxrcgs,jar,dataMap,cla) {
+				var bxA = new Array(),rsA = new Array();
+				for(var b = 0 ;b <bxrcgs.length; b++) {
+					if(bxA.indexOf(bxrcgs[b].type)<0)
+						bxA.push(bxrcgs[b].type);
+				}
+				var maxXxsjA = [parseInt(dataMap.map.upTravelTime),parseInt(dataMap.map.downTravelTime)];
+				var v1 = Math.max.apply(null, maxXxsjA) *1.5;
+				for(var a = 0 ;a < bxA.length;a++) {
+					var type = bxA[a],bxszA = new Array();
+					for(var s = 0 ; s < bxrcgs.length; s++) {
+						if(type == bxrcgs[s].type)
+							bxszA.push({'szgs':bxrcgs[s].sjgsV,'szbc' : bxrcgs[s].bczs, 'lpNo':bxrcgs[s].lpNo,'type' :bxrcgs[s].type});
+					}
+					var lpA = new Array();
+					if(bxszA.length>1) {
+						/*bxszA.sort(function(c,d){return ((c.szbc - d.szbc) && (c.szgs - d.szgs))});*/
+						bxszA.sort(function(c,d){return d.szgs - c.szgs});
+						for(var t = 0 ;t < bxszA.length;t++) {
+							var lpN_ = bxszA[t].lpNo;
+							/*if(lpN_==bxszA[0].lpNo)
+								continue;*/
+							var dx = bxszA[t].szbc - bxszA[0].szbc;
+							var type_ =  bxszA[t].type;
+							lpA = baseF.getlpbcA(lpN_,jar);
+							lpA.sort(function(x,y){return y.fcno - x.fcno});
+							var tempTag = false;
+							var isyddygbc = !baseF.issmbcsjArr(lpA[lpA.length-1].fcsj,dataMap.smbcsjArr);
+							var isydzhygbc = !baseF.issmbcsjArr(lpA[0].fcsj,dataMap.smbcsjArr);
+							if(dx>0) {
+								for(var j = 0 ; j < dx ; j++) {
+									for(var k = 0 ; k<lpA.length;k++) {
+										// 得到当前路牌下的发车时间.
+										var dqbcfcsj = baseF.getDateTime(lpA[k].fcsj);
+										// 判断时间范围.
+										if(dataMap.zgfsjd[0].ed < dqbcfcsj && dqbcfcsj < dataMap.wgfsjd[0].st) {
+											lpA.splice(k,1);
+											break;
+										}
+									}
+								}
+								tempTag = true;
+							}else if(bxszA[t].szgs < bxszA[0].szgs) {
+								var gsdx =  bxszA[0].szgs - bxszA[t].szgs;
+								// console.log(gsdx + '---' +  lpN_);
+								if(gsdx<=v1) {
+									if(isyddygbc && isydzhygbc) {
+										var dygbcydx = 0,zhygbcydx = 0;
+										if(gsdx%2==0) {
+											dygbcydx = gsdx/2;
+											zhygbcydx = dygbcydx;
+										}else {
+											dygbcydx = gsdx%2;
+											zhygbcydx = gsdx - dygbcydx;
+										}
+										baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
+										baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
+									}else if(isyddygbc) {
+										baseF.dygbcUpd(lpA[lpA.length-1],gsdx);
+									}else if(isydzhygbc) {
+										baseF.zhygbcUpd(lpA[0],lpA[1],gsdx);
+									}
+								}else {
+									var isZerInt = baseF.istzsjZero(lpA,dataMap);
+									var vag = 0,avgdx = 0;
+									if(gsdx % isZerInt==0) {
+										vag = gsdx / isZerInt;
+									}else {
+										vag = parseInt(gsdx / isZerInt);
+										avgdx = gsdx - vag*isZerInt;
+										if(isyddygbc && isydzhygbc) {
+											var dygbcydx = 0,zhygbcydx = 0;
+											if(avgdx%2==0) {
+												dygbcydx = avgdx/2;
+												zhygbcydx = dygbcydx;
+											}else {
+												dygbcydx = avgdx%2;
+												zhygbcydx = avgdx - dygbcydx;
+											}
+											baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
+											baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
+										}else if(isyddygbc) {
+											baseF.dygbcUpd(lpA[lpA.length-1],avgdx);
+										}else if(isydzhygbc) {
+											baseF.zhygbcUpd(lpA[0],lpA[1],avgdx);
+										}
+									}
+									var qbbfbc = new Array();
+									for(var v = 1 ; v < lpA.length;v++) {
+										var ddsj =  baseF.getDateTime(lpA[v-1].fcsj);
+										if(baseF.getDateTime("13:00") <= baseF.getDateTime(lpA[v].fcsj)) {
+											if(lpA[v].STOPTIME > 0 && !baseF.issmbcsjArr(lpA[v].fcsj,dataMap.smbcsjArr) ) {
+												lpA[v].STOPTIME = lpA[v].STOPTIME + vag;
+												ddsj.setMinutes(ddsj.getMinutes() - lpA[v].STOPTIME);
+												lpA[v].ARRIVALTIME = baseF.getTimeStr(ddsj);
+												ddsj.setMinutes(ddsj.getMinutes() - lpA[v].bcsj);
+												lpA[v].fcsj = baseF.getTimeStr(ddsj);
+												
+											}
+										}else {
+											if(!baseF.issmbcsjArr(lpA[v].fcsj,dataMap.smbcsjArr)) {
+												qbbfbc.push(lpA[v]);
+											}
+										}
+									}
+									qbbfbc.sort(function(x,y){return x.fcno - y.fcno});
+									for(var q = 0 ; q < qbbfbc.length; q++) {
+										if(q<(qbbfbc.length-1))
+											qbbfbc[q].STOPTIME = qbbfbc[q].STOPTIME + vag;
+										if(q==0) {
+											var fcsj_ =  baseF.getDateTime(qbbfbc[q].fcsj);
+											fcsj_.setMinutes(fcsj_.getMinutes() + qbbfbc[q].bcsj);
+											qbbfbc[q].ARRIVALTIME = baseF.getTimeStr(fcsj_);
+										}else {
+											var ddsj_ =  baseF.getDateTime(qbbfbc[q-1].ARRIVALTIME);
+											ddsj_.setMinutes(ddsj_.getMinutes() + qbbfbc[q-1].STOPTIME);
+											qbbfbc[q].fcsj = baseF.getTimeStr(ddsj_);
+											ddsj_.setMinutes(ddsj_.getMinutes() + qbbfbc[q].bcsj);
+											qbbfbc[q].ARRIVALTIME = baseF.getTimeStr(ddsj_);
+										}
+									}
+								}
+							}
+							var start = baseF.getDateTime(lpA[0].ARRIVALTIME);
+							var end =  baseF.getDateTime(lpA[lpA.length-1].fcsj);
+							var hourdx = start.getHours() - end.getHours();
+							var minuedx = hourdx* 60 + (start.getMinutes() - end.getMinutes()) + lpA[0].STOPTIME;
+							var dx = 0;
+							/*if(minuedx > bxszA[0].szgs && tempTag) {
+								dx = minuedx - bxszA[0].szgs;
+								console.log(dx);
+							}else */
+							if(minuedx < bxszA[0].szgs && tempTag) {
+								dx = bxszA[0].szgs - minuedx;
+								if(dx > v1 && isyddygbc && isydzhygbc) {
+									var dygbcydx = 0,zhygbcydx = 0;
+									if(dx%2==0) {
+										dygbcydx = dx/2;
+										zhygbcydx = dygbcydx;
+									}else {
+										dygbcydx = dx%2;
+										zhygbcydx = dx - dygbcydx;
+									}
+									baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
+									baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
+								}else {
+									if(isyddygbc && isydzhygbc) {
+										var dygbcydx = 0,zhygbcydx = 0;
+										if(dx%2==0) {
+											dygbcydx = dx/2;
+											zhygbcydx = dygbcydx;
+										}else {
+											dygbcydx = dx%2;
+											zhygbcydx = dx - dygbcydx;
+										}
+										baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
+										baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
+									}else if(isyddygbc) {
+										baseF.dygbcUpd(lpA[lpA.length-1],dx);
+									}else if(isydzhygbc) {
+										baseF.zhygbcUpd(lpA[0],lpA[1],dx);
+									}
+								}
+							}
+							rsA = rsA.concat(lpA);
+						}
+					
+					}else {
+						rsA = rsA.concat(baseF.getlpbcA(bxszA[0].lpNo,jar));
+					}
+				}
+				return rsA;
+			},
+			
+			istzsjZero : function(arr,dataMap) {
+				var rsint = 0; 
+				for(var r = 1 ; r<arr.length;r++) {
+					if(arr[r].STOPTIME>0 && !baseF.issmbcsjArr(arr[r].fcsj,dataMap.smbcsjArr)) {
+						rsint++;
+					}
 				}
-				return {'json':resultJA,'bxrcgs':bxrcgs};
+				return rsint;
+			},
+			
+			dygbcUpd : function(obj,dx) {
+				obj.STOPTIME = obj.STOPTIME + dx;
+				var dygbcfcsj =  baseF.getDateTime(obj.fcsj);
+				dygbcfcsj.setMinutes(dygbcfcsj.getMinutes() - dx);
+				obj.fcsj = baseF.getTimeStr(dygbcfcsj);
+				
+				dygbcfcsj.setMinutes(dygbcfcsj.getMinutes() + obj.bcsj);
+				obj.ARRIVALTIME = baseF.getTimeStr(dygbcfcsj);
+			},
+			
+			zhygbcUpd: function(obj,xgOjb,dx) {
+				xgOjb.STOPTIME = xgOjb.STOPTIME + dx;
+				var zhygbcydx =  baseF.getDateTime(obj.fcsj);
+				zhygbcydx.setMinutes(zhygbcydx.getMinutes() + dx);
+				obj.fcsj = baseF.getTimeStr(zhygbcydx);
+				zhygbcydx.setMinutes(zhygbcydx.getMinutes() + obj.bcsj);
+				obj.ARRIVALTIME = baseF.getTimeStr(zhygbcydx);
+			},
+			
+			issmbcsjArr : function(str,arr) {
+				var tag = false;
+				for(var a = 0 ;a < arr.length;a++) {
+					if(str == arr[a].kssj || str == arr[a].jssj)
+						tag = true;
+				}
+				return tag;
+			},
+			
+			getlpbcA : function(lpN_,jar) {
+				var lpA = new Array();
+				for(var p = 0 ; p < jar.length; p++ ) {
+					if(jar[p].lpNo == lpN_)
+						lpA.push(jar[p]);
+				}
+				return lpA;
 			},
 			tzsztest : function(cara,tempa,dataMap) {
@@ -445,22 +762,36 @@ var BaseFun = function() {
 			},
 			tztzsjInit01 : function(ar,dataMap) {
+				var maxXxsjA = [parseInt(dataMap.map.upTravelTime),parseInt(dataMap.map.downTravelTime)];
+				var v1 = Math.max.apply(null, maxXxsjA) *1.5;
 				for(var r = 0 ; r< ar.length-1;r++) {
 					var sgbcfcsj = baseF.getDateTime(ar[r+1].fcsj),dqbcddsj = baseF.getDateTime(ar[r].ARRIVALTIME);
 					var dxmin = parseInt( (sgbcfcsj - dqbcddsj)/60000);
 					if(dxmin<0 || ar[r].STOPTIME<0) {
 						var cctag = baseF.dirDmToIndex(ar[r].xlDir);
 						dxmin =  ar[r].bcType == dataMap.bcTypeArr.cf ? 0 :  baseF.isgfsjd01(baseF.getDateTime(ar[r].fcsj),dataMap) ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
-						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
+						/*dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
 						ar[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
 						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + ar[r+1].bcsj);
-						ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);
+						ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);*/
 						/*sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - dxmin);
 						ar[r].ARRIVALTIME = baseF.getTimeStr(sgbcfcsj);
 						sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - ar[r].bcsj);
 						ar[r].fcsj = baseF.getTimeStr(sgbcfcsj);*/
+					}else if(dxmin >= v1 && dxmin < 180) {
+						if(r==ar.length-2 || baseF.issmbcsjArr(ar[r+1].fcsj,dataMap.smbcsjArr)) {
+							dxmin = dxmin;
+						}else {
+							dxmin = v1;
+						}
+					}
+					if(ar[r].STOPTIME >0) {
+						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
+						ar[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
+						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + ar[r+1].bcsj);
+						ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);
+						ar[r].STOPTIME =  dxmin >= 180 ? 0 : parseInt(dxmin);
 					}
-					ar[r].STOPTIME = dxmin>180 ? 0 : dxmin;
 				}
 			},
@@ -475,6 +806,7 @@ var BaseFun = function() {
 				if(bcArr.length<=0)
 					return;
 				var dirA = dataMap.dira;
+				var clzs = parseInt(dataMap.map.clzs);
 				for(var d = 0 ; d < dirA.length; d++) {
 					var fxdm = dirA[d],fxbc = new Array();
 					var cctag = baseF.dirDmToIndex(fxdm);
@@ -500,6 +832,10 @@ var BaseFun = function() {
 								var _fcjx = parseInt(Math.ceil(zzsj/bcCount));
 								var fcnosj = new Date(kssj);
 								for(var l = 0 ; l< len_ ; l++) {
+									// 每个路牌的末班车发车时间不准动.
+									if(baseF.iszhclzsbc(fxbc, sjdbcArr[l].fcno , clzs)) {
+										continue;
+									}
 									sjdbcArr[l].fcsj = baseF.getTimeStr(fcnosj);
 									var _xxsj = baseF.getxssj(dataMap.zgfsjd,
 											  dataMap.wgfsjd,fcnosj,dataMap.pcxssjArr,
@@ -518,6 +854,16 @@ var BaseFun = function() {
 				}
 			},
+			iszhclzsbc : function(dirA , fcno , clzs) {
+				var flag = false;
+				for(var a =1 ; a < clzs ; a++) {
+					if(fcno == dirA[dirA.length-a].fcno) {
+						 flag = true;
+					}
+				}
+				return flag;
+			},
+			
 			/**
 			 * @description : (TODO) 添加进出场班次、早晚例保班次.
 			 * 
@@ -541,7 +887,25 @@ var BaseFun = function() {
 								dqbcfcsj,dataMap.ccsjArr[fxdm],car,dataMap.bcTypeArr.out,
 								dataMap.dira[fxdm],2,dataMap.cclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 出场班次
 						fcno ++;
-					}else if(b==bc.length-1){
+					}/*else if(b > 0 && b < bc.length-1){
+						var jcbckssj =  baseF.getDateTime(bc[b].ARRIVALTIME)
+						var ccbckssj = baseF.getDateTime(bc[b+1].fcsj)
+						var dx = parseInt((ccbckssj - jcbckssj)/60000);
+						if(bc[b].STOPTIME==0) {
+							 // bc[b].STOPTIME = 0;
+							//console.log(bc[b].fcno);
+							var fcno_ =  bc[b].fcno + 2;
+							stas = true;
+							// console.log(bc[b],bc[b+1],b);
+							result.push(baseF.getbcObj(
+									jcbckssj,dataMap.jcsjArr[fxdm],car,dataMap.bcTypeArr.in_,
+									dataMap.dira[fxdm],fcno_++,dataMap.jclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 进场班次
+							var ccfx = baseF.dirDmToIndex(bc[b+1].xlDir);
+							result.push(baseF.getbcObj(
+									ccbckssj,dataMap.ccsjArr[ccfx],car,dataMap.bcTypeArr.out,
+									dataMap.dira[ccfx],fcno_++,dataMap.cclcArr[ccfx],gatps,0,dataMap.qdzArr[ccfx],null,null,0,0));// 出场班次
+						}
+					}*/else if(b==bc.length-1){
 						var fcno_ =  dxfno + 2;
 						var qdbcddsj = baseF.getDateTime(bc[b].ARRIVALTIME);
 						result.push(baseF.getbcObj(
@@ -573,64 +937,129 @@ var BaseFun = function() {
 				var jczwsj = saa[0].lbsj*2 + dataMap.ccsjArr[baseF.dirDmToIndex(arr[0].xlDir)] + 
 							 dataMap.jcsjArr[baseF.dirDmToIndex(arr[arr.length-1].xlDir)];
 				// 定义路牌总工时.第一次切高峰之间和晚高峰之后的班次.
-				var lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
-				while(lpdqzgs>gs) {
-					for(var t = 0 ; t<arr.length;t++) {
-						// 得到当前路牌下的发车时间.
-						var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
-						// 判断时间范围.
-						if(!baseF.issplice(dqbcfcsj,dataMap,type,lpNo,cla)) {
-							arr.splice(t,1);
-							break;
+				var lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2)),tagboolean = true;
+				while(tagboolean) {
+					if(lpdqzgs>gs) {
+						var temp = true ; 
+						for(var t = 0 ; t<arr.length;t++) {
+							// 得到当前路牌下的发车时间.
+							var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
+							// 判断时间范围.
+							if(!baseF.issplice(dqbcfcsj,dataMap,type,lpNo,cla)) {
+								arr.splice(t,1);
+								temp = false;
+								break;
+							}
 						}
+						lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
+						if(temp)
+							tagboolean = false;
+					}else {
+						tagboolean = false;
 					}
-					lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
 				}
+				if(arr[0].xlDir == arr[arr.length-1].xlDir) {
+					baseF.addbc01(arr,arr[0],dataMap);
+				}
+				var gfzjst = null
 				for(var c = 0 ; c<arr.length;c++) {
 					var cfsjbc = baseF.getDateTime(arr[c].fcsj);
 					if(dataMap.gfzjsjd[0].st <= cfsjbc && cfsjbc <= dataMap.gfzjsjd[0].ed && arr[c].bcType == dataMap.bcTypeArr.cf )
 						gfzjst = baseF.getDateTime(arr[c].ARRIVALTIME);
 				}
-				gfzjst == null ? dataMap.gfzjsjd[0].st  : gfzjst;
+				gfzjst = gfzjst == null ? dataMap.gfzjsjd[0].st  : gfzjst;
 				var gfzjbc = new Array(),wgfbc = new Array(),zgfbc = new Array();
-				for(var a = 0 ; a<arr.length;a++) {
-					var tmkssj = baseF.getDateTime(arr[a].fcsj)
+				for(var x = 0 ; x<arr.length;x++) {
+					var tmkssj = baseF.getDateTime(arr[x].fcsj)
 					if(gfzjst <= tmkssj && tmkssj <= dataMap.gfzjsjd[0].ed)
-						gfzjbc.push(arr[a]);
+						gfzjbc.push(arr[x]);
 					else if(dataMap.wgfsjd[0].st <= tmkssj && tmkssj <= dataMap.wgfsjd[0].ed)
-						wgfbc.push(arr[a]);
+						wgfbc.push(arr[x]);
 					else
-						zgfbc.push(arr[a]);
+						zgfbc.push(arr[x]);
 				}
 				gfzjbc.sort(function(a,b){return a.fcno-b.fcno});
 				wgfbc.sort(function(a,b){return a.fcno-b.fcno});
-				if(gfzjbc[gfzjbc.length-1].xlDir == wgfbc[0].xlDir)
-					gfzjbc.splice(gfzjbc.length-1,1);
-				if(type!='五工二休') {
-					var gfzjst = null;
-					var dxmin = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
-					var addmin = parseInt(dxmin/gfzjbc.length);
-					for(var g = 0 ;g < gfzjbc.length;g++) {
-						if(gfzjbc[g].bcType != dataMap.bcTypeArr.cf)
-							gfzjbc[g].STOPTIME = gfzjbc[g].STOPTIME + addmin;
-						if(g==0) {
-							continue;
-						}else {
-							var tempd = baseF.getDateTime(gfzjbc[g-1].ARRIVALTIME);
-							tempd.setMinutes(tempd.getMinutes() + gfzjbc[g-1].STOPTIME);
-							gfzjbc[g].fcsj = baseF.getTimeStr(tempd);
-							tempd.setMinutes(tempd.getMinutes() + gfzjbc[g].bcsj);
-							gfzjbc[g].ARRIVALTIME =  baseF.getTimeStr(tempd);
+				if(gfzjbc.length>0 && wgfbc.length>0) {
+					if(gfzjbc[gfzjbc.length-1].xlDir == wgfbc[0].xlDir && dataMap.map.linePlayType == "0"){
+						// addbc
+						baseF.addbc01(gfzjbc,gfzjbc[gfzjbc.length-1],dataMap);
+					}
+					if(type!='五工二休') {
+						var dxmin = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
+						var addmin = parseInt(dxmin/gfzjbc.length);
+						var rsM = baseF.gettzsjbs(gfzjbc,addmin,dataMap);
+						if(rsM.tag) {
+							for(var g = 0 ;g < gfzjbc.length;g++) {
+								if(gfzjbc[g].bcType != dataMap.bcTypeArr.cf)
+									gfzjbc[g].STOPTIME = gfzjbc[g].STOPTIME + addmin;
+								if(g==0) {
+									continue;
+								}else {
+									var tempd = baseF.getDateTime(gfzjbc[g-1].ARRIVALTIME);
+									tempd.setMinutes(tempd.getMinutes() + gfzjbc[g-1].STOPTIME);
+									gfzjbc[g].fcsj = baseF.getTimeStr(tempd);
+									tempd.setMinutes(tempd.getMinutes() + gfzjbc[g].bcsj);
+									gfzjbc[g].ARRIVALTIME =  baseF.getTimeStr(tempd);
+								}
+							}
 						}
+						gfzjbc[gfzjbc.length-1].STOPTIME  = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
 					}
-					gfzjbc[gfzjbc.length-1].STOPTIME  = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
 				}
-				return gfzjbc.concat(wgfbc).concat(zgfbc);
+				var rsAy = gfzjbc.concat(wgfbc).concat(zgfbc);
+				rsAy.sort(function(a,b){return b.fcno-a.fcno});
+				rsAy[0].STOPTIME= 0;
+				return rsAy;
+			},
+			
+			addbc01 : function(gfzjbc,lastObj,dataMap) {
+				var kssj = new Date(),strArray = lastObj.ARRIVALTIME.split(':');
+				kssj.setHours(parseInt(strArray[0]));
+				kssj.setMinutes(parseInt(strArray[1]) + lastObj.STOPTIME);
+				var cctag = baseF.dirDmToIndex(lastObj.xlDir);
+				cctag = baseF.getfx(1,cctag);
+				var tzsj =  baseF.isgfsjd01(kssj,dataMap) ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
+				var _xxsj = baseF.getxssj(dataMap.zgfsjd,dataMap.wgfsjd,kssj,dataMap.pcxssjArr,dataMap.gfxxsjArr,cctag);// 获取行驶时间
+				// 定义班次序号
+				var xhNo = lastObj.fcno+1;
+				var carArray = {'lp':lastObj.lp,'lpNo':lastObj.lpNo,'lpName':lastObj.lpName,'lpType':lastObj.lpType};
+				var ags =  {'tcc_id':lastObj.tcc,'skbName':lastObj.ttinfo,'lineName':lastObj.xl+'_'};
+				gfzjbc.push(baseF.getbcObj( kssj,
+											_xxsj,
+											carArray,
+											'normal',
+											dataMap.dira[cctag],
+											xhNo++,
+											dataMap.pcxslcArr[cctag],
+											ags,0,
+											dataMap.qdzArr[cctag],
+											dataMap.zdzArr[cctag],
+											null,tzsj,0));
+			},
+			
+			gettzsjbs : function(array,bs,dataMap) {
+				var tag = true,dx = 0;
+				var tempA = new Array(),maxXxsjA = [parseInt(dataMap.map.upTravelTime),parseInt(dataMap.map.downTravelTime)];
+				for(var r = 0 ; r<array.length;r++) {
+					tempA.push(array[r].STOPTIME + bs);
+				}
+				var v1 = Math.max.apply(null, maxXxsjA) *1.5;
+				var v2 = Math.max.apply(null, tempA);
+				if( v2 > v1) {
+					tag = false;
+					dx = parseInt(v2 -v1);
+				}
+				return {tag:tag,dx:dx};	
 			},
 			issplice : function (kssj,dataMap,type,lpNo,cla){
-				var tag = false;
-				if(type=='五工二休' || lpNo <Math.round(cla/2)) {
+				var tag = false,booleanTag = false ;
+				if(cla % 2 ==0) 
+					booleanTag = lpNo <= Math.round(cla/2); 
+				else
+					booleanTag = lpNo < Math.round(cla/2);
+				if(type=='五工二休' || booleanTag) {
 					if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) || 
 							( dataMap.wgfsjd[0].st <= kssj && kssj <=  dataMap.wgfsjd[0].ed))
 						tag = true;
@@ -1152,12 +1581,12 @@ var BaseFun = function() {
 					while(kssj<=endTime) {
 						cctag = map.linePlayType=='1' ? 0 : baseF.getfx(fxTagDm,cctag);
 						fxTagDm = 1;
-						var cfdd = baseF.getcfdd(map.cfdd,cctag);
+						/*var cfdd = baseF.getcfdd(map.cfdd,cctag);
 						if(kssj> new Date (baseF.getCFDate(10,30)) && 
 								kssj<new Date (baseF.getCFDate(11,30)) && $_cfn<1 && cfdd == cctag) {
 							$_cfn++;
 							rs.push(baseF.getbcObj(
-									kssj,dataMap.zwcArr[0],cara[c],dataMap.bcTypeArr.cf,
+									kssj,dataMap.zwcAr	r[0],cara[c],dataMap.bcTypeArr.cf,
 									dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0));// 午餐班次
 						}else if(kssj> new Date (baseF.getCFDate(18,30)) && 
 									kssj<new Date (baseF.getCFDate(19,30)) && $_cfw<1 && cfdd == cctag &&
@@ -1166,15 +1595,15 @@ var BaseFun = function() {
 							rs.push(baseF.getbcObj(
 									kssj,dataMap.zwcArr[1],cara[c],dataMap.bcTypeArr.cf,
 									dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0));// 晚餐班次
-						}
+						}*/
 						var tzsj =  baseF.isgfsjd01(kssj,dataMap) ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
 						// var tzsj =  dataMap.ztjxA[cctag];
 						var _xxsj = baseF.getxssj(dataMap.zgfsjd,dataMap.wgfsjd,kssj,dataMap.pcxssjArr,dataMap.gfxxsjArr,cctag);// 获取行驶时间
-						tzsj = baseF.isLastbc(kssj,endTime,tzsj,_xxsj)  ?  0 :　tzsj;
+						var xs_tzsj = baseF.isLastbc(kssj,endTime,tzsj,_xxsj)  ?  0 :　tzsj;
 						rs.push(baseF.getbcObj(
 								kssj,_xxsj,cara[c],dataMap.bcTypeArr.normal,
 								dataMap.dira[cctag],xhNo++,dataMap.pcxslcArr[cctag],map,0,
-								dataMap.qdzArr[cctag],dataMap.zdzArr[cctag],null,tzsj,0));// 正常班次
+								dataMap.qdzArr[cctag],dataMap.zdzArr[cctag],null,xs_tzsj,0));// 正常班次
 						kssj = new Date(kssj.setMinutes(kssj.getMinutes() + tzsj));
 					}
  				}
@@ -1266,32 +1695,7 @@ var BaseFun = function() {
 			            {'type':'无工休',  'hoursV':5.43,  'minueV':'5:43'}];
 			},
 			setbcsAndfcno : function(listA) {
-				/*var array = new Array();
-				var len = listA.length;
-				for(var i =0;i<len;i++) {
-					if(array.indexOf(listA[i].lpNo)<0)
-						array.push(listA[i].lpNo);
-				}
-				array.sort(baseF.compare);
-				console.log(array);
-				var sortGattArray = new Array();
-				for(var k =0;k<array.length;k++) {
-					var index = array[k];
-					var temp = new Array();
-					for(var x=0;x<listA.length;x++) {
-						if(index==listA[x].lpNo)
-							temp.push(listA[x]);
-					}
-					var lpbc = baseF.sortDirArray(temp);
-					for(var p = 0 ;p<lpbc.length;p++) {
-						lpbc[p].fcno = (p+1);
-					}
-					sortGattArray = sortGattArray.concat(lpbc);
-				}
-				for(var b = 0 ; b <sortGattArray.length;b++) {
-					sortGattArray[b].bcs = (b+1);
-				}
-				return sortGattArray;*/
+				 
 				var array = new Array();
 				var len = listA.length;
 				for(var i =0;i<len;i++) {
@@ -1336,8 +1740,8 @@ var BaseFun = function() {
 				var _obj = baseF.getsxAndxxbc(list);
 				baseF.tcbc(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj);// 剔除上行不在时间范围内的班次
 				baseF.tcbc(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj);// 剔除下行不在时间范围内的班次
-				baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
 				baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
+				baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
 				baseF.tzqtbc(_obj.sxbc,_obj.qt,sj,cl,zd,lbsj);
 				baseF.tzqtbc(_obj.xxbc,_obj.qt,sj,cl,zd,lbsj);
 				return _obj.sxbc.concat(_obj.xxbc).concat(_obj.qt);
@@ -1353,8 +1757,14 @@ var BaseFun = function() {
 				var _obj = baseF.getsxAndxxbc(list,dm);
 				baseF.tcbc(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj ,_obj.xxbc);// 剔除上行不在时间范围内的班次
 				baseF.tcbc(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 剔除下行不在时间范围内的班次
-				baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
-				baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
+				if(smbcsj[1].jssj < smbcsj[0].jssj ) {
+					baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
+					baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
+				}else {
+					baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
+					baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
+				}
+						
 				return _obj.sxbc.concat(_obj.xxbc).concat(_obj.qt);
 			},
 			tcbc : function(ar,kssj,jssj,ppar) {
@@ -1505,14 +1915,13 @@ var BaseFun = function() {
 			getsxAndxxbc : function(json,dataMap) {
 				var upArray = new Array(),downArray = new Array(),qt = new Array();
             	for(var j = 0 ; j< json.length ; j++) {
-            		//json[j].fcint = baseF.getDateTime(json[j].fcsj).getTime();
             		if(json[j].bcType== dataMap.bcTypeArr.normal || 
             				json[j].bcType== dataMap.bcTypeArr.region || 
             				json[j].bcType== dataMap.bcTypeArr.major ||
             				json[j].bcType== dataMap.bcTypeArr.venting) {
-            			if(json[j].xlDir == 'relationshipGraph-up')
+            			if(json[j].xlDir == dataMap.dira[0])
                 			upArray.push(json[j]);
-                		else if(json[j].xlDir == 'relationshipGraph-down')
+                		else if(json[j].xlDir == dataMap.dira[1])
                 			downArray.push(json[j]);
             		}else if(json[j].bcType == dataMap.bcTypeArr.cf) {
             			qt.push(json[j]);
@@ -1556,8 +1965,10 @@ var BaseFun = function() {
 											kssj,
 											obj.configuration.dataMap.pcxssjArr,
 											obj.configuration.dataMap.gfxxsjArr,cctag);// 获取行驶时间
-					tzsj =  obj.configuration.dataMap.ztjxA[cctag];
-					var temptzsj = t == num-1 ? 0 : tzsj;
+					// tzsj =  obj.configuration.dataMap.ztjxA[cctag];
+					var tzjx =  baseF.isgfsjd01(kssj,obj.configuration.dataMap) ?  obj.configuration.dataMap.gftzsj[cctag] : obj.configuration.dataMap.dgtzsj[cctag];
+					var temptzsj =  ((t == num-1) ? 0 : tzsj);
+					/*var xs_tzsj = baseF.isLastbc(kssj,endTime,tzsj,_xxsj)  ?  0 :　tzsj;*/
 					jsonArray.push(baseF.getbcObj( kssj,
 												_xxsj,
 												carArray,
@@ -1570,7 +1981,7 @@ var BaseFun = function() {
 												obj.configuration.dataMap.zdzArr[cctag],
 												null,temptzsj,0));
 					// kssj = new Date(kssj.setMinutes(kssj.getMinutes() + temptzsj));
-					kssj.setMinutes(kssj.getMinutes() + temptzsj)
+					kssj.setMinutes(kssj.getMinutes() + tzjx)
 				}
 				lastObj.STOPTIME = 10;
 			},
@@ -229,7 +229,7 @@ $(&#39;.updownread&#39;).on(&#39;click&#39;,function() {
 /************************************************************************************************************************************************/
 /** 
- * @description : (TODO) 调整班次点击事件
+ * @description : (TODO) 班次调整点击事件
  * 
  * @status OK.
  ************************************************************************************************************************************************/
@@ -417,31 +417,6 @@ $(&#39;.editlp&#39;).on(&#39;click&#39;,function() {
  });
 /************************************************************************************************************************************************/
-/**
- * @description : (TODO)获取路牌对应的班次数(这里的班次不包括早晚例保班次、吃饭时间) 
- * 
- * @params : [a1--班次数组；a2--路牌数组]
- * 
- * @return : 返回一个数组.这里返回的是一个封装的每个路牌对应的班次数(这里的班次不包括早晚例保班次、吃饭时间、班次时间为0的班次) 
- ************************************************************************************************************************************************/
-var getbczs = function (a1,a2) {
-	var array = new Array();
-	// 1、遍历路牌数组
-	for(var i = 0;i<a2.length;i++) {
-		var bcs = 0;
-		// 2、遍历班次数组
-		for(var j =0;j<a1.length;j++) {
-			// 3、判断当前班次j是否属于当前路牌i下,除去早晚例保班次、吃饭时间、班次时间为0的班次
-			if(a1[j].parent == a2[i].lpA.lpNo && a1[j].bcType!='bd' && a1[j].bcType!='lc' && a1[j].bcType!='cf' && a1[j].bcsj>0)
-					bcs++;
-		}
-		// 4、把每个路牌下的对应班次数一一封装在一起,并添加到返回数组里边
-		array.push({lpNo:a2[i].lpA.lpNo,bcs:bcs});
-	}
-	return array;
-}
-/************************************************************************************************************************************************/
- 
 /**
  * d3动画过度
@@ -647,7 +622,6 @@ var RelationshipGraph = function () {
         			  .ordinal()
         			  .domain(this.configuration.lpNameA)
         			  .rangeRoundBands([ 0, this.configuration.height], .1);
-        	
             this.configuration.y = y;
             // 创建X轴
     		var xAxis = d3.svg
@@ -733,7 +707,7 @@ var RelationshipGraph = function () {
         		yAxisYArray.splice(0,yAxisYArray.length);
         	for(var t = 0;t<this.configuration.taskTypes.length;t++) {
         		yAxisYArray.push({
-        			y:y(this.configuration.taskTypes[t].lpNo)+this.configuration.offsetY,
+        			y:y(this.configuration.taskTypes[t].lpName)+this.configuration.offsetY,
         			carname:this.configuration.taskTypes[t].lpName,
         			lpA : this.configuration.taskTypes[t]});
         	}
@@ -938,6 +912,44 @@ var RelationshipGraph = function () {
     		return dataArray;
     	}
     }, {
+    	/**
+    	 * @description : (TODO) 获取路牌对应的班次数(这里的班次不包括早晚例保班次、吃饭时间) 
+    	 * 
+    	 * @params : [a1--班次数组；a2--路牌数组]
+    	 * 
+    	 * @return : 返回一个数组.这里返回的是一个封装的每个路牌对应的班次数(这里的班次不包括早晚例保班次、吃饭时间、班次时间为0的班次) 
+    	 **/
+    	key : 'getbczs',
+    	value : function getbczs(a1,a2,dataMap) {
+    		// 定义返回数组.
+    		var array = new Array();
+    		// 判断参数数组长度大于〇，dataMap不能为空.
+    		if(a1.length>0 && a2.length>0 && dataMap!=null && dataMap!='') {
+    			// 遍历路牌数组
+    			for(var i = 0 ;i < a2.length ; i++) {
+    				// 定义当前路牌下班次数，初始化为0.
+    				var bcs = 0;
+    				// 遍历班次数组
+    				for(var j = 0 ; j < a1.length ; j++) {
+    					// 判断当前班次j是否属于当前路牌i下,除去早晚例保班次、吃饭时间、班次时间为0的班次
+    					if(a1[j].parent == a2[i].lpA.lpNo && 
+    							a1[j].bcType != dataMap.bcTypeArr.bd && 
+    							a1[j].bcType != dataMap.bcTypeArr.lc && 
+    							a1[j].bcType != dataMap.bcTypeArr.cf && 
+    							a1[j].bcsj > 0) {
+    						bcs++;
+    					}
+    				}
+    				// 把每个路牌下的对应班次数一一封装在一起,并添加到返回数组里边
+    				array.push({lpNo : a2[i].lpA.lpNo , lpName:a2[i].lpA.lpName , bcs:bcs});
+    			}
+    		}else {
+    			error.show('参数异常!','【 a1：' + a1 + ' , a2：' + a2 + ' , dataMap：' + dataMap + '】');
+    			// console.log("您传入的参数异常!【 a1：" + a1 + ", a2：" + a2 + ", dataMap：" + dataMap);
+    		}
+    		return array;
+    	}
+    }, {
     	key : 'addHistory' ,
     	value : function addHistory() {
     		historyArray.push({'data':JSON.stringify(this.getDataArray()),'granph':JSON.stringify(this.configuration)});
@@ -947,11 +959,30 @@ var RelationshipGraph = function () {
     	key : 'statistics',
     	value : function statistics() {
     		var $_this = this,
-    			array = $_this.getSvgyAxisTransformY(),
-    			gdata = d3.selectAll('rect.data')[0],
-    			arrayTemp = new Array(),
-    			minValue = 0,timeNum;
+    			// array = $_this.getSvgyAxisTransformY(),
+    			array = $_this.configuration.taskTypes,
+    			tza = $_this.getDataArray();
     		for(var a=0;a<array.length;a++) {
+    			var lpNo = array[a].lpNo;
+    			var timeNum = 0 ,tempNum = 0;
+    			for(var z = 0 ;z < tza.length;z++) {
+    				if(tza[z].lpNo == lpNo) {
+    					timeNum = timeNum + tza[z].bcsj + tza[z].STOPTIME;
+    					tempNum ++;
+    				}
+				}
+    			var className = 'statis_container_' + lpNo;
+    			var textNodes = $("."+className).children("text");
+    			var hours = parseInt(timeNum/60);
+    			var mimus = timeNum%60, zgs =  hours +  (mimus==0? "": "." + mimus);
+    			var zgs = parseFloat((timeNum/60).toFixed(2));
+    			// var zgs = timeNum;
+    			$(textNodes[0]).text("总工时:" + zgs);
+    			$(textNodes[1]).text("总班次:"+(tempNum));
+    			// $_this.pptjbx($("."+className).children("rect")[2],zgs*1,lpNo,$_this);
+    		}
+    		/*for(var a=0;a<array.length;a++) {
+    			debugger;
     			var tempNum = 0,timeNum = 0,lpNo = '';
     			for(var g = 0 ; g <gdata.length;g++) {
     				var temp_i =  parseInt(d3.select(gdata[g]).attr('y'))-this.configuration.offsetY;
@@ -968,13 +999,14 @@ var RelationshipGraph = function () {
     			minValue = array[a];
     			var className = 'statis_container_' + array[a];
     			var textNodes = $("."+className).children("text");
-    			/*var hours = parseInt(timeNum/60);
-    			var mimus = timeNum%60,zgs =  hours +  (mimus==0? "": "." + mimus);*/
+    			var hours = parseInt(timeNum/60);
+    			var mimus = timeNum%60,zgs =  hours +  (mimus==0? "": "." + mimus);
     			var zgs = parseFloat((timeNum/60).toFixed(2));
+    			var zgs = timeNum;
     			$(textNodes[0]).text("总工时:" + zgs);
     			$(textNodes[1]).text("总班次:"+(tempNum));
     			$_this.pptjbx($("."+className).children("rect")[2],zgs*1,lpNo,$_this);
-    		}
+    		}*/
     	}
     }, {
@@ -1025,11 +1057,12 @@ var RelationshipGraph = function () {
     	value : function createStatistics() {
     		var svg = d3.select('.gantt-chart'),
     			_this = this,
-    			array = _this.getSvgyAxisTransformY();
+    			yAyxisA = _this.getSvgyAxisTransformY();
+    			array = _this.configuration.taskTypes;
     		var g_statis = svg.selectAll('.g_statis').data([1]).enter().append('g').classed({'g_statis':true}).attr("transform", "translate(" + _this.configuration.offsetX + ", " + _this.configuration.offsetY + ")");
         	for(var c = 0 ;c<array.length;c++) {
-        		var className = 'statis_container_' + array[c];
-        		var statis_container = g_statis.append('g').attr("class",className).attr("transform", "translate(" + 0 + ", " + array[c] + ")");
+        		var className = 'statis_container_' + array[c].lpNo;
+        		var statis_container = g_statis.append('g').attr("class",className).attr("transform", "translate(" + 0 + ", " + yAyxisA[c] + ")");
         		statis_container.append('rect').classed({'rect_shift':true})
         						.attr("x",-_this.configuration.offsetX)
         						.attr("y",9)
@@ -1255,34 +1288,44 @@ var RelationshipGraph = function () {
     		}
     	}
     }, {
+    	/**
+    	 * 均匀发车间隙
+    	 * 
+    	 */
     	key : 'updownread01',
     	value : function updownread01() {
-    		// 1、获取所有班次数.
     		var list = $_GlobalGraph.getDataArray();
     		var dataMap = $_GlobalGraph.configuration.dataMap;
-    		var rsmap = BaseFun.getsxAndxxbc(list,dataMap);
     		var cara =  $_GlobalGraph.configuration.taskTypes;
-    		var jar01 = rsmap.qt.concat(rsmap.sxbc).concat(rsmap.xxbc);
-    		BaseFun.jhfcjx01(jar01,dataMap);
-    		var jar = BaseFun.tzsmbcsj01(
-					BaseFun.setbcsAndfcno(BaseFun.tzsmbcsj01(BaseFun.setbcsAndfcno(BaseFun.tzsztest(cara,jar01,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,dataMap.lbsj,dataMap)),
-							dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,dataMap.lbsj,dataMap);
-			var resultJA = new Array();
-			for(var m = 0 ; m < cara.length; m++) {
-				// 获取路牌编号.
-				var lpNo_ = cara[m].lpNo;
-				// 定义路牌下的所有班次.
-				var lpbc_ = new Array();
-				// 遍历班次数.
-				for(var x =0 ; x <jar.length; x++) {
-					// 判断当期遍历的班次是否属于当前的路牌.
-					if(jar[x].lpNo == lpNo_)
-						lpbc_.push(jar[x]);
-				}
-				// 按照发车序号顺序排序.
-				lpbc_.sort(function(a,b){return a.fcno-b.fcno});
-				resultJA = resultJA.concat(BaseFun.addjclbbc01(lpbc_,dataMap,dataMap.lbsj,dataMap.map));
-			}
+    		var bxrcgs = $_GlobalGraph.configuration.bxrcgs;
+    		var resultJA = new Array();
+    		if(list.length !=0 && dataMap!=null && dataMap!='' && cara.length !=0) {
+    			var rsmap = BaseFun.getsxAndxxbc(list,dataMap);
+        		var jar01 = rsmap.qt.concat(rsmap.sxbc).concat(rsmap.xxbc);
+        		BaseFun.jhfcjx01(jar01,dataMap);
+        		var jar = BaseFun.tzsmbcsj01(
+    					BaseFun.setbcsAndfcno(BaseFun.tzsmbcsj01(BaseFun.setbcsAndfcno(BaseFun.tzsztest(cara,jar01,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,dataMap.lbsj,dataMap)),
+    							dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,dataMap.lbsj,dataMap);
+        		for(var r = 0 ; r < bxrcgs.length; r++) {
+    				var lpNo = bxrcgs[r].lpNo;
+    				var gsv = 0 , bczs = 0;
+    				for(var g = 0 ; g< jar.length; g++) {
+    					if(jar[g].lpNo == lpNo) {
+    						gsv = gsv + jar[g].bcsj + jar[g].STOPTIME;
+    						bczs++;
+    					}
+    				}
+    				bxrcgs[r].sjgsV = gsv;
+    				bxrcgs[r].bczs = bczs;
+    			}
+        		var jar3 = BaseFun.dqbcsAndgs(bxrcgs,jar,dataMap,cara.length);
+        		var rsjar = BaseFun.tzsztest(cara,jar3,dataMap);
+        		resultJA = BaseFun.addjcclcbc01(cara,rsjar,dataMap,$_GlobalGraph.configuration.stopAraay,dataMap.map);
+    		} else {
+    			resultJA = list;
+    			error.show('参数异常!','【 list：' + list + ' , dataMap：' 
+    					+ dataMap + ' , cara：' + cara + ' , bxrcgs：' + bxrcgs + '】');
+    		}
 			// 删除图形.
    		 	$('svg.svg-chart').remove();
    		 	// 重新创建图形.
@@ -1389,7 +1432,7 @@ var RelationshipGraph = function () {
     	}
     }, {
     	/**
-    	 * @description : (TODO) 调整班次函数.
+    	 * @description : (TODO) 班次调整函数.
     	 * 
     	 * @status OK.
     	 * */
@@ -1398,7 +1441,9 @@ var RelationshipGraph = function () {
     		// 弹出层mobal页面
     		$.get('/pages/base/timesmodel/bctz.html', function(m){
     			$(pjaxContainer).append(m);
-    			$('#tzbc_mobal').trigger('tzbcMobal.show',[$_GlobalGraph,getbczs($_GlobalGraph.getDataArray(),yAxisYArray),BaseFun]);
+    			// 获取各路牌下的班次数
+    			var lpbcs = $_GlobalGraph.getbczs($_GlobalGraph.getDataArray() , yAxisYArray , $_GlobalGraph.configuration.dataMap);
+    			$('#tzbc_mobal').trigger('tzbcMobal.show',[$_GlobalGraph , lpbcs , BaseFun , ErrorInfo]);
     		});
     	}
@@ -1527,7 +1572,8 @@ var RelationshipGraph = function () {
     	key : 'setIdValue',
     	value : function setIdValue(obj) {
     		// 设置id属性值. 由一个 常量字符串 + 班次数 + 常量字符串 + 发车序号 + 常量字符 + 对应的y轴值.
-        	return 'shift-rect-' + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent);
+        	// return 'shift-rect-' + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent);
+    		return 'shift-rect-' + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.lpName);
     	}
     }, {
     	/**
@@ -1615,7 +1661,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setRectParenNodeIdV',
     	value : function setRectParenNodeIdV(obj) {
-        	return 'parent_' + $_GlobalGraph.configuration.y(obj.parent) + '_' + obj.bcs + "_node_" + obj.fcno;
+        	// return 'parent_' + $_GlobalGraph.configuration.y(obj.parent) + '_' + obj.bcs + "_node_" + obj.fcno;
+    		return 'parent_' + $_GlobalGraph.configuration.y(obj.lpName) + '_' + obj.bcs + "_node_" + obj.fcno;
         }
     }, {
     	/**
@@ -1629,7 +1676,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setNextNodeIdV',
     	value : function setNextNodeIdV(obj) {
-        	return "shift-rect-" + (obj.bcs+1)  + '_' +  (obj.fcno+1) + '_' + $_GlobalGraph.configuration.y(obj.parent);
+        	// return "shift-rect-" + (obj.bcs+1)  + '_' +  (obj.fcno+1) + '_' + $_GlobalGraph.configuration.y(obj.parent);
+    		return "shift-rect-" + (obj.bcs+1)  + '_' +  (obj.fcno+1) + '_' + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -1643,7 +1691,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setLastNodeIdV',
     	value : function setLastNodeIdV(obj) {
-        	return "shift-rect-" + (obj.bcs-1)  + '_' + (obj.fcno-1)+ '_' + $_GlobalGraph.configuration.y(obj.parent);
+        	// return "shift-rect-" + (obj.bcs-1)  + '_' + (obj.fcno-1)+ '_' + $_GlobalGraph.configuration.y(obj.parent);
+    		return "shift-rect-" + (obj.bcs-1)  + '_' + (obj.fcno-1)+ '_' + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -1671,7 +1720,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setText01IdV',
     	value : function setText01IdV(obj) {
-        	return "shift-rect-text01-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+        	// return "shift-rect-text01-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+    		return "shift-rect-text01-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -1755,7 +1805,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setCircleIdV',
     	value : function setCircleIdV(obj) {
-     	   return "shift-rect-circle-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.parent);
+     	   // return "shift-rect-circle-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.parent);
+    		return "shift-rect-circle-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.lpName);
          }
     }, {
     	/**
@@ -1833,7 +1884,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setText02IdV',
     	value : function setText02IdV(obj) {
-           	return "shift-rect-text02-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+           	// return "shift-rect-text02-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+    		 return "shift-rect-text02-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -1873,7 +1925,9 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setText03IdV',
     	value : function setText03IdV(obj) {
-        	return "shift-rect-text03-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.parent);
+        	/*return "shift-rect-text03-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.parent);*/
+    		return "shift-rect-text03-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.lpName);
+        	
         }
     }, {
     	/**
@@ -1911,7 +1965,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setText04IdV',
     	value : function (obj) {
-     	   return "shift-rect-text04-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+     	   /*return "shift-rect-text04-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);*/
+    		return "shift-rect-text04-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -2011,7 +2066,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setCoverRectIdV',
     	value : function setCoverRectIdV(obj) {
-        	return "shift-rect-cover-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+        	/*return "shift-rect-cover-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);*/
+    		return "shift-rect-cover-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -2039,7 +2095,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setCoverRectParentV',
     	value : function setCoverRectParentV(obj) {
-        	return "shift-rect-" + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent) + '-cover';
+        	//return "shift-rect-" + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent) + '-cover';
+    		return "shift-rect-" + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.lpName) + '-cover';
         }
     }, {
     	/**
@@ -2053,7 +2110,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setCoverRectLastIdV',
     	value : function setCoverRectLastIdV(obj) {
-        	return "shift-rect-cover-" +  obj.bcs + '_' + (obj.fcno+1) + $_GlobalGraph.configuration.y(obj.parent);
+        	// return "shift-rect-cover-" +  obj.bcs + '_' + (obj.fcno+1) + $_GlobalGraph.configuration.y(obj.parent);
+    		return "shift-rect-cover-" +  obj.bcs + '_' + (obj.fcno+1) + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	key : 'mouseUpEvent',
@@ -2442,9 +2500,11 @@ var RelationshipGraph = function () {
     		for(var s = 0 ; s < len ; s++) {
     			var rectNodesAttr = RelationshipGraph.getContextNodeAndData(d3.select(shiftRectA[s]).attr('id'));
     			if(rectNodesAttr.dqbcData.STOPTIME<0) {
-    				var nextTzsjDx = $_GlobalGraph.configuration.dataMap.minztjx - rectNodesAttr.dqbcData.STOPTIME;
+    				// var nextTzsjDx = $_GlobalGraph.configuration.dataMap.minztjx - rectNodesAttr.dqbcData.STOPTIME;
+    				var nextTzsjDx = 0 - rectNodesAttr.dqbcData.STOPTIME;
     				// 修改遍历的当前元素数据的停站时间为最小停站时间.
-    				rectNodesAttr.dqbcData.STOPTIME =  $_GlobalGraph.configuration.dataMap.minztjx;
+    				// rectNodesAttr.dqbcData.STOPTIME =  $_GlobalGraph.configuration.dataMap.minztjx;
+    				rectNodesAttr.dqbcData.STOPTIME =  0;
     				// 修改遍历的当前元素数据的文本展示停站时间
     				for(var t = 0 ; t < rectNodesAttr.dqbctextNodes.length ; t++) {
     					if(d3.select(rectNodesAttr.dqbctextNodes[t]).attr('text-type')=='gap') 
@@ -2467,6 +2527,7 @@ var RelationshipGraph = function () {
     				 * 修改下个班次的元素坐标属性值
     				 * 
     				 * */
+    				
     				rectNodesAttr.nextbcNode.attr('x',$_x);
     				var rectCover = d3.select(d3.selectAll('rect[parent-node='+ rectNodesAttr.nextbcNodeId + '-cover' +']')[0][0]);
     				rectCover.attr('x',$_x);
@@ -2962,7 +3023,7 @@ var RelationshipGraph = function () {
 			nowDate.setMinutes(parseInt(tm.min)+d.bcsj);// 10.3.1、设置分钟.
 			// 9.1.4、修改当前班次的到达时间.
 			d.ARRIVALTIME  =  BaseFun.getTimeStr(nowDate);
-			d.STOPTIME = parseInt((BaseFun.getDateTime(nodeContext.nextData.fcsj) -  BaseFun.getDateTime(d.ARRIVALTIME))/ 60000);
+			d.STOPTIME = d.isfb ==1 ? 0 : parseInt((BaseFun.getDateTime(nodeContext.nextData.fcsj) -  BaseFun.getDateTime(d.ARRIVALTIME))/ 60000);
     		/**
     		 * 9.2、修改元素沿X轴方向的X坐标属性值. 
     		 * 
@@ -2983,6 +3044,8 @@ var RelationshipGraph = function () {
     		}
     		/****************************************** update 当前的班次数据以及相关元素对象属性值. END ************************************/
+    		//console.log(nodeContext);
+    		//debugger;
     		// 10、计算与上个班次的停站时间.
 			var dxMinues =  parseInt((BaseFun.getDateTime(d.fcsj) - BaseFun.getDateTime(nodeContext.lastData.ARRIVALTIME)) / 60000);
@@ -3129,7 +3192,8 @@ var RelationshipGraph = function () {
     			 **/
         		var _obj = RelationshipGraph.getContextNodeAndData(d3.select(this).attr('parent-node').replace('-cover',''));
         		// 1.3、定义最小停站间隙.
-    			var minSoptTime = $_GlobalGraph.configuration.dataMap.minztjx;
+    			// var minSoptTime = $_GlobalGraph.configuration.dataMap.minztjx;
+        		var minSoptTime = 0;
     			// 1.4、创建当前时间对象.
     			var $_date = new Date();
     			// 1.5、判断 如果当前班次的停站时间小于零,则修改成最小停站时间.
+ErrorInfo = function() {
+	var error = {
+			show : function(title , content) {
+				layer.open({
+					  title: title,
+					  content: content
+				});  
+			}
+	}
+	return error;
+}();
 \ No newline at end of file
@@ -70,8 +70,28 @@
 		}else {
 			var jsonA = JSON.parse(objD);
 			// 使用已有的时刻表明细数据渲染视图.
-			data = {'json':jsonA.rsD,'bxrcgs':null};
+			// data = {'json':jsonA.rsD,'bxrcgs':null};
 			CSMap = {'gattA':null,'stopSpace': Math.round(map.zzsj/map.clzs),'maxCar':jsonA.rsLP};
+			var cara = jsonA.rsLP;
+			var rsjar = jsonA.rsD;
+			var resultJA = new Array();
+			for(var m = 0 ; m < cara.length; m++) {
+				// 获取路牌编号.
+				var lpNo_ = cara[m].lpNo;
+				// 定义路牌下的所有班次.
+				var lpbc_ = new Array();
+				// 遍历班次数.
+				for(var x =0 ; x <rsjar.length; x++) {
+					// 判断当期遍历的班次是否属于当前的路牌.
+					if(rsjar[x].lpNo == lpNo_) {
+						lpbc_.push(rsjar[x]);
+					}
+				}
+				// 按照发车序号顺序排序.
+				lpbc_.sort(function(a,b){return a.fcno-b.fcno});
+				resultJA = resultJA.concat(BaseFun.addjclbbc01(lpbc_,dataMap,stopAraay[0].lbsj,map));
+			}
+			data = {'json':rsjar,'bxrcgs':null};
 		}
 		// 创建甘特图对象.
 		var graph = d3.select('#ganttSvg').relationshipGraph(
@@ -388,7 +408,8 @@
 	 * @return 返回甘特图的参数配置信息.
 	 * */
 	function getGraphArgus(p) {
-		var VALUEKEYNAME = 'Worldwide Gross',MULTIPLE = Math.round(105/parseInt(p.stopAraay[0].sxsj)) >=4 ? Math.round(90/parseInt(p.stopAraay[0].sxsj)) : 3 ,
+		var MULTIPLE = Math.round(105/parseInt(p.stopAraay[0].sxsj)) >=4 ? Math.round(90/parseInt(p.stopAraay[0].sxsj)) :  Math.round(90/parseInt(p.stopAraay[0].sxsj)) *2;
+		var VALUEKEYNAME = 'Worldwide Gross' ,
 		 	DXHOURS = 24,MINUTE = 60,WIDTH = DXHOURS*MINUTE,MARGINLEFT = 380,HEIGHT = p.yAxisCarArray.length*60 + 240,
 		    MARGINBOTTOM = 240,OFFSETX = 90,OFFSETY = 180,OFFSETUPY = 120,OFFSETDOWNY = 60,
 		    STARTDATETIME = p.startDateTime ,ENDDATETIME = p.endDateTime ,TASKTYPES =p.yAxisCarArray ,TICKFORMAT ='%H:%M' ,SHOWTOOLTIPS = true;
@@ -400,6 +421,7 @@
         var hours=Math.floor(leave1/(3600*1000));
         DXHOURS = days*24+hours;
         WIDTH = DXHOURS*MINUTE*MULTIPLE;
+        // debugger;
         var lpsplitA = getylp(p.yAxisCarArray);
 		var args = {
     	        'valueKeyName': VALUEKEYNAME,
@@ -506,8 +528,15 @@
 					}else {
 						data = graph.getDataArray();
 					}
+					var rsjar = BaseFun.tzsztest(graph.configuration.taskTypes,data,graph.configuration.dataMap);
+					/*var resultJA = BaseFun.addjcclcbc01(graph.configuration.taskTypes,rsjar,
+							graph.configuration.dataMap,graph.configuration.stopAraay,data,
+							graph.configuration.dataMap.map);*/
 					// 获取图形数据.重新绘制.
-					graph.data(data);
+					graph.data(BaseFun.addjcclcbc01(graph.configuration.taskTypes,rsjar,
+							graph.configuration.dataMap,
+							graph.configuration.stopAraay,
+							graph.configuration.dataMap.map));
 					// 记录当前操作.
 					graph.addHistory();
 					stateSuccess('删除');
@@ -538,10 +538,10 @@
 				</select>
 			</div>
 			<div class="margin-top-10">
-				<input type="number" class="form-control" placeholder="请输入分配人次数" id="state_tagsinput_rcsvalue">
+				<input type="number" class="form-control" placeholder="请输入分配人次数" id="state_tagsinput_rcsvalue" min="1">
 			</div>
 			<div class="margin-top-10">
-				<input type="number" class="form-control" placeholder="请输入分配车辆数" id="state_tagsinput_clsvalue">
+				<input type="number" class="form-control" placeholder="请输入分配车辆数" id="state_tagsinput_clsvalue" min="1">
 			</div>
 			<div class="margin-top-10">
     			<a href="javascript:;" class="btn red" id="state_tagsinput_add">添加</a>
@@ -157,7 +157,7 @@ $(function(){
 	    increaseArea: '20%'
 	}
-	jsDoQuery(null,true);
+// 	jsDoQuery(null,true);
 	//重置
 	$('tr.filter .filter-cancel').on('click', function(){
@@ -32,13 +32,13 @@
                         <select class="form-control" name="line" id="line" style="width: 136px;"></select>
                     </div>
                     <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">开始时间: </span>
-                        <input class="form-control" type="text" id="startDate" style="width: 120px;"/>
-                    </div>
-                    <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">结束时间: </span>
-                        <input class="form-control" type="text" id="endDate" style="width: 120px;"/>
+                        <span class="item-label" style="width: 80px;">时间: </span>
+                        <input class="form-control" type="text" id="date" style="width: 120px;"/>
                     </div>
+<!--                     <div style="display: inline-block;margin-left: 15px;"> -->
+<!--                         <span class="item-label" style="width: 80px;">结束时间: </span> -->
+<!--                         <input class="form-control" type="text" id="endDate" style="width: 120px;"/> -->
+<!--                     </div> -->
                     <div style="display: inline-block;margin-left: 15px">
                         <span class="item-label" style="width: 140px;">路牌： </span>
                         <select class="form-control" name="lpName" id="lpName" style="width: 136px;"></select>
@@ -46,6 +46,7 @@
                     <div style="display: inline-block;margin-left: 15px">
                         <span class="item-label" style="width: 140px;">内部编码： </span>
                         <select class="form-control" name="code" id="code" style="width: 145px;"></select>
+                    	<input class="btn btn-default" type="button" id="czcl" value="X"/>
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="筛选"/>
@@ -58,28 +59,15 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="12">营运车辆修正统计表</th>
-							</tr>
-							<tr>
-								<td colspan="12">车队     站     <span id="sDate"></span>至<span id="eDate"></span></td>
+								<th colspan="6">营运车辆修正统计表</th>
 							</tr>
 							<tr>
-								<td rowspan="2">线路名</td>
-								<td rowspan="2">路牌</td>
-								<td rowspan="2">车号</td>
-								<td rowspan="2">司机</td>
-								<td rowspan="2">售票员</td>
-								<td colspan="2">发车时间</td>
-								<td colspan="2">结束时间</td>
-								<td rowspan="2">修改人</td>
-								<td rowspan="2">修改时间</td>
-								<td rowspan="2">备注</td>
-							</tr>
-							<tr>
-								<td>计划</td>
-								<td>实际</td>
-								<td>计划</td>
-								<td>实际</td>
+								<td>编号</td>
+								<td>路牌</td>
+								<td>车号</td>
+								<td>司机</td>
+								<td>计发</td>
+								<td>修改详细</td>
 							</tr>
 						</thead>
 						<tbody class="list_correctForm">
@@ -104,11 +92,19 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		$("#startDate,#endDate").datetimepicker({
+		$("#date").datetimepicker({
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
-		
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#date").val(year + "-" + month + "-" + day);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -116,11 +112,12 @@
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
-			console.log(data);
 			initPinYinSelect2('#line',data,'');
 		})
-		
+		 $('#czcl').on('click', function () {
+            $('#code').val('').change();
+        });
         $('#lpName').select2({
             ajax: {
@@ -200,44 +197,16 @@
         });
 	    var line = $("#line").val();
-	    var startDate = $("#startDate").val();
-	    var endDate = $("#endDate").val();
+	    var date = $("#startDate").val();
 	    var lpName = $("#lpName").val();
 	    var code = $("#code").val();
 		$("#query").on("click",function(){
-			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
-				layer.msg("请选择范围！");
-				return;
-			}
-			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
-				layer.msg("请选择范围！");
-				return;
-			}
 		    line = $("#line").val();
-		    startDate = $("#startDate").val();
-		    endDate = $("#endDate").val();
+		    date = $("#date").val();
 		    lpName = $("#lpName").val();
 		    code = $("#code").val();
 		    var type = "query";
-		    $post("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
-		        $("#sDate").text(startDate);
-		        $("#eDate").text(endDate);
-		        var temp = {};
-		        var today_account = 0;
-		        temp["line"] = $("#line").text() ;
-		        temp["totalAdjustment"] = result.length;  
-		        
-		        $.each(result, function(i, obj) {
-		            if(moment(obj.scheduleDate).format("YYYY-MM-DD") == moment(obj.updateDate).format("YYYY-MM-DD")){
-		                today_account++;
-		            } 
-                    obj.updateDate = moment(obj.updateDate).format("YYYY-MM-DD HH:mm:ss");
-                });
-                
-                temp["todayAdjustment"] = today_account;
-                temp["beforeAdjustment"] = result.length-today_account;
-                temp["historyAdjustment"] = 0;
-		        
+		    $get("/realSchedule/correctForm",{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
 		        var list_correctForm = template('list_correctForm',{list:result});
                 // 把渲染好的模版html文本追加到表格中
                 $('#forms .list_correctForm').html(list_correctForm);
@@ -255,8 +224,8 @@
 		$("#export").on("click",function(){
 			var type = "export";
-			$get('/realSchedule/correctForm',{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
-				window.open("/downloadFile/download?fileName=修正报表"+moment(startDate).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+			$get('/realSchedule/correctForm',{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
+				window.open("/downloadFile/download?fileName=修正报表"+date);
 			});
 		});
@@ -264,38 +233,18 @@
 </script>
 <script type="text/html" id="list_correctForm">
 	{{each list as obj i}}
-		<tr>
-			<td>{{obj.xlName}}</td>
+		<tr>
+			<td>{{i+1}}</td>
 			<td>{{obj.lpName}}</td>
 			<td>{{obj.clZbh}}</td>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.sName}}</td>
+			<td>{{obj.jName}}/{{obj.jGh}}</td>
 			<td>{{obj.fcsj}}</td>
-			<td>{{obj.fcsjActual}}</td>
-			<td>{{obj.zdsj}}</td>
-			<td>{{obj.zdsjActual}}</td>
-			<td>{{obj.updateBy}}</td>
-			<td>{{obj.updateDate}}</td>
-			<td>{{obj.remarks}}</td>
+			<td>{{obj.type2}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
-<script type="text/html" id="list_correctForm_statistics">
-    <tr>
-        <td colspan="2">线路:</td>
-        <td>{{line}}</td>
-        <td>调整总数</td>
-        <td>{{totalAdjustment}}</td>
-        <td>事先调整</td>
-        <td>{{beforeAdjustment}}</td>
-        <td>当日调整</td>
-        <td>{{todayAdjustment}}</td>
-        <td>历史调整</td>
-        <td colspan="2">{{historyAdjustment}}</td>
-    </tr>
-</script>
 \ No newline at end of file
@@ -7,7 +7,8 @@
 	  .table-bordered > tbody > tr > td,
 	  .table-bordered > tfoot > tr > th,
 	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
+	    border: 1px solid;
+	    text-align: center; }
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
@@ -7,7 +7,8 @@
 	  .table-bordered > tbody > tr > td,
 	  .table-bordered > tfoot > tr > th,
 	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
+	    border: 1px solid;
+	    text-align: center; }
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
@@ -250,7 +251,7 @@
 			<td>{{obj.company}}</td>
 			<td>{{obj.subCompany}}</td>
 			<td>{{obj.line}}</td>
-			{{if obj.delayFirst0 != '/' && obj.delayFirst0 != '0'}}
+			{{if obj.delayFirst0 != '/' && (obj.delayFirst0 > 1 || obj.delayFirst0 < -2)}}
 				<td style="background-color: #FF9999">{{obj.qdzFirst0}}</td>
 				<td style="background-color: #FF9999">{{obj.jhfcFirst0}}</td>
 				<td style="background-color: #FF9999">{{obj.sjfcFirst0}}</td>
@@ -261,7 +262,7 @@
 				<td>{{obj.sjfcFirst0}}</td>
 				<td>{{obj.delayFirst0}}</td>
 			{{/if}}
-			{{if obj.delayLast0 != '/' && obj.delayLast0 != '0'}}
+			{{if obj.delayLast0 != '/' && (obj.delayLast0 > 1 || obj.delayLast0 < -2)}}
 				<td style="background-color: #FF9999">{{obj.qdzLast0}}</td>
 				<td style="background-color: #FF9999">{{obj.jhfcLast0}}</td>
 				<td style="background-color: #FF9999">{{obj.sjfcLast0}}</td>
@@ -272,7 +273,7 @@
 				<td>{{obj.sjfcLast0}}</td>
 				<td>{{obj.delayLast0}}</td>
 			{{/if}}
-			{{if obj.delayFirst1 != '/' && obj.delayFirst1 != '0'}}
+			{{if obj.delayFirst1 != '/' && (obj.delayFirst1 > 1 || obj.delayFirst1 < -2)}}
 				<td style="background-color: #FF9999">{{obj.qdzFirst1}}</td>
 				<td style="background-color: #FF9999">{{obj.jhfcFirst1}}</td>
 				<td style="background-color: #FF9999">{{obj.sjfcFirst1}}</td>
@@ -283,7 +284,7 @@
 				<td>{{obj.sjfcFirst1}}</td>
 				<td>{{obj.delayFirst1}}</td>
 			{{/if}}
-			{{if obj.delayLast1 != '/' && obj.delayLast1 != '0'}}
+			{{if obj.delayLast1 != '/' && (obj.delayLast1 > 1 || obj.delayLast1 < -2)}}
 				<td style="background-color: #FF9999">{{obj.qdzLast1}}</td>
 				<td style="background-color: #FF9999">{{obj.jhfcLast1}}</td>
 				<td style="background-color: #FF9999">{{obj.sjfcLast1}}</td>
@@ -7,7 +7,8 @@
 	  .table-bordered > tbody > tr > td,
 	  .table-bordered > tfoot > tr > th,
 	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
+	    border: 1px solid;
+	    text-align: center; }
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
@@ -27,11 +28,11 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form id="history" class="form-inline" action="">
-					<div style="display: inline-block;margin-left: 10px;" id="company1">
+					<div style="display: inline-block;margin-left: 28px;" id="company1">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="company" style="width: 160px;"></select>
 					</div>
-					<div style="display: inline-block;margin-left: 10px;" id="subCompany1">
+					<div style="display: inline-block;margin-left: 24px;" id="subCompany1">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select>
 					</div>
@@ -39,11 +40,16 @@
 						<span class="item-label" style="width: 80px;">线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 160px;"></select>
 					</div>
+					<div style="margin-top: 10px"></div>
+					<div style="display: inline-block;margin-left: 0px;">
+						<span class="item-label" style="width: 80px;">开始时间: </span>
+						<input class="form-control" type="text" id="startDate" style="width: 160px;"/>
+					</div>
 					<div style="display: inline-block;margin-left: 10px;">
-						<span class="item-label" style="width: 80px;">时间: </span>
-						<input class="form-control" type="text" id="date" style="width: 160px;"/>
+						<span class="item-label" style="width: 80px;">结束时间: </span>
+						<input class="form-control" type="text" id="endDate" style="width: 160px;"/>
 					</div>
-					<div class="form-group">
+					<div class="form-group" style="margin-left: 10px;">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
 					</div>
@@ -54,7 +60,7 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr class="hidden">
-								<th>日期</th>
+								<th width="240px">日期</th>
 								<th>公司</th>
 								<th>分公司</th>
 								<th>线路</th>
@@ -73,6 +79,7 @@
 						<thead>
 							<tr class="hidden">
 								<th style="display: none;"></th>
+								<th rowspan="2">日期</th>
 								<th rowspan="2">线路</th>
 								<th colspan="4">上行首发</th>
 								<th colspan="4">上行末发</th>
@@ -116,12 +123,12 @@
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
-		$("#date").datetimepicker({
+
+		$("#startDate,#endDate").datetimepicker({
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
-		
+
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -130,7 +137,7 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		$("#date").val(year + "-" + month + "-" + day);
+		$("#startDate,#endDate").val(year + "-" + month + "-" + day);
 		var fage=false;
 		var xlList;
@@ -216,9 +223,14 @@
 		var company = $("#company").val();
 		var subCompany = $("#subCompany").val();
 		var line = $("#line").val();
-		var date = $("#date").val();
+		var startDate = $("#startDate").val();
+		var endDate = $("#endDate").val();
 		function jsDoQuery(pagination){
-			if($("#date").val() == null || $("#date").val().trim().length == 0){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
+			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
 				layer.msg("请选择时间！");
 				return;
 			}
@@ -226,14 +238,15 @@
 			company = $("#company").val();
 			subCompany = $("#subCompany").val();
 			line = $("#line").val();
-			date = $("#date").val();
+			startDate = $("#startDate").val();
+			endDate = $("#endDate").val();
 			if(line == " ")
 				line = "";
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['line'] = line;
-			params['line'] = line;
-			params['date'] = date;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
 			params['type'] = "query";
 			$("#forms .hidden").removeClass("hidden");
 			$("#map tr").addClass("hidden");
@@ -253,19 +266,15 @@
 		}
 		$("#export").on("click",function(){
-			if($("#date").val() == null || $("#date").val().trim().length == 0){
-				layer.msg("请选择时间！");
-				return;
-			}
 			var params = {};
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['line'] = line;
-			params['line'] = line;
-			params['date'] = date;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
 			params['type'] = "export";
 			$get('/pcpc/firstAndLastBus_sum', params, function(result){
-				window.open("/downloadFile/download?fileName=线路首末班准点率"+moment(date).format("YYYYMMDD"));
+				window.open("/downloadFile/download?fileName=线路首末班准点率"+moment(startDate).format("YYYYMMDD")+(startDate==endDate?"":("-"+moment(endDate).format("YYYYMMDD"))));
 			});
 		});
@@ -276,13 +285,20 @@
 <script type="text/html" id="list_firstAndLastBus">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.date}}</td>
-			<td>{{obj.company}}</td>
-			<td>{{obj.subCompany}}</td>
-			<td>{{obj.line}}</td>
-			<td>{{obj.jhbc}}</td>
-			<td>{{obj.sjbc}}</td>
-			<td><a id='delay'>{{obj.zdl}}</a></td>
+			{{if obj.date != '合计汇总'}}
+				<td>{{obj.date}}</td>
+				<td>{{obj.company}}</td>
+				<td>{{obj.subCompany}}</td>
+				<td>{{obj.line}}</td>
+				<td>{{obj.jhbc}}</td>
+				<td>{{obj.sjbc}}</td>
+				<td><a id='delay'>{{obj.zdl}}</a></td>
+			{{else}}
+				<td colspan='4'>{{obj.date}}</td>
+				<td>{{obj.jhbc}}</td>
+				<td>{{obj.sjbc}}</td>
+				<td>{{obj.zdl}}</td>
+			{{/if}}
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -292,23 +308,26 @@
 	{{/if}}
 </script>
 <script type="text/html" id="list_maps">
+	{{each list as obj i}}
 		<tr>
-			<td>{{list.line}}</td>
-			<td>{{list.qdzFirst0}}</td>
-			<td>{{list.jhfcFirst0}}</td>
-			<td>{{list.sjfcFirst0}}</td>
-			<td>{{list.delayFirst0}}</td>
-			<td>{{list.qdzLast0}}</td>
-			<td>{{list.jhfcLast0}}</td>
-			<td>{{list.sjfcLast0}}</td>
-			<td>{{list.delayLast0}}</td>
-			<td>{{list.qdzFirst1}}</td>
-			<td>{{list.jhfcFirst1}}</td>
-			<td>{{list.sjfcFirst1}}</td>
-			<td>{{list.delayFirst1}}</td>
-			<td>{{list.qdzLast1}}</td>
-			<td>{{list.jhfcLast1}}</td>
-			<td>{{list.sjfcLast1}}</td>
-			<td>{{list.delayLast1}}</td>
+			<td>{{obj.date}}</td>
+			<td>{{obj.line}}</td>
+			<td>{{obj.qdzFirst0}}</td>
+			<td>{{obj.jhfcFirst0}}</td>
+			<td>{{obj.sjfcFirst0}}</td>
+			<td>{{obj.delayFirst0}}</td>
+			<td>{{obj.qdzLast0}}</td>
+			<td>{{obj.jhfcLast0}}</td>
+			<td>{{obj.sjfcLast0}}</td>
+			<td>{{obj.delayLast0}}</td>
+			<td>{{obj.qdzFirst1}}</td>
+			<td>{{obj.jhfcFirst1}}</td>
+			<td>{{obj.sjfcFirst1}}</td>
+			<td>{{obj.delayFirst1}}</td>
+			<td>{{obj.qdzLast1}}</td>
+			<td>{{obj.jhfcLast1}}</td>
+			<td>{{obj.sjfcLast1}}</td>
+			<td>{{obj.delayLast1}}</td>
 		</tr>
+	{{/each}}
 </script>
 \ No newline at end of file
@@ -46,7 +46,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+				<div class="table-container" id="table" style="margin-top: 10px;overflow:auto;min-width: 906px;">
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr class="hidden">
@@ -80,6 +80,7 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		$("#table").height($(window).height()-280);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -57,7 +57,7 @@
 						<span class="item-label" style="width: 80px;">选择线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 150px;"></select>
 					</div>
-					<div style="display: inline-block; margin-left: 10px">
+					<div style="display: inline-block; margin-left: 10px; display: none;">
 						<span class="item-label" style="width: 80px;">时刻类型: </span>
 						<select class="form-control" name="model" id="model" style="width: 165px;">
 							<option value="">请选择...</option>
@@ -93,7 +93,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+				<div class="table-container" id="table" style="margin-top: 0px;overflow:auto;min-width: 906px;height:481px;">
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
@@ -135,6 +135,7 @@
 			format : 'HH:mm',
 			locale : 'zh-cn'
 		});
+		$("#table").height($(window).height()-320);
 		var d = new Date();
 		var year = d.getFullYear();
@@ -239,6 +240,7 @@
 		$("#subCompany").on("change",initXl);
 		function initXl(){
 			var data=[];
+			data.push({id:" ", text:"全部线路"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}
@@ -310,6 +312,8 @@
 			}
 			var reason = $("input[name='reason']");
 			var params = {};
+			if(line == " ")
+				line = "";
 // 			line = $("#line").val();
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
@@ -454,7 +458,7 @@
 <thead>
 	<tr>
 		<th class="hidden"></th>
-		<th rowspan="3">日期</th>
+		<th rowspan="3" style=" width:120px;">日期</th>
 		<th rowspan="3">时段</th>
 		<th rowspan="3">公司</th>
 		<th rowspan="3">分公司</th>
@@ -7,7 +7,8 @@
 	  .table-bordered > tbody > tr > td,
 	  .table-bordered > tfoot > tr > th,
 	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
+	    border: 1px solid;
+	    text-align: center; }
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
@@ -39,6 +40,14 @@
 						<span class="item-label" style="width: 80px;">线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 160px;"></select>
 					</div>
+					<div style="display: inline-block;margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">班次类型: </span>
+						<select class="form-control" name="line" id="bcType" style="width: 160px;">
+							<option value="0">全部班次</option>
+							<option value="1">全程</option>
+							<option value="2">区间</option>
+						</select>
+					</div>
 					<div style="margin-top: 10px"></div>
 					<div style="display: inline-block;margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">开始时间: </span>
@@ -54,7 +63,7 @@
 							<option value="">请选择...</option>
 						</select>
 					</div>
-					<div class="form-group">
+					<div class="form-group" style="margin-left: 10px">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
 					</div>
@@ -202,6 +211,7 @@
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
 		var model = $("#model").val();
+		var bcType = $('#bcType').val();
 		var company = $("#company").val();
 		var subCompany = $("#subCompany").val();
 		function jsDoQuery(pagination){
@@ -218,6 +228,7 @@
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
 			model = $("#model").val();
+			bcType = $("#bcType").val();
 			company = $("#company").val();
 			subCompany = $("#subCompany").val();
 			params['page'] = page;
@@ -225,6 +236,7 @@
 			params['startDate'] = startDate;
 			params['endDate'] = endDate;
 			params['model'] = model;
+			params['bcType'] = bcType;
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['type'] = "query";
@@ -274,12 +286,7 @@
 				line = "";
 			updateModel();
 		});
-		$('#startDate').on("blur", function(){
-			startDate = $("#startDate").val();
-			endDate = $("#endDate").val();
-			updateModel();
-		});
-		$('#endDate').on("blur", function(){
+		$('#startDate, #endDate').on("blur", function(){
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
 			updateModel();
@@ -41,6 +41,14 @@
 						<span class="item-label" style="width: 80px;">线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 160px;"></select>
 					</div>
+					<div style="display: inline-block;margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">班次类型: </span>
+						<select class="form-control" name="bcType" id="bcType" style="width: 160px;">
+							<option value="0">全部</option>
+							<option value="1">全程</option>
+							<option value="2">区间</option>
+						</select>
+					</div>
 					<div style="margin-top: 10px"></div>
 					<div style="display: inline-block;margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">开始时间: </span>
@@ -60,7 +68,7 @@
 <!-- 							<option value="">请选择...</option> -->
 <!-- 						</select> -->
 <!-- 					</div> -->
-					<div class="form-group">
+					<div class="form-group" style="margin-left: 10px">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
 					</div>
@@ -207,6 +215,7 @@
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
 		var model = $("#model").val();
+		var bcType = "0";
 		var nbbm = "";
 		var company = $("#company").val();
 		var subCompany = $("#subCompany").val();
@@ -224,6 +233,7 @@
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
 // 			model = $("#model").val();
+			bcType = $("#bcType").val();
 			nbbm = $("#nbbm").val()!=null?$("#nbbm").val():"";
 			company = $("#company").val();
 			subCompany = $("#subCompany").val();
@@ -231,6 +241,7 @@
 			params['line'] = line;
 			params['startDate'] = startDate;
 			params['endDate'] = endDate;
+			params['bcType'] = bcType;
 // 			params['model'] = model;
 			params['company'] = company;
 			params['subCompany'] = subCompany;
@@ -265,6 +276,7 @@
 			params['line'] = line;
 			params['startDate'] = startDate;
 			params['endDate'] = endDate;
+			params['bcType'] = bcType;
 // 			params['model'] = model;
 			params['company'] = company;
 			params['subCompany'] = subCompany;
@@ -7,7 +7,8 @@
 	  .table-bordered > tbody > tr > td,
 	  .table-bordered > tfoot > tr > th,
 	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
+	    border: 1px solid;
+	    text-align: center; }
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
@@ -19,7 +20,7 @@
 	  width: 5px; 
 word-wrap: break-word; 
-letter-spacing: 20px; 
+/* letter-spacing: 20px;  */
 	  }
 	   #forms   tr> td >label{
@@ -55,7 +55,7 @@
 			<div class="portlet-body">
 				<div class="row">
 					<div class="col-md-3">
-						<div class="" style="margin-top: 10px;overflow:auto;height: 860px">
+						<div class="" style="margin-top: 10px;overflow:auto;height: 520px">
 							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
 								<thead>
 									<tr class="hidden">
@@ -71,7 +71,7 @@
 						</div>
 					</div>
 					<div class="col-md-9"  id="printArea">
-						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+						<div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
 							<table class="table table-bordered table-checkable" id="forms">
 								<tbody class="ludan_1">
@@ -106,6 +106,7 @@
 			locale : 'zh-cn'
 		});
+		$("#xcld_height").height($(window).height()-100);
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -257,13 +258,14 @@
 			if($(this).children().size() < 2){
 				return;
 			}
-			
+			$("#xcld_height").height($(window).height()-100);
 			$(this).children().each(function(index){
 				params[index] = $(this).text();
 			});
 			jName = params[0].split("\\")[0];
 			jGh = params[0].split("\\")[1];
 			var id = params[3];
+			var obj = $(this);
 			$get('/realSchedule/MapById',{id:id},function(result){
 			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
 				var ludan_1 = template('ludan_1',result);
@@ -279,8 +281,11 @@
 			$get('/realSchedule/findKMBC',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 			    var ludan_3 = template('ludan_3',result);
 			    $('#forms .ludan_3').html(ludan_3);
+			    $("#info tbody tr").css('background-color', '');
+			    obj.css('background-color', '#99CCFF');
 			});
+			
 		});
 		$("#export").on("click",function(){
@@ -303,9 +308,12 @@
 			$("#info tbody tr").each(function(index){
 				param[index] = new Array();
 				$(this).children().each(function(i){
-					param[index][i] = $(this).text().split("\\")[0];
-					if(i==0){
-						param[index][3] = $(this).text().split("\\")[1];
+					if(i<3){
+						param[index][i] = $(this).text().split("\\")[0];
+						if(i==0){
+							param[index][3] = $(this).text().split("\\")[1];
+							
+						}
 					}
 				});
 			});
@@ -78,7 +78,7 @@
 								<th>线路名称</th>
 								<th>加注量</th>
 								<th>消耗量</th>
-								<th>行驶公里(含空放里程)</th>
+								<th>行驶总公里(含空驶里程)</th>
 								<th>空驶里程</th>
 								<th>实际班次(包含空放班次)</th>
 							</tr>
@@ -104,6 +104,16 @@ $(function(){
 		format : 'YYYY-MM-DD',
 		locale : 'zh-cn'
 	});
+	var d = new Date();
+	var year = d.getFullYear();
+	var month = d.getMonth() + 1;
+	var day = d.getDate();
+	if(month < 10)
+		month = "0" + month;
+	if(day < 10)
+		day = "0" + day;
+	$("#date").val(year + "-" + month + "-" + day);
+	
 	var fage=false;
 	var obj = [];
 	var xlList;
@@ -227,10 +237,14 @@ $(function(){
 <script type="text/html" id="shifday">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.sName}}</td>
- 			<td>{{obj.lpName}}</td>
-			<td>{{obj.carPlate}}</td>
+			{{if obj.jName == '汇总合计'}}
+				<td colspan='4'>{{obj.jName}}</td>
+			{{else}}
+				<td>{{obj.jName}}</td>
+				<td>{{obj.sName}}</td>
+ 				<td>{{obj.lpName}}</td>
+				<td>{{obj.carPlate}}</td>
+			{{/if}}
    			<td>{{obj.jhlc}}</td>
 			<td>{{obj.sjjhlc}}</td>
 			<td>{{obj.yygl}}</td>
-<style type="text/css">
-	.table-bordered {
-	  border: 1px solid; }
-	  .table-bordered > thead > tr > th,
-	  .table-bordered > thead > tr > td,
-	  .table-bordered > tbody > tr > th,
-	  .table-bordered > tbody > tr > td,
-	  .table-bordered > tfoot > tr > th,
-	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
-	  .table-bordered > thead > tr > th,
-	  .table-bordered > thead > tr > td {
-	    border-bottom-width: 2px;
-	    text-align: center; }
-	 
-	  .table > tbody + tbody {
-	   border-top: 1px solid; }
-</style>
-
-<div class="page-head">
-	<div class="page-title">
-		<h1>班次车辆人员月报表</h1>
-	</div>
-</div>
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid;
+	    text-align: center; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px;
+	    text-align: center; }
+	 
+	  .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>班次车辆人员月报表</h1>
+	</div>
+</div>
 <div class="row">
 	<div class="col-md-12">
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
-				<form class="form-inline" action="">
-				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_manth">
-						<span class="item-label" style="width: 80px;">公司: </span>
-						<select class="form-control" name="company" id="gsdmManth" style="width: 140px;"></select>
-					</div> 
-					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_manth">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdmManth" style="width: 140px;"></select>
+				<form class="form-inline" action="">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_manth">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdmManth" style="width: 140px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_manth">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdmManth" style="width: 140px;"></select>
 					</div>  
-					<div style="display: inline-block;margin-left: 10px">
-                        <span class="item-label" style="width: 150px;">线路: </span>
-                        <select class="form-control" name="line" id="line" style="width: 136px;"></select>
-                    </div>
-                    <div style="margin-top: 10px">
-                    
-                    </div>
-                    <div style="display: inline-block;margin-left: 5px;">
-                        <span class="item-label" style="width: 80px;">开始时间: </span>
-                        <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
-                    </div>
-                    <div style="display: inline-block;margin-left: 10px;">
-                        <span class="item-label" style="width: 80px;">结束时间: </span>
-                        <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
-                    </div>
-                    <div style="display: inline-block;margin-left: 10px">
-                        <span class="item-label" style="width: 80px;">统计: </span>
-                        <select class="form-control" style="width: 136px;" id='empnames'>
-                        	<option value="驾驶员">驾驶员</option>
-                        	<option value="售票员">售票员</option>
-                        	<option value="车辆自编号">车辆自编号</option>
-                        </select>
-                    </div>
-                    <div class="form-group">
-                        <input class="btn btn-default" type="button" id="query" value="筛选"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+					<div style="display: inline-block;margin-left: 10px">
+                        <span class="item-label" style="width: 150px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 136px;"></select>
+                    </div>
+                    <div style="margin-top: 10px">
+                    
+                    </div>
+                    <div style="display: inline-block;margin-left: 5px;">
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
+                        <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 10px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 10px">
+                        <span class="item-label" style="width: 80px;">统计: </span>
+                        <select class="form-control" style="width: 136px;" id='empnames'>
+                        	<option value="驾驶员">驾驶员</option>
+                        	<option value="售票员">售票员</option>
+                        	<option value="车辆自编号">车辆自编号</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="筛选"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
-					<table class="table table-bordered table-hover table-checkable" id="forms">
-						<thead>
-							<tr>
-								<th>序号</th>
-								<th id='empname'>驾驶员</th>
-								<th>运营里程</th>
-								<th>空驶里程</th>
-								<th>抽减里程</th>
-								<th>增加里程</th>
-								<th>总里程</th>
-								<th>抽减班次</th>
-								<th>增加班次</th>
-								<th>实际班次</th>
-							</tr>
-						</thead>
-						<tbody>
-							
-						</tbody>
-					</table>
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th id='empname'>驾驶员</th>
+								<th>运营里程</th>
+								<th>空驶里程</th>
+								<th>抽减里程</th>
+								<th>增加里程</th>
+								<th>总里程</th>
+								<th>抽减班次</th>
+								<th>增加班次</th>
+								<th>实际班次</th>
+							</tr>
+						</thead>
+						<tbody>
+							
+						</tbody>
+					</table>
 				</div>
 			</div>
 		</div>
@@ -96,155 +97,165 @@
 	$(function(){
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
-			$('.menu-toggler.sidebar-toggler').click();
+			$('.menu-toggler.sidebar-toggler').click();
 		$("#startDate,#endDate").datetimepicker({
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
-		});
-		var fage=false;
-		var obj = [];
-		var xlList;
-		$.get('/report/lineList',function(result){
-			xlList=result;
-		$.get('/user/companyData', function(result){
-			obj = result;
-			var options = '';
-			for(var i = 0; i < obj.length; i++){
-				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-			}
-			
-			if(obj.length ==0){
-				 $("#gsdmDiv_manth").css('display','none');
-				 $('#fgsdmDiv_manth').css('display','none');
-			}else if(obj.length ==1){
-				 $("#gsdmDiv_manth").css('display','none');
-				if(obj[0].children.length == 1  || obj[0].children.length ==0)
-					$('#fgsdmDiv_manth').css('display','none');
-			}
-			$('#gsdmManth').html(options);
-			updateCompany();
-		});
-		})
-		$("#gsdmManth").on("change",updateCompany);
-		function updateCompany(){
-			var company = $('#gsdmManth').val();
-			var options = '';
-			for(var i = 0; i < obj.length; i++){
-				if(obj[i].companyCode == company){
-					var children = obj[i].children;
-					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
-					}
-				}
-			}
-			$('#fgsdmManth').html(options);
-			initXl();
-		}
-		$("#fgsdmManth").on("change",initXl);
-		function initXl(){
-			var data=[];
-			if(fage){
-				$("#line").select2("destroy").html('');
-			}
-			var fgs=$('#fgsdmManth').val();
-			var gs=$('#gsdmManth').val();
-			for(var i=0;i<xlList.length;i++){
-				if(gs!=""){
-					if(fgs!=""){
-						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
-						}
-					}else{
-						if(xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
-						}
-					}
-				}
-			}
-			initPinYinSelect2('#line',data,'');
-			fage=true;
-		}
-		$("#query").on("click",function(){
-			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
-				layer.msg("请选择时间范围！");
-				return;
-			}
-			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
-				layer.msg("请选择时间范围！");
-				return;
-			}
-			$("#empname").html($("#empnames").val())
-			var params={};
-			params.empnames=$("#empnames").val();
-			params.line = $("#line").val();
-			params.startDate = $("#startDate").val();
-			params.endDate = $("#endDate").val();
-			params.lpName = $("#lpName").val(); 
-			params.gsdmManth= $("#gsdmManth").val();
-			params.fgsdmManth= $("#fgsdmManth").val(); 
-		   	$get("/mcy_forms/shiftuehiclemanth",params,function(result){		        
-		   		$("#sDate").text(startDate);
-		        $("#eDate").text(endDate);
-		        var temp = {};
-		        var today_account = 0;
-		        temp["line"] = $("#line").text(); 	        
-		        $.each(result, function(i, obj) {
-		            if(moment(obj.schedule_date_str).format("YYYY-MM-DD") == moment(obj.startDate).format("YYYY-MM-DD")){
-		                today_account++;
-		            } 
-                    obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
-                }); 
-              
-		        var list_shiftuehiclemanth = template('list_shiftuehiclemanth',{list:result});
-                // 把渲染好的模版html文本追加到表格中
-		        $('#forms tbody').html(list_shiftuehiclemanth);
-                
-		    }); 
-		});
-		
-		$("#export").on("click",function(){
-			var params={};
-			params.empnames=$("#empnames").val();
-			params.line = $("#line").val();
-			params.startDate = $("#startDate").val();
-			params.endDate = $("#endDate").val();
-			params.lpName = $("#lpName").val(); 
-			params.gsdmManth= $("#gsdmManth").val();
-			params.fgsdmManth= $("#fgsdmManth").val(); 
-			params.type='export';
-			$get('/mcy_export/shiftuehiclemanthExport',params,function(result){
-				window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment($("#startDate").val()).format("YYYYMMDD"));
-			});
-		});
+		});
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#startDate,#endDate").val(year + "-" + month + "-" + day);
+		
+		var fage=false;
+		var obj = [];
+		var xlList;
+		$.get('/report/lineList',function(result){
+			xlList=result;
+		$.get('/user/companyData', function(result){
+			obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			
+			if(obj.length ==0){
+				 $("#gsdmDiv_manth").css('display','none');
+				 $('#fgsdmDiv_manth').css('display','none');
+			}else if(obj.length ==1){
+				 $("#gsdmDiv_manth").css('display','none');
+				if(obj[0].children.length == 1  || obj[0].children.length ==0)
+					$('#fgsdmDiv_manth').css('display','none');
+			}
+			$('#gsdmManth').html(options);
+			updateCompany();
+		});
+		})
+		$("#gsdmManth").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdmManth').val();
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdmManth').html(options);
+			initXl();
+		}
+		$("#fgsdmManth").on("change",initXl);
+		function initXl(){
+			var data=[];
+			if(fage){
+				$("#line").select2("destroy").html('');
+			}
+			var fgs=$('#fgsdmManth').val();
+			var gs=$('#gsdmManth').val();
+			for(var i=0;i<xlList.length;i++){
+				if(gs!=""){
+					if(fgs!=""){
+						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}else{
+						if(xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}
+				}
+			}
+			initPinYinSelect2('#line',data,'');
+			fage=true;
+		}
+		$("#query").on("click",function(){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+			$("#empname").html($("#empnames").val())
+			var params={};
+			params.empnames=$("#empnames").val();
+			params.line = $("#line").val();
+			params.startDate = $("#startDate").val();
+			params.endDate = $("#endDate").val();
+			params.lpName = $("#lpName").val(); 
+			params.gsdmManth= $("#gsdmManth").val();
+			params.fgsdmManth= $("#fgsdmManth").val(); 
+		   	$get("/mcy_forms/shiftuehiclemanth",params,function(result){		        
+		   		$("#sDate").text(startDate);
+		        $("#eDate").text(endDate);
+		        var temp = {};
+		        var today_account = 0;
+		        temp["line"] = $("#line").text(); 	        
+		        $.each(result, function(i, obj) {
+		            if(moment(obj.schedule_date_str).format("YYYY-MM-DD") == moment(obj.startDate).format("YYYY-MM-DD")){
+		                today_account++;
+		            } 
+                    obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
+                }); 
+              
+		        var list_shiftuehiclemanth = template('list_shiftuehiclemanth',{list:result});
+                // 把渲染好的模版html文本追加到表格中
+		        $('#forms tbody').html(list_shiftuehiclemanth);
+                
+		    }); 
+		});
+		
+		$("#export").on("click",function(){
+			var params={};
+			params.empnames=$("#empnames").val();
+			params.line = $("#line").val();
+			params.startDate = $("#startDate").val();
+			params.endDate = $("#endDate").val();
+			params.lpName = $("#lpName").val(); 
+			params.gsdmManth= $("#gsdmManth").val();
+			params.fgsdmManth= $("#fgsdmManth").val(); 
+			params.type='export';
+			$get('/mcy_export/shiftuehiclemanthExport',params,function(result){
+				window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment($("#startDate").val()).format("YYYYMMDD"));
+			});
+		});
-	});
-	
-// 	$("#empnames").change(function(){
-// 		$("#empname").html($("#empnames").val())
-// // 		$("#query").click();
-
-// 	});
+	});
+	
+// 	$("#empnames").change(function(){
+// 		$("#empname").html($("#empnames").val())
+// // 		$("#query").click();
+
+// 	});
 </script>
 <script type="text/html" id="list_shiftuehiclemanth">
 	{{each list as obj i}}
-		<tr>
+		<tr>
 			<td>{{i+1}}</td>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.jhlc}}</td>
- 			<td>{{obj.emptMileage}}</td>
-			<td>{{obj.remMileage}}</td>
-			<td>{{obj.addMileage}}</td>
-			<td>{{obj.totalm}}</td>
-			<td>{{obj.cjbc}}</td>
-			<td>{{obj.ljbc}}</td>
+			<td>{{obj.jName}}</td>
+			<td>{{obj.jhlc}}</td>
+ 			<td>{{obj.emptMileage}}</td>
+			<td>{{obj.remMileage}}</td>
+			<td>{{obj.addMileage}}</td>
+			<td>{{obj.totalm}}</td>
+			<td>{{obj.cjbc}}</td>
+			<td>{{obj.ljbc}}</td>
 			<td>{{obj.sjbc}}</td>
 		</tr>
-	{{/each}}
-	{{if list.length == 0}}
-		<tr>
-			<td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
-		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -74,7 +74,7 @@
 				<div class="form-group">
 					<label class="col-md-3 control-label">出场里程</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="czlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+							<input type="text" value="0" class="form-control" name="czlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
@@ -82,7 +82,7 @@
 				<div class="form-group">
 					<label class="col-md-3 control-label">出场油量</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="czyl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+							<input type="text" value="0"  class="form-control" name="czyl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
@@ -90,7 +90,7 @@
 				<div class="form-group">
 					<label class="col-md-3 control-label">加油量</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="jzl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+							<input type="text" value="0"  class="form-control" name="jzl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
@@ -98,7 +98,7 @@
 				<div class="form-group">
 					<label class="col-md-3 control-label">进场油量</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="jzyl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+							<input type="text" value="0"  class="form-control" name="jzyl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
@@ -106,7 +106,7 @@
 				<div class="form-group">
 					<label class="col-md-3 control-label">油耗</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="yh" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+							<input type="text" value="0"  class="form-control" name="yh" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
@@ -124,7 +124,7 @@
 				<div class="form-group">
 					<label class="col-md-3 control-label">尿素</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="ns" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+							<input type="text" value="0"  class="form-control" name="ns" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
@@ -132,7 +132,7 @@
 				<div class="form-group">
 					<label class="col-md-3 control-label">进场里程</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="jzlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+							<input type="text" value="0"  class="form-control" name="jzlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
@@ -155,14 +155,14 @@
 				<div class="form-group">
 					<label class="col-md-3 control-label">损耗油量</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="sh" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+							<input type="text" value="0"  class="form-control" name="sh" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="col-md-3 control-label">行驶总里程</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="zlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+							<input type="text" value="0"  class="form-control" name="zlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 					</div>
 				</div>
@@ -69,7 +69,7 @@
 								<th width="3%">油价</th>
 								<th width="4%">路单工号</th>
 								<th width="4%">备注</th>
-								<th width="10%">总加注量</th>
+								<th width="10%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
@@ -160,7 +160,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             type="text" value="{{obj.bz}}" style=" width:45px" />
 	</td>
 	<td>
-		{{obj.zjzl}}
+		
 	</td>
 </tr>
 {{/each}}
@@ -37,7 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>
 			</div>
@@ -115,18 +115,36 @@
 			initPinYinSelect2('#line',data,'');
 		})
+		
 		//查询
 		$("#query").on('click',function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}
 			var line = $("#line").val();
 			var date = $("#date").val();
-			$get('/ylb/oilListMonth',{line:line,date:date},function(result){
-				$.each(result, function(i, obj) {
-	                obj.rq = moment(obj.rq).format("DD");
-	            });
+			$get('/ylb/oilListMonth',{line:line,date:date,type:'query'},function(result){
+// 				$.each(result, function(i, obj) {
+// 	                obj.rq = moment(obj.rq).format("DD");
+// 	            });
 				var oilListMonth = template('oilListMonth',{list:result});
 				$('#forms tbody').html(oilListMonth);
 			});
 		});
+		
+		//导出
+		$("#export").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}
+			var line = $("#line").val();
+			var date = $("#date").val();
+			$get('/ylb/oilListMonth', {line:line,date:date,type:'export'}, function(result){
+				window.open("/downloadFile/download?fileName=月存油报表"+moment(date).format("YYYYMMDD"));
+			});
+		});
 	});
 </script>
 <script type="text/html" id="oilListMonth">
@@ -165,19 +165,21 @@
 							<div class="col-md-6" >
 								<table  class="table table-bordered table-checkable" id="formsTime5">
 									<tr>
-										<td colspan="7">全日分组行驶时间(区间除外)</td>
+										<td colspan="8">全日分组行驶时间(区间除外)</td>
 									</tr>
 									<tr>
 										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">分组   时间</td>
-										<td width="23%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">分圈时间</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">停驶时间</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
-										<td width="12%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
+										<td width="19%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
+										<td width="19%" colspan="2" style="text-align:center;vertical-align:middle;">停站时间</td>
+										<td width="14%" rowspan="2" style="text-align:center;vertical-align:middle;">周转时间</td>
+										<td width="14%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
+										<td width="14%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
 									</tr>
 									<tr>
 										<td>上行</td>
 										<td style="text-align:center;">下行</td>
+										<td>上行</td>
+										<td style="text-align:center;">下行</td>
 									</tr>
 									<tbody class="tbody_time_5">
@@ -405,15 +407,16 @@
 		<td align="center">{{result.sjd}}</td>
 		<td align="center">{{result.sxsj}}</td>
 		<td align="center">{{result.xxsj}}</td>
+		<td align="center">{{result.sxtssj}}</td>
+		<td align="center">{{result.xxtssj}}</td>
 		<td align="center">{{result.fqsj}}</td>
-		<td align="center">{{result.tssj}}</td>
 		<td align="center">{{result.cjqj}}</td>
 		<td align="center">{{result.pjcj}}</td>
 	</tr>
 {{/each}}
 {{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="8"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 /**
  * 
- * @JSName : common.js(运管功能公共js)
- * 
- * @Author : bsth@lq
- * 
- * @Description : TODO(运管功能公共js)
- * 
+ * @JSName : timeTempletUpload.js(运管处js)
+ *
+ * @Author : bsth@zq
+ *
+ * @Description :  TODO(运管功能公共js)
+ *
  * @Data : 2016年6月29日 上午9:21:17
  *
  * @Version 公交调度系统BS版 0.1
- * 
+ *
  */
 (function(){
@@ -34,7 +34,7 @@
 	}
 	var lines = new Array();
 	var gsmap = getBusMap();
-	
+
 	$('#line').select2({
 		ajax: {
 			url: '/realSchedule/findLine',
@@ -73,7 +73,7 @@
 		   }
 		}
 	});
-	
+
 	// 绑定查询事件
 	$("#search").click(searchM);
 	// 绑定上传事件
@@ -92,16 +92,17 @@
 		$("#right_div table tbody").empty();
 		var params = {};
 		// 取得输入框的值
-		var inputs = $(".param input,select");debugger;
+		var inputs = $(".param input,select");
 		// 遍历数组
 		$.each(inputs, function(i, element) {
 			params[$(element).attr("name")] = $(element).val();
 		});
 		var i = layer.load(2);
-		$get('/tic', params, function(data) {
-			_dateFormat(data.content);
+		$get('/tic_ec', params, function(data) {
+			var content = data.data.content;
+			_dateFormat(content);
 			var bodyHtm = template('timeTemplet_list_temp', {
-				list : data.content
+				list : content
 			});
 			$("#left_div table tbody").empty();
 			$("#left_div table tbody").append(bodyHtm);
@@ -112,7 +113,7 @@
 	// 上传方法
 	function uploadM() {
-		
+
 		// 取得输入框的值
 		var trs = $("#right_div tbody tr input");
 		if (trs.length == 0) {
@@ -128,14 +129,14 @@
 		$.ajax({
 			type: 'get',url: '/trmg/setSKB',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				if(data == 'success'){
 					alert("上传成功");
 				}else{
 					alert("上传失败");
 				}
-				
-			}, error : function() { 
+
+			}, error : function() {
 				alert("操作失败");
 			}
@@ -180,23 +181,30 @@
 			obj.qyrq = moment(obj.qyrq).format(fs);
 		});
 	}
-	/*
+
 	// 绑定查询事件
 	$("#setXL").click(setXLF);
-	var params = {};
+
 	function setXLF() {
+        var params = {};
+        // 取得输入框的值
+        var inputs = $(".param input,select");debugger;
+        // 遍历数组
+        $.each(inputs, function(i, element) {
+            params[$(element).attr("name")] = $(element).val();
+        });
 		$.ajax({
 			type: 'get',url: '/trmg/setXL',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
 		});
 	}
-	
+
 	// 绑定查询事件
 	$("#setCL").click(setCLF);
 	var params = {};
@@ -204,15 +212,15 @@
 		$.ajax({
 			type: 'get',url: '/trmg/setCL',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
 		});
 	}
-	
+
 	// 绑定查询事件
 	$("#setSJ").click(setSJF);
 	var params = {};
@@ -220,47 +228,79 @@
 		$.ajax({
 			type: 'get',url: '/trmg/setSJ',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
 		});
 	}
-	
+
 	// 绑定查询事件
-	$("#setCS").click(setCSF);
+	$("#setLD").click(setLDF);
 	var params = {};
-	function setCSF() {
+	function setLDF() {
 		$.ajax({
-			type: 'get',url: '/trmg/setCS',
+			type: 'get',url: '/trmg/setLD',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
 		});
 	}
-	
+
+    // 绑定查询事件
+    $("#setLDFile").click(setLDFileF);
+    var params = {};
+    function setLDFileF() {
+        $.ajax({
+            type: 'get',url: '/trmg/setLDFile',
+            data: params ,dataType:'text',
+            success:function(data) {
+                alert(data);
+            }, error : function() {
+                alert("操作失败");
+            }
+
+        });
+    }
+
 	// 绑定查询事件
-	$("#setXLPC").click(setXLPCF);
+	$("#setLCYH").click(setLCYHF);
 	var params = {};
-	function setXLPCF() {
+	function setLCYHF() {
 		$.ajax({
-			type: 'get',url: '/trmg/setXLPC',
+			type: 'get',url: '/trmg/setLCYH',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
 		});
 	}
-	
+
+	// 绑定查询事件
+	$("#setDDRB").click(setDDRBF);
+	var params = {};
+	function setDDRBF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setDDRB',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
 	// 绑定查询事件
 	$("#setJHBC").click(setJHBCF);
 	var params = {};
@@ -268,13 +308,62 @@
 		$.ajax({
 			type: 'get',url: '/trmg/setJHBC',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 绑定查询事件
+	$("#setXLPC").click(setXLPCF);
+	var params = {};
+	function setXLPCF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setXLPC',
+			data: params ,dataType:'text',
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
 		});
-	}*/
+	}
+
+
+	// 绑定查询事件
+	$("#setCS").click(setCSF);
+	var params = {};
+	function setCSF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setCS',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 绑定查询事件
+	$("#downloadAllDataFile").click(getDownLoadAllDataFileF);
+	var params = {};
+	function getDownLoadAllDataFileF() {
+		$.ajax({
+			type: 'get',url: '/trmg/getDownLoadAllDataFile',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
 })();
 \ No newline at end of file
@@ -13,6 +13,7 @@
  */
 (function(){
+    var page = 0, initPagination;
 	// 关闭左侧栏
 	if (!$('body').hasClass('page-sidebar-closed'))
 		$('.menu-toggler.sidebar-toggler').click();
@@ -69,6 +70,49 @@
 			 $('#brancheCompanySelect').html(options).on('change', setLineAutocompleteOptions);
 		  }
 	 }
+
+    function setLineAutocompleteOptions(){
+        // 搜索参数集合
+        var params = {};
+        // 搜索字段名称
+        var name;
+        var items = $("ul.breadcrumb select");
+        // 遍历items集合
+        for(var j = 0, item; item = items[j++];){
+            // 获取字段名称
+            name = $(item).attr('name');
+            if(name){
+                // 赋取相对应的值
+                params[name] = $(item).val();
+            }
+        }
+        var lines = new Array();
+        var gsmap = getBusMap();
+        // 取得所有线路
+        $get('/line/all', params, function(allLine) {
+            // 遍历数组
+            $.each(allLine, function(i, e) {
+                var companyCode = e.company;
+                e.company = gsmap[e.company];
+                e.brancheCompany = gsmap[companyCode+"_"+e.brancheCompany];
+                var line = '{"hex":"'+e.company+'","label":"'+e.name+'"}';
+                var obj = jQuery.parseJSON(line);
+                lines[i]= obj;
+            });
+
+
+        });
+        // 给输入框绑定autocomplete事件
+        $("#line_name").autocompleter({
+            highlightMatches: true,
+            source: lines,
+            template: '{{ label }} <span>({{ hex }})</span>',
+            hint: true,
+            empty: false,
+            limit: 5,
+        });
+    }
+
 	 // 日期控件
 	 $('#dateInput').datetimepicker({
 		 // 日期控件时间格式
@@ -140,7 +184,7 @@
 			});
 		});
 		// 给输入框绑定autocomplete事件
-		$("input[name='xl.name_eq']").autocompleter({
+		$("#line_name").autocompleter({
 			highlightMatches : true,
 			source : lines,
 			template : '{{ label }} <span>({{ hex }})</span>',
@@ -150,5 +194,66 @@
 		});
 		// 设置autocompleter的宽度和输入框一样
 		$(".autocompleter").css("width",
-				$("input[name='xl.name_eq']").css("width"));
+				$("#line_name").css("width"));
+
+    searchM(null, true);
+    // 绑定查询事件
+    $("#search").click(searchM);
+    // 查询方法
+    function searchM(p, pagination) {
+        var params = {};
+        // 取得输入框的值
+        var inputs = $(".breadcrumb input,select");
+        // 遍历数组
+        $.each(inputs, function(i, element) {
+            params[$(element).attr("name")] = $(element).val();
+        });
+        var i = layer.load(2);
+        $get('/skb_log', params, function(data) {
+            var content = data.content;
+            _dateFormat(content);
+            var bodyHtm = template('timeTempletUploadRecord_list_temp', {
+                list : content
+            });
+            $('#datatable_logger tbody').html(bodyHtm);
+            if(pagination && data.content.length > 0){
+                //重新分页
+                initPagination = true;
+                showPagination(data);
+            }
+            layer.close(i);
+        });
+    }
+
+    //转换时间格式
+    function _dateFormat(list) {
+        var fs = 'YYYY-MM-DD HH:mm';
+        $.each(list, function(i, obj) {
+            obj.createDate = moment(obj.createDate).format(fs);
+        });
+    }
+
+    function showPagination(data){
+        //分页
+        $('#pagination').jqPaginator({
+            totalPages: data.totalPages,
+            visiblePages: 6,
+            currentPage: page + 1,
+            first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+            onPageChange: function (num, type) {
+                if(initPagination){
+                    initPagination = false;
+                    return;
+                }
+
+
+                page = num - 1;
+                searchM(null, false);
+            }
+        });
+    }
 })();
 \ No newline at end of file
@@ -10,16 +10,16 @@
 	<div class="col-md-12">
 		<ul class="breadcrumb">
 			<li>筛选数据:</li>
-			<li><select name="company_eq" class="form-control" id="companySelect"></select></li>
-			<li><select name="brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select></li>
+			<li><select name="ttInfo.xl.company_eq" class="form-control" id="companySelect"></select></li>
+			<li><select name="ttInfo.xl.brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select></li>
 			<li>日期:</li>
-			<li><input type="text" class="inputCommon dateTime" name="date" id="dateInput" placeholder="日期"></li>
+			<li><input type="text" class="inputCommon dateTime" name="createDate_date_eq" id="dateInput" placeholder="日期"></li>
 			<li>线路名称:</li>
 			<li><input type="text" class="form-control form-filter input-sm"
-				name="xl.name_eq" maxlength="40" /></li>
+				name="ttInfo.xl.name_eq" id="line_name" maxlength="40" /></li>
 			<li>上传用户:</li>
 			<li><input type="text" class="inputCommon inputCarPlate"
-				name="xl.user_eq" maxlength="40" /></li>
+				name="user.name_like" maxlength="40" /></li>
 			<li><a class="btn btn-circle blue" id="search">筛选</a></li>
 		</ul>
 	</div>
@@ -27,7 +27,8 @@
 		<div class="_panel">
 			<div class="table-container">
 				<table
-					class="table table-striped table-bordered table-advance pb-table head">
+					class="table table-striped table-bordered table-advance pb-table head"
+					id="datatable_logger">
 					<thead>
 						<tr>
 							<th>序号</th>
@@ -49,35 +50,97 @@
 		</div>
 	</div>
 </div>
-<script id="lineStationRecord_list_temp" type="text/html">
+<script id="timeTempletUploadRecord_list_temp" type="text/html">
 {{each list as obj i}}
 <tr>
 	<td class="seq" style="vertical-align: middle;">
 		{{i+1}}
 	</td>
 	<td>
-		{{obj.name}}
+		{{if obj.ttInfo.xl.company == '55'}}
+		上南公司
+		{{else if obj.ttInfo.xl.company == '22'}}
+		金高公司
+		{{else if obj.ttInfo.xl.company == '05'}}
+		杨高公司
+		{{else if obj.ttInfo.xl.company == '26'}}
+		南汇公司
+		{{else if obj.ttInfo.xl.company == '77'}}
+		闵行公司
+		{{/if}}
 	</td>
-	<td class="ttInfoId">
-		{{obj.company}}
+	<td>
+		{{if obj.ttInfo.xl.company == '55'}}
+
+		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		上南二分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		上南三分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		上南六分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '4'}}
+		上南一分公司
+		{{/if}}
+
+		{{else if obj.ttInfo.xl.company == '22'}}
+
+		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		四分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		二分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		三分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '5'}}
+		一分公司
+		{{/if}}
+
+		{{else if obj.ttInfo.xl.company == '05'}}
+
+		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		川沙分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		金桥分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		芦潮港分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '5'}}
+		杨高分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '6'}}
+		周浦分公司
+		{{/if}}
+
+		{{else if obj.ttInfo.xl.company == '26'}}
+
+		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		南汇一分
+		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		南汇二分
+		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		南汇三分
+		{{else if obj.ttInfo.xl.brancheCompany == '4'}}
+		南汇维修公司
+		{{else if obj.ttInfo.xl.brancheCompany == '5'}}
+		南汇公司
+		{{/if}}
+
+		{{/if}}
 	</td>
 	<td>
-		{{obj.name}}
+		{{obj.ttInfo.xl.name}}
 	</td>
 	<td>
-		{{obj.company}}
+		{{obj.ttInfo.name}}
 	</td>
 	<td>
-		
+		{{obj.user.name}}
 	</td>
-	<td >
-		
+	<td>
+		{{obj.createDate}}
 	</td>
 </tr>
 {{/each}}
 {{if list.length == 0}}
 <tr class="muted">
-	<td colspan=5 style="text-align: center;"><h6>没有找到相关数据</h6></td>
+	<td colspan=7 style="text-align: center;"><h6>没有找到相关数据</h6></td>
 </tr>
 {{/if}}
 	</script>
-package com.bsth.service.schedule;
-
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * 基础测试类。
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ScheduleTestApp.class)
-@ActiveProfiles("scheduletest")
-//@WebIntegrationTest({"server.port=0","management.port=0"})
-public class BaseTest {
-}
-package com.bsth.service.schedule;
-
-import com.bsth.service.schedule.impl.SchedulePlanRuleResultServiceImpl;
-import com.bsth.service.schedule.impl.SchedulePlanServiceImpl;
-import com.bsth.service.schedule.rules.MyDroolsConfiguration;
-import com.bsth.service.schedule.utils.DataToolsServiceImpl;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.orm.jpa.EntityScan;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-
-/**
- * 基础测试类（用于计划调度模块测试测试）。
- * 配置计划调度的模块的用到的entity，repository，service
- *
- * 注意：测试环境下测试类 TestApp 和springdata的类不在统一级包里，必须指定EnableJpaRepositories
- */
-@Configuration
-@EntityScan(
-        basePackages = {"com.bsth.entity"}
-)
-@ComponentScan(
-        basePackages = {"com.bsth.repository", "com.bsth.service"},
-        useDefaultFilters = false,
-        includeFilters = {
-                @ComponentScan.Filter(
-                        type = FilterType.ASSIGNABLE_TYPE,
-                        value = SchedulePlanRuleResultServiceImpl.class
-                ),
-                @ComponentScan.Filter(
-                        type = FilterType.ASSIGNABLE_TYPE,
-                        value = SchedulePlanServiceImpl.class
-                ),
-                @ComponentScan.Filter(
-                        type = FilterType.ASSIGNABLE_TYPE,
-                        value = MyDroolsConfiguration.class
-                ),
-                @ComponentScan.Filter(
-                        type = FilterType.ASSIGNABLE_TYPE,
-                        value = DataToolsServiceImpl.class
-                )
-        }
-)
-@EnableJpaRepositories(
-        basePackages = {"com.bsth.repository"}
-)
-@SpringBootApplication
-public class ScheduleTestApp {
-}
-package com.bsth.service.schedule.rules;
-
-import com.bsth.entity.sys.SysUser;
-import com.bsth.repository.sys.SysUserRepository;
-import com.bsth.service.schedule.BaseTest;
-import com.vividsolutions.jts.util.Assert;
-import org.dbunit.database.DatabaseConnection;
-import org.dbunit.database.IDatabaseConnection;
-import org.dbunit.dataset.IDataSet;
-import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
-import org.dbunit.operation.DatabaseOperation;
-import org.junit.After;
-import org.junit.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
-import javax.sql.DataSource;
-
-public class RuleTest1 extends BaseTest {
-    /** 日志记录器 */
-    private static final Logger logger = LoggerFactory.getLogger(RuleTest1.class);
-
-    @Autowired
-    private DataSource dataSource;
-
-    @Autowired
-    private SysUserRepository sysUserRepository;
-
-    /**
-     * 初始化数据。
-     */
-    @Before
-    public void initData() throws Exception {
-        logger.info("载入数据......");
-
-        // 获取数据库连接
-        IDatabaseConnection iDatabaseConnection = new DatabaseConnection(dataSource.getConnection());
-        // 获取Dbunit数据源
-        Resource res = new ClassPathResource("testdata/d1.xml");
-        FlatXmlDataSetBuilder flatXmlDataSetBuilder = new FlatXmlDataSetBuilder();
-        flatXmlDataSetBuilder.setColumnSensing(false);
-        flatXmlDataSetBuilder.setCaseSensitiveTableNames(false);
-        IDataSet iDataSet = flatXmlDataSetBuilder.build(res.getInputStream());
-
-        // 载入数据
-        DatabaseOperation.CLEAN_INSERT.execute(iDatabaseConnection, iDataSet);
-    }
-
-    /**
-     * 清除数据。
-     */
-    @After
-    public void destoryData() throws Exception {
-        logger.info("清除数据......");
-        // 获取数据库连接
-        IDatabaseConnection iDatabaseConnection = new DatabaseConnection(dataSource.getConnection());
-        // 获取Dbunit数据源
-        Resource res = new ClassPathResource("testdata/d1.xml");
-        FlatXmlDataSetBuilder flatXmlDataSetBuilder = new FlatXmlDataSetBuilder();
-        flatXmlDataSetBuilder.setColumnSensing(false);
-        flatXmlDataSetBuilder.setCaseSensitiveTableNames(false);
-        IDataSet iDataSet = flatXmlDataSetBuilder.build(res.getInputStream());
-
-        // 清除数据
-        DatabaseOperation.DELETE_ALL.execute(iDatabaseConnection, iDataSet);
-    }
-
-    @org.junit.Test
-    public void t1() {
-        logger.info("t1()测试......");
-        SysUser sysUser = sysUserRepository.findOne(1);
-        Assert.equals("admin", sysUser.getUserName());
-    }
-}
-
-//
-//
-//package com.bsth.service.schedule.rules;
-//
-//        import com.bsth.Application;
-//        import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
-//        import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
-//        import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
-//        import com.bsth.service.schedule.rules.ttinfo.TTInfoCalcuParam_input;
-//        import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
-//        import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
-//        import org.joda.time.DateTime;
-//        import org.junit.Test;
-//        import org.junit.runner.RunWith;
-//        import org.kie.api.KieBase;
-//        import org.kie.api.runtime.KieSession;
-//        import org.slf4j.Logger;
-//        import org.slf4j.LoggerFactory;
-//        import org.springframework.beans.factory.annotation.Autowired;
-//        import org.springframework.boot.test.SpringApplicationConfiguration;
-//        import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-//
-//        import java.util.Arrays;
-//
-//@RunWith(SpringJUnit4ClassRunner.class)
-//@SpringApplicationConfiguration(classes = {Application.class})
-//public class DroolsRulesTest {
-//
-//    /** 日志记录器 */
-//    private final static Logger logger = LoggerFactory.getLogger(DroolsRulesTest.class);
-//
-//    @Autowired
-//    private KieBase kieBase;
-//
-////    @Test
-////    public void helloWorldDrlTest() throws Exception {
-////        // 1、创建session，内部配置的是stateful
-////        KieSession session = kieBase.newKieSession();
-////
-////        // 1.1 设置gloable对象，在drl中通过别名使用
-////        List<String> gloableList = new ArrayList<String>();
-////        session.setGlobal("list", gloableList);
-////
-////        // 1.2 可以设置一些监听器，再议
-////
-////        // 2、创建fact对象
-////        Message message = new Message();
-////        message.setMessage("Hello World");
-////        message.setStatus(Message.HELLO);
-////        session.insert(message);
-////
-////        // 3、执行rule
-////        session.fireAllRules();
-////
-////        System.out.println(gloableList);
-////
-////        // 4、执行完毕销毁，有日志的也要关闭
-////        session.dispose();
-////    }
-//
-//    //    @Test
-//    public void ttinfoDrlTest() throws Exception {
-//        logger.info("------------ttinfoDrlTest 测试---------------");
-//
-//        // 1、创建session，内部配置的是stateful
-//        KieSession session = kieBase.newKieSession();
-//
-//        // 1.1 设置gloable对象，在drl中通过别人使用
-//        session.setGlobal("log", logger);
-//        TTInfoResults_output ttInfoResults_output = new TTInfoResults_output();
-//        session.setGlobal("results", ttInfoResults_output);
-//
-//        // 1.2 可以设置一些监听器，再议
-//
-//        // 2、创建fact对象
-//        TTInfoCalcuParam_input ttInfoCalcuParam_input = new TTInfoCalcuParam_input(
-//                new DateTime(2016, 8, 1, 0, 0),
-//                new DateTime(2016, 8, 10, 0, 0),
-//                "1"
-//        );
-//
-//
-//        TTInfo_input ttInfo_input1 = new TTInfo_input();
-//        ttInfo_input1.setTtInfoId("1");
-//        ttInfo_input1.setXlId("1");
-//        ttInfo_input1.setWeekdays(Arrays.asList(true, true, true, true, true, false, false));
-//        ttInfo_input1.getSpecialDays().add(new DateTime(2016, 8, 1, 0, 0));
-//        ttInfo_input1.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
-//        ttInfo_input1.setIsEnable(true);
-//        ttInfo_input1.setQyDate(new DateTime(2016, 1, 1, 0, 0));
-//
-//        TTInfo_input ttInfo_input1_2 = new TTInfo_input();
-//        ttInfo_input1_2.setTtInfoId("2");
-//        ttInfo_input1_2.setXlId("1");
-//        ttInfo_input1_2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
-//        ttInfo_input1_2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
-//        ttInfo_input1_2.setUpdateDate(new DateTime(2015, 2, 1, 0, 0));
-//        ttInfo_input1_2.setIsEnable(true);
-//        ttInfo_input1_2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
-//
-//
-//        TTInfoCalcuParam_input ttInfoCalcuParam_inpu2 = new TTInfoCalcuParam_input(
-//                new DateTime(2016, 8, 1, 0, 0),
-//                new DateTime(2016, 8, 10, 0, 0),
-//                "2"
-//        );
-//
-//        TTInfo_input ttInfo_input2 = new TTInfo_input();
-//        ttInfo_input2.setTtInfoId("2");
-//        ttInfo_input2.setXlId("2");
-//        ttInfo_input2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
-//        ttInfo_input2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
-//        ttInfo_input2.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
-//        ttInfo_input2.setIsEnable(true);
-//        ttInfo_input2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
-//
-//        session.insert(ttInfoCalcuParam_input);
-//        session.insert(ttInfo_input1);
-//        session.insert(ttInfo_input1_2);
-//        session.insert(ttInfoCalcuParam_inpu2);
-//        session.insert(ttInfo_input2);
-//
-//
-//
-//        // 3、执行rule
-//        session.fireAllRules();
-//
-//        // 4、执行完毕销毁，有日志的也要关闭
-//        session.dispose();
-//
-//        // 打印global结果
-//        logger.info(ttInfoResults_output.showTTInfoDesc1());
-//
-//    }
-//
-//    @Test
-//    public void shiftloopDrlTest() throws Exception {
-//        // 1、创建session，内部配置的是stateful
-//        KieSession session = kieBase.newKieSession();
-//
-//        // 1.1 设置gloable对象，在drl中通过别名使用
-//        ScheduleResults_output scheduleResults_output = new ScheduleResults_output();
-//        session.setGlobal("scheduleResult", scheduleResults_output);
-//
-//        // 1.2 可以设置一些监听器，再议
-//
-//        // 2、创建fact对象
-//
-//        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input();
-//        scheduleCalcuParam_input.setFromDate(new DateTime(2016, 8, 1, 0, 0));
-//        scheduleCalcuParam_input.setToDate(new DateTime(2016, 8, 10, 0, 0));
-//
-//        ScheduleRule_input scheduleRule_input1 = new ScheduleRule_input();
-//        scheduleRule_input1.setRuleId("1");
-//        scheduleRule_input1.setQyrq(new DateTime(2016, 7, 22, 0, 0));
-//        scheduleRule_input1.getGuideboardIds().addAll(Arrays.asList(
-//                "9", "9" , "8" ,"8" ,"7" ,"7" ,"6" ,"6", "5", "5", "4", "4", "3", "3", "2", "2", "1", "1"));
-//        scheduleRule_input1.setStartGbdIndex(3);
-//        scheduleRule_input1.getEmployeeConfigIds().addAll(Arrays.asList("1", "2"));
-//        scheduleRule_input1.setStartEIndex(1);
-//        scheduleRule_input1.setCarConfigId("1");
-//
-////        ScheduleRule_input scheduleRule_input2 = new ScheduleRule_input();
-////        scheduleRule_input2.setRuleId(2L);
-////        scheduleRule_input2.setQyrq(new DateTime(2016, 7, 22, 0, 0));
-////        scheduleRule_input2.getGuideboardIds().addAll(Arrays.asList(
-////                1L, 1L, 2L, 2L, 3L, 3L, 4L, 4L, 5L, 5L, 6L, 6L, 7L, 7L, 8L, 8L, 9L, 9L, 10L, 10L,
-////                11L, 11L, 12L, 12L, 13L, 13L));
-////        scheduleRule_input2.setStartGbdIndex(7);
-////        scheduleRule_input2.getEmployeeConfigIds().addAll(Arrays.asList(11L, 12L));
-////        scheduleRule_input2.setStartEIndex(1);
-////        scheduleRule_input2.setCarConfigId(2L);
-//
-//        session.insert(scheduleCalcuParam_input);
-//        session.insert(scheduleRule_input1);
-////        session.insert(scheduleRule_input2);
-//
-//
-//        // 3、执行rule
-//        session.fireAllRules();
-//
-//        // 4、执行完毕销毁，有日志的也要关闭
-//        session.dispose();
-//
-//        System.out.println(scheduleResults_output.showGuideboardDesc1());
-//
-//    }
-//}
-
-package com.bsth.service.schedule.rules;
-
-import com.bsth.service.schedule.BaseTest;
-import org.dbunit.database.DatabaseConnection;
-import org.dbunit.database.IDatabaseConnection;
-import org.dbunit.dataset.IDataSet;
-import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
-import org.dbunit.operation.DatabaseOperation;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
-import javax.sql.DataSource;
-
-/**
- * 排班计划测试（手工排班测试）。
- */
-public class SchedulePlan1Test extends BaseTest {
-    /** 日志记录器 */
-    private static final Logger logger = LoggerFactory.getLogger(SchedulePlan1Test.class);
-
-    @Autowired
-    private DataSource dataSource;
-
-    /**
-     * 初始化数据。
-     */
-    @Before
-    public void initData() throws Exception {
-        logger.info("载入数据......");
-
-        // 获取数据库连接
-        IDatabaseConnection iDatabaseConnection = new DatabaseConnection(dataSource.getConnection());
-        // 获取Dbunit数据源
-        Resource res = new ClassPathResource("testdata/d2.xml");
-        FlatXmlDataSetBuilder flatXmlDataSetBuilder = new FlatXmlDataSetBuilder();
-        flatXmlDataSetBuilder.setColumnSensing(false);
-        flatXmlDataSetBuilder.setCaseSensitiveTableNames(false);
-        IDataSet iDataSet = flatXmlDataSetBuilder.build(res.getInputStream());
-
-        // 载入数据
-        DatabaseOperation.CLEAN_INSERT.execute(iDatabaseConnection, iDataSet);
-    }
-
-    /**
-     * 清除数据。
-     */
-    @After
-    public void destoryData() throws Exception {
-        logger.info("清除数据......");
-        // 获取数据库连接
-        IDatabaseConnection iDatabaseConnection = new DatabaseConnection(dataSource.getConnection());
-        // 获取Dbunit数据源
-        Resource res = new ClassPathResource("testdata/d2.xml");
-        FlatXmlDataSetBuilder flatXmlDataSetBuilder = new FlatXmlDataSetBuilder();
-        flatXmlDataSetBuilder.setColumnSensing(false);
-        flatXmlDataSetBuilder.setCaseSensitiveTableNames(false);
-        IDataSet iDataSet = flatXmlDataSetBuilder.build(res.getInputStream());
-
-        // 清除数据
-        DatabaseOperation.DELETE_ALL.execute(iDatabaseConnection, iDataSet);
-    }
-
-
-    @Test
-    public void t1() {
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-package com.bsth.service.schedule.rules;
-
-/**
- * 时刻表测试（自动排班测试）。
- */
-public class SchedulePlan2Test {
-    // TODO：
-}
-#嵌入式tomcat配置
-#server.port=9088
-#management.port= 9001
-#management.address= 127.0.0.1
-
-#JPA配置
-spring.jpa.hibernate.ddl-auto= update
-spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
-spring.jpa.database= MYSQL
-spring.jpa.show-sql= true
-
-#数据库连接池配置
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1/test_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password=
-
-#spring.datasource.driver-class-name= org.h2.Driver
-#spring.datasource.url= jdbc:h2:mem:bookstore;DB_CLOSE_ON_EXIT=FALSE
-#spring.datasource.username= sa
-#spring.datasource.password=
-
-spring.datasource.max-active=100
-spring.datasource.max-idle=8
-spring.datasource.min-idle=8
-spring.datasource.initial-size=5
-
-spring.datasource.test-on-borrow=true
-spring.datasource.test-on-connect=true
-spring.datasource.test-on-return=true
-spring.datasource.test-while-idle=true
-spring.datasource.validation-query=select 1
-
-# 配置数据导入导出用到的配置信息
-
-# 1、kettle配置文件路径（类路径）
-datatools.kettle_properties=/datatools/kettle.properties
-# 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
-#数据库ip地址
-datatools.kvars_dbip=127.0.0.1
-#数据库用户名
-datatools.kvars_dbuname=root
-#数据库密码
-datatools.kvars_dbpwd=
-#数据库库名
-datatools.kvars_dbdname=qp_control
-
-# 3、上传数据配置信息
-# 上传文件目录配置（根据不同的环境需要修正）
-datatools.fileupload_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
-# ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
-datatools.trans_errordir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/erroroutput
-# 临时输出文件目录
-datatools.trans_tempdir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/temp
-# 模版文件目录
-datatools.trans_templatedir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/template
-
-##---------------------------- 导入数据ktr ----------------------------##
-# 车辆信息导入ktr转换
-datatools.cars_datainputktr=/datatools/ktrs/carsDataInput.ktr
-# 人员信息导入
-datatools.employees_datainputktr=/datatools/ktrs/employeesDataInput.ktr
-# 路牌信息导入
-datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr
-# 时刻表基础信息导入
-datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr
-# 时刻表明细信息导入（元数据）
-datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailDataInputMetaData.ktr
-# 时刻表明细编辑用数据
-datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr
-# 时刻表明细信息导入
-datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
-# 时刻表明细信息导入2
-datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
-
-# 车辆配置信息导入
-datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr
-# 人员配置信息导入
-datatools.employeesconfig_datainputktr=/datatools/ktrs/employeesConfigDataInput.ktr
-
-# 排版规则信息导入
-datatools.schedulerule_datainputktr=/datatools/ktrs/scheduleRuleDataInput.ktr
-
-# 4、数据导出配置信息
-# 导出数据文件目录配置（根据不同的环境需要修正）
-datatools.fileoutput_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
-
-##---------------------------- 导出数据ktr -----------------------------##
-# 车辆信息导出ktr转换
-datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr
-# 人员信息导出ktr转换
-datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr
-# 时刻表导出元数据ktr转换
-datatools.ttinfodetail_metaoutput=/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
-# 时刻表导出数据ktr转换
-datatools.ttinfodetail_output=/datatools/ktrs/ttinfodetailDataOutput.ktr
-# 排版规则导出数据ktr转换
-datatools.schedulerule_output=/datatools/ktrs/scheduleRuleDataOutput.ktr
-
-# 车辆配置信息导出ktr转换
-datatools.carsconfig_dataoutputktr=/datatools/ktrs/carsConfigDataOutput.ktr
-# 人员配置信息导出ktr转换
-datatools.employeesconfig_dataoutputktr=/datatools/ktrs/employeesConfigDataOutput.ktr
-
-# 路牌信息导出
-datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr
-
-
-# TODO：
-
-
-
-
-
-
-
-
-<?xml version='1.0' encoding='UTF-8'?>
-<dataset>
-    <!-- 用户数据 -->
-    <bsth_c_sys_user id="1" user_name="admin" name="系统管理员" create_date="2000-01-01" enabled="1" last_login_date="2000-01-01" />
-
-</dataset>
 \ No newline at end of file
-<?xml version='1.0' encoding='UTF-8'?>
-<dataset>
-    <!-- 用户（对应实体 SysUser） -->
-    <bsth_c_sys_user id="1" user_name="admin" name="系统管理员" create_date="2000-01-01" enabled="1" last_login_date="2000-01-01" />
-
-    <!-- 公司（对应实体 Business） -->
-    <bsth_c_business id="1" business_name="公交公司" business_code="88" up_code="0" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-    <bsth_c_business id="2" business_name="金高公司" business_code="22" up_code="88" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-    <bsth_c_business id="3" business_name="杨高公司" business_code="05" up_code="88" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-    <bsth_c_business id="4" business_name="上南公司" business_code="55" up_code="88" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-    <bsth_c_business id="5" business_name="南汇公司" business_code="26" up_code="88" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-
-    <!-- 线路（对应实体 Line） -->
-    <bsth_c_line id="1" name="测试线路1" line_code="l1" destroy="0" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-    <!-- 线路标准（对应实体 LineInformation） -->
-    <bsth_c_line_information id="1" line="1" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-
-    <!-- 站点（对应实体 Station） -->
-    <bsth_c_station id="1" station_name="站1" station_cod="#112233" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-    <bsth_c_station id="2" station_name="站2" station_cod="#223344" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-    <!-- 站点路由（对应实体 StationRoute）-->
-    <bsth_c_stationroute id="1" line="1" station="1" station_name="上行起点站" station_mark="B" directions="0" destroy="0" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-    <bsth_c_stationroute id="2" line="1" station="2" station_name="上行终点站" station_mark="E" directions="0" destroy="0" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-    <bsth_c_stationroute id="3" line="1" station="2" station_name="下行起点站" station_mark="B" directions="1" destroy="0" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-    <bsth_c_stationroute id="4" line="1" station="1" station_name="下行终点站" station_mark="E" directions="1" destroy="0" create_by="1" create_date="2000-01-01" update_by="1" update_date="2000-01-01" />
-
-    <!-- 停车场（对应实体） -->
-
-    <!-- TODO -->
-
-</dataset>
 \ No newline at end of file
-1、车辆配置，每辆车都可以配置单独的停车点及相关数据，并提供两种设置模式（早晚，复驶）
-2、规则管理，修改规则的界面图形化，更加方便修改
-3、时刻表管理，导入时刻表xls做严格数据判定，时刻表明细修改提供跟方便的图形化修改方式
-4、排班计划管理，提供每次排班的操作信息，时间段，所使用的时刻表，可以查看具体的排班明细（细化到班次）
-              生成排班时，提供详细的时刻表统计信息，提供两种排班模式（历史排班优先，规则优先）
-5、调度值勤日报，列出每天的基于线路，路牌的排班统计，可以更换车辆，人员
 \ No newline at end of file
-##1=时刻表明细导入，线路标准里所有的高峰低谷时间需要带入时刻表班次时间里，标准可以点击切换到线路标准界面
-##2=时刻表明细编辑功能，数据工具移到时刻表里，类似工具栏的样子
-3=时刻表导入，可以选一个已经存在的时刻表导入，而不是excel文件
-##4=所有的删除，作废，都要有提示框操作
-##5=排班计划错误提示，如果选的排班日期之前没有排班，提示错误，排班结果有重复与时刻表不符合，显示错误
-##6=调度执行日报，显示最近排班日期，修改操作强化
-7=警告功能，如时刻表选择相同的常规有效日，特殊有效日，车辆，人员配置重复等等
-##8=时刻表明细编辑，颜色覆盖冲突
-##9=下拉框貌似中文不能搜索
-10=时刻表明细编辑，环线，选上下行，上下的站点在下行站点列表里
-##11=人员基础信息导入问题，工号前要加公司代码
-##12=套跑规则嵌入到主排班规则中
-13=导入数据功能，需要加用户名
-14=路牌编号自动生成
-15=时刻表导入的时候表头后面不需要加数字
-##16=时间框中文
-##17=人员工号前公司编码自动加
-19=线路运营概览
-20=排班规则备注
-##21=时刻表，两点间空驶，算空驶
-22=搭班编码自动生成
-##23=时刻表明细修改终点站停驶（停止1个半小时以上）
-##24=线路标准里如果里程是0，用标准里程
-##25=规则导出的日期格式修正
-##26=人员录入，工号规则前加 "{公司编码}-"
-
-##27=调度执勤日报，换人后，工号前的-去掉
-##28=时刻表导出，元数据ktr转换站名匹配有问题
-##29=时刻编辑，超过70个班次，报错，改成150个班次
-##30=时刻表公里数 三位数
-
-31=规则修改，路牌范围，人员范围可以拖动
-##32=人员配置不存在的情况下，导入规则ktr，找不到的人员不添加，人员范围不存在的，规则不导入
-##33=时刻表明细班次，里添加，是否停驶选项（计算工时使用）
-select * from jwgl_f_t_clxh_workflow_detail a where a.ID_LYSYLB = 36;
-
-select sum(amount - tl_amount) from jwgl_f_t_clxh_workflow_detail
-where
-to_date(statdateid, 'YYYYMMDD') >= to_date('20170301', 'YYYYMMDD')
-and to_date(statdateid, 'YYYYMMDD') <= to_date('20170331', 'YYYYMMDD')
-
-select * from JWGL_D_T_LYSYLB
-
-
-select
-statdateid statdate
-, ssjc gs
-, xl xl
-, zbh cl
-, b.SYLB1 || '-' || b.SYLB2 as lylb
-, (sum(amount) - sum(tl_amount)) ch
-from JWGL_F_T_CLXH_WORKFLOW_DETAIL a, JWGL_D_T_LYSYLB b
-where
-to_date(statdateid, 'YYYYMMDD') >= to_date('20170301', 'YYYYMMDD')
-and to_date(statdateid, 'YYYYMMDD') <= to_date('20170331', 'YYYYMMDD')
-and a.ID_LYSYLB = b.ID(+)
-group by
-statdateid
-, ssjc
-, xl
-, zbh
-, b.SYLB1 || '-' || b.SYLB2
-
--- part1
-
-select sum(ch) from
-(
-select
-statdateid statdate
-, ssjc gs
-, xl xl
-, zbh cl
-, b.SYLB1 || '-' || b.SYLB2 as lylb
-, (sum(amount) - sum(tl_amount)) ch
-from JWGL_F_T_CLXH_WORKFLOW_DETAIL a, JWGL_D_T_LYSYLB b
-where
-to_date(statdateid, 'YYYYMMDD') >= to_date('20170301', 'YYYYMMDD')
-and to_date(statdateid, 'YYYYMMDD') <= to_date('20170331', 'YYYYMMDD')
-and a.ID_LYSYLB = b.ID(+)
-group by
-statdateid
-, ssjc
-, xl
-, zbh
-, b.SYLB1 || '-' || b.SYLB2
-)
-where lylb in (
-'路救-路救',
-'小修-小修机工',
-'专项-安检',
-'专项-节检',
-'专项-水箱',
-'专项-电瓶',
-'小修-小修电工',
-'专项-电并',
-'小修-小修车身',
-'专项-镗固',
-'保养-一级保养',
-'小修-发动机',
-'专项-轮胎',
-'分摊-轮胎',
-'专项-润滑油',
-'总成-差变速',
-'总成-大泵',
-'总成-小总成',
-'总成-发动机',
-'保养-二级保养',
-'保养-三级保养',
-'整修-整修',
-'空调-保外',
-'空调-保内',
-'事故-事故'
-)
-
--- part2
-
-select sum(ch) from
-(
-select
-statdateid statdate
-, ssjc gs
-, xl xl
-, zbh cl
-, b.SYLB1 || '-' || b.SYLB2 as lylb
-, (sum(amount) - sum(tl_amount)) ch
-from JWGL_F_T_CLXH_WORKFLOW_DETAIL a, JWGL_D_T_LYSYLB b
-where
-to_date(statdateid, 'YYYYMMDD') >= to_date('20170301', 'YYYYMMDD')
-and to_date(statdateid, 'YYYYMMDD') <= to_date('20170331', 'YYYYMMDD')
-and a.ID_LYSYLB = b.ID(+)
-group by
-statdateid
-, ssjc
-, xl
-, zbh
-, b.SYLB1 || '-' || b.SYLB2
-)
-where lylb in(
-'分摊-镗固',
-'专项-机油',
-'分摊-机油',
-'总成-其它',
-'分摊-工具',
-'分摊-辅助料',
-'分摊-设备',
-'车间经费-车间经费'
-)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-select * from JWGL_FR_T_CH_REPORT_DATA1;
-
-select * from JWGL_FR_T_CH_REPORT_DATA2;
-
--- sum part1
-
-select
-(
-sum(lj_lj) + sum(xx_xxjg) + sum(xx_xxdg) + sum(zx_db) + sum(xx_xxcs) + sum(zx_tg) + sum(by_b1) +
-sum(nvl(future_bx, 0)) + sum(xx_fdj) + sum(zx_lt) + sum(zx_rhy) + sum(zc_cbx) + sum(zc_db) + sum(zc_xzc) +
-sum(zc_fdj) + sum(by_b2) + sum(by_b3) + sum(nvl(future_wx_db, 0)) + sum(nvl(future_wxfy, 0)) + sum(nvl(future_ktwx, 0)) + sum(nvl(future_sx, 0)) +
-sum(nvl(future_dp, 0)) + sum(zx_zx) + sum(kt_bw) + sum(sg_sg)
-) as part1
-from JWGL_FR_T_CH_REPORT_DATA1
-where
-statdate >= to_date('20170301', 'YYYYMMDD')
-and statdate <= to_date('20170331', 'YYYYMMDD')
-
--- sum part2
-
-select
-(
-sum(zx_tg) + sum(jy) + sum(qt) + sum(zcfl) + sum(gj) + sum(sb) + sum(cjjf)
-) as part2
-from JWGL_FR_T_CH_REPORT_DATA2
-where statdate = to_date('20170331', 'YYYYMMDD')
 \ No newline at end of file
-select count(*) from bsth_c_s_sp_rule_rst
-
-show index from bsth_c_s_sp_rule_rst
-
-select * from bsth_c_s_sp_rule_rst t
-where not exists (select 1 from bsth_c_s_sp_rule_rst
-where create_date > t.create_date and schedule_date < '2017-04-17'  )
-and t.xl_id = 10407 and t.schedule_date < '2017-04-17'
-
-show index from bsth_c_s_sp_rule_rst
-
-select * from bsth_c_s_sp_rule_rst
-where xl_id = 1
-
-select * from bsth_c_s_sp_rule_rst t
-where t.xl_id = 10407 and t.schedule_date < '2017-04-17'
-
-
-select count(distinct concat(xl_id ,schedule_date, create_date)) / count(*) from bsth_c_s_sp_rule_rst
-
-select * from bsth_c_s_sp_rule_rst a
-where exists (select 1 from
-(select t.rule_id as rid, max(t.schedule_date) as sd from bsth_c_s_sp_rule_rst t
-where t.xl_id = 10407 and t.schedule_date < '2017-04-17'
-group by t.rule_id) a2 where a.rule_id = rid and a.schedule_date = sd)
-select count(*) from bsth_c_s_ttinfo_detail
-
-select * from bsth_c_s_ttinfo_detail
-
-select * from bsth_c_s_ttinfo_detail where zdz_code is null;
-
-select * from bsth_c_station;
-
-select * from bsth_c_car_park;
-
-update bsth_c_s_ttinfo_detail a
-set a.qdz_code = (select station_cod from bsth_c_station b where a.qdz = b.id)
-where a.bc_type <> 'out'
-
-update bsth_c_s_ttinfo_detail a
-set a.qdz_name = (select station_name from bsth_c_station b where a.qdz = b.id)
-where a.bc_type <> 'out'
-
-update bsth_c_s_ttinfo_detail a
-set a.zdz_code = (select station_cod from bsth_c_station b where a.zdz = b.id)
-where a.bc_type <> 'in'
-
-update bsth_c_s_ttinfo_detail a
-set a.zdz_name = (select station_name from bsth_c_station b where a.zdz = b.id)
-where a.bc_type <> 'in'
-
-update bsth_c_s_ttinfo_detail a
-set a.qdz_code = (select park_code from bsth_c_car_park b where a.tcc = b.id)
-where a.bc_type = 'out'
-
-update bsth_c_s_ttinfo_detail a
-set a.qdz_name = (select park_name from bsth_c_car_park b where a.tcc = b.id)
-where a.bc_type = 'out'
-
-update bsth_c_s_ttinfo_detail a
-set a.zdz_code = (select park_code from bsth_c_car_park b where a.tcc = b.id)
-where a.bc_type = 'in'
-
-update bsth_c_s_ttinfo_detail a
-set a.zdz_name = (select park_name from bsth_c_car_park b where a.tcc = b.id)
-where a.bc_type = 'in'
-
-commit;
-
-
-
-update bsth_c_s_sp_info a
-set a.schedule_plan = (
-select sp_id from bsth_c_s_sp_r_info b where a.id = b.sp_info_id
-)
-where a.schedule_plan is null
-
-select count(*) from bsth_c_s_sp_info
-where schedule_plan is null
 \ No newline at end of file
-select * from bsth_c_s_sp_rule_rst;
-
-select * from bsth_c_s_sp_rule_rst
-where qyrq is null;
-
-update bsth_c_s_sp_rule_rst a
-set a.qyrq = (select qyrq from bsth_c_s_sr1_flat where id = a.rule_id)
-where a.qyrq is null;
-
-select * from bsth_c_s_sp_rule_rst
-where origingidindex is null;
-
-update bsth_c_s_sp_rule_rst a
-set a.origingidindex = (select lp_start from bsth_c_s_sr1_flat where id = a.rule_id)
-where a.origingidindex is null;
-
-970
-789
-604
-985
-北蔡2路
-1048
-1118
-上南二分通勤
-
-
--Xms128M -Xmx1024M -XX:PermSize=64M -XX:MaxPermSize=128M
-
-1118
-572康桥
-83