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

潘钊
2 parents 3eec1735 931d141f
Showing 64 changed files with 2543 additions and 568 deletions
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/report/SheetController.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/entity/excep/ArrivalInfo.java
src/main/java/com/bsth/entity/mcy_forms/Changetochange.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/SectionRouteService.java
src/main/java/com/bsth/service/StationRouteService.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/SectionRouteServiceImpl.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/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -35,6 +35,16 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 	@Autowired
 	SectionRouteService routeService;
+	/**
+     * @param String
+     * @throws
+     * @Description: TODO(批量撤销路段)
+     */
+    @RequestMapping(value = "/batchDestroy", method = RequestMethod.GET)
+    public Map<String, Object> updateBatch(@RequestParam Map<String, Object> map) {
+    	return routeService.updateSectionRouteInfoFormId(map);
+    }
+	
 	 /**
      * @param @param map
      * @throws
@@ -47,6 +47,16 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
         return service.list(map);
     }
+    /**
+     * @param String
+     * @throws
+     * @Description: TODO(批量撤销站点)
+     */
+    @RequestMapping(value = "/batchDestroy", method = RequestMethod.GET)
+    public Map<String, Object> updateBatch(@RequestParam Map<String, Object> map) {
+    	return service.updateStationRouteInfoFormId(map);
+    }
+    
 	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
@@ -87,6 +87,7 @@ public class ExportController {
 	public List<Map<String, Object>> shifdayExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String, Object> map2 = new HashMap<String, Object>();
 		ReportUtils ee = new ReportUtils();
 		List<Shifday> shifday = formsService.shifday(map);
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
@@ -110,11 +111,15 @@ public class ExportController {
 			m.put("sjbc", l.getSjbc());
 			resList.add(m);
 		}
+		if(resList.size() > 0){
+			map2 = resList.get(resList.size() - 1);
+			resList.remove(map2);
+		}
 		try {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould/shifday.xls",
+			ee.excelReplace(listI, new Object[] { map2 }, path + "mould/shifday.xls",
 					path + "export/班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -319,8 +319,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/correctForm")
 	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
+											@RequestParam String endDate,
 											 @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
-		return scheduleRealInfoService.correctForm(line, date,  lpName, code, type);
+		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type);
 	}
 	/**
 	 * @Title queryListWaybill
@@ -110,6 +110,7 @@ public class ReportController {
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("i", i);
 			m.put("nbbm", a.getNbbm());
+			m.put("pzh", a.getPzh());
 			m.put("stopName", a.getStopName());
 			m.put("jzsj", a.getJzsj());
 			m.put("czsj", a.getCzsj());
@@ -36,9 +36,21 @@ public class SheetController  extends BaseController&lt;Sheet, Integer&gt;{
 		List<Sheet> list=sheetService.sheetList(id);
 		return list;
 	}
+	@RequestMapping(value = "/exportList",method = RequestMethod.GET)
+	public List<Sheet> exportList(@RequestParam Integer id){
+		List<Sheet> list=sheetService.exportList(id);
+		return list;
+	}
+	
 	@RequestMapping(value = "/countList",method = RequestMethod.GET)
 	public List<Map<String, Object>> countList(@RequestParam Map<String, Object> map){
 		List<Map<String, Object>> list=sheetService.countList(map);
 		return list;
 	}
+	
+	@RequestMapping(value = "/listSheet",method = RequestMethod.GET)
+	public List<Map<String, Object>> listSheet(@RequestParam Map<String, Object> map){
+		List<Map<String, Object>> list=sheetService.listSheet(map);
+		return list;
+	}
 }
@@ -94,6 +94,9 @@ public class Line implements Serializable {
 	/** 是否夜宵线   <1:是;0:否> bit length(50)*/ 
 	private Integer supperLine;
+	
+	/** 是否营运   <1:是;0:否> bit length(50)*/ 
+	private Integer sfyy;
 	/** 起始调度电话 varchar length(50) */
 	private String startPhone;
@@ -481,4 +484,14 @@ public class Line implements Serializable {
     public void setCgsbm(String cgsbm) {
         this.cgsbm = cgsbm;
     }
+
+	public Integer getSfyy() {
+		return sfyy;
+	}
+
+	public void setSfyy(Integer sfyy) {
+		this.sfyy = sfyy;
+	}
+    
+    
 }
@@ -20,6 +20,8 @@ public class ArrivalInfo {
 	private String nbbm;
+	
+	private String pzh;
 	/** 站点名称 */
 	private String stopName;
@@ -243,6 +245,14 @@ public class ArrivalInfo {
 	public void setJzsj(String jzsj) {
 		this.jzsj = jzsj;
 	}
+
+	public String getPzh() {
+		return pzh;
+	}
+
+	public void setPzh(String pzh) {
+		this.pzh = pzh;
+	}
@@ -12,6 +12,8 @@ public class Changetochange {
 	@GeneratedValue
 	private Integer id;
+	private Long sId;
+	
 	private String rq;//日期
 	private String gs;//公司
@@ -171,7 +173,15 @@ public class Changetochange {
 	public void setXgr(String xgr) {
 		this.xgr = xgr;
 	}
-	
+	public Long getsId() {
+		return sId;
+	}
+
+	public void setsId(Long sId) {
+		this.sId = sId;
+	}
+	
+    
 }
@@ -175,6 +175,10 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+10) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
 	public void sectionUpdSectionRouteCode(Integer line,Integer dir,Integer routeCod);
+	@Modifying
+	@Query(value="UPDATE bsth_c_sectionroute set destroy = 1 where id = ?1", nativeQuery=true)
+	public void sectionRouteIsDestroyUpdBatch(Integer ids);
+	
     @Modifying
     @Query(value="update bsth_c_sectionroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1   ", nativeQuery=true)
 	public void sectionRouteDir(Integer line);
@@ -282,4 +282,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
     @Modifying
 	@Query(value="UPDATE bsth_c_stationroute  set station_route_code = (station_route_code+10) where line = ?1  and directions = ?2 and station_route_code >=?3 and destroy = 0", nativeQuery=true)
 	public void stationUpdStationRouteCode(Integer line,Integer dir,Integer routeCod);
+    
+    @Modifying
+   	@Query(value="UPDATE bsth_c_stationroute set destroy = 1 where id = ?1", nativeQuery=true)
+   	public void stationRouteIsDestroyUpdBatch(Integer ids);
 }
@@ -33,6 +33,15 @@ public interface SectionRouteService extends BaseService&lt;SectionRoute, Integer&gt; 
 	List<Map<String, Object>> getSectionRoute(Map<String, Object> map);
 	/**
+	 * @Description : TODO(根据路段路由Id批量撤销路段)
+	 * 
+	 * @param  map <id:路段路由ID> 
+	 * 
+	 * @return List<Map<String, Object>>
+	 */
+	Map<String, Object> updateSectionRouteInfoFormId(Map<String, Object> map);
+	
+	/**
 	 * @Description : TODO(根据路段路由Id查询详情)
 	 * 
 	 * @param  map <id:路段路由ID> 
@@ -31,6 +31,15 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	Iterable<StationRoute> list(Map<String, Object> map);
 	/**
+	 * @Description : TODO(根据路段站点Id批量撤销站点)
+	 * 
+	 * @param  map <id:站点路由ID> 
+	 * 
+	 * @return List<Map<String, Object>>
+	 */
+	Map<String, Object> updateStationRouteInfoFormId(Map<String, Object> map);
+	
+	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
 	 * @param map <line.id_eq:线路ID； directions_eq：方向>
@@ -92,4 +101,5 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	 Map<String, Object> updSwitchDir(String lineIds);
 	 Map<String, Object> upddis(Map<String, Object> map);
+
 }
@@ -806,23 +806,38 @@ public class FormsServiceImpl implements FormsService {
 					return d;
 				}
 			});
+
+			Set<String> lineSet = new HashSet<String>();
+			List<String> strList = new ArrayList<>();
+			sql = "select name from bsth_c_line where sfyy = 0";
+			strList = jdbcTemplate.query(sql,
+					new RowMapper<String>(){
+				@Override
+				public String mapRow(ResultSet rs, int rowNum) throws SQLException {
+					return rs.getString("name");
+				}
+			});
+			lineSet.addAll(strList);
+	       
 			List<ScheduleRealInfo> listReal;
 			if(xlbm.equals("")){
 				listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj(xlbm, startDate, endDate, gsdm, fgsdm);
 			}else{
 				listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj2(xlbm, startDate, endDate);
 			}
-			
+			 List<Operationservice> resList = new ArrayList<Operationservice>();
 			for (int i = 0; i < list.size(); i++) {
 				Operationservice o=list.get(i);
 				String line=o.getXlBm();
 				String xlname=BasicData.lineCode2NameMap.get(line);
+				if(lineSet.contains(xlname))
+					continue;
 				o.setXlName(xlname);
 				List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
 				for (int j = 0; j < listReal.size(); j++) {
 					ScheduleRealInfo s=listReal.get(j);
-					if(s.getXlBm().equals(line)){
+					if(s.getXlBm().equals(line) && !lineSet.contains(s.getXlName())){
 						newList.add(s);
 					}
 				}
@@ -858,8 +873,10 @@ public class FormsServiceImpl implements FormsService {
 				o.setJzl(String.valueOf(jzl));
 				o.setXhl(String.valueOf(xhl));
+				
+				resList.add(o);
 			}
-		return list;
+		return resList;
 	}
@@ -949,6 +966,7 @@ public class FormsServiceImpl implements FormsService {
 		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Set<String> lineSet = new HashSet<String>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
 		NumberFormat numberFormat = NumberFormat.getInstance();
@@ -1002,9 +1020,21 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
-		
+		sql = "select name from bsth_c_line where sfyy = 0";
+		List<String> strList = new ArrayList<>();
+		strList = jdbcTemplate.query(sql,
+				new RowMapper<String>(){
+			@Override
+			public String mapRow(ResultSet rs, int rowNum) throws SQLException {
+				return rs.getString("name");
+			}
+		});
+		lineSet.addAll(strList);
 		for(Line line1 : lineList){
+			if(lineSet.contains(line1.getName())){
+				continue;
+			}
 			if(line.trim().length() == 0 || line1.getLineCode().equals(line)){
 				Map<String, Object> m = new HashMap<String, Object>();
 				m.put("rq", rq);
@@ -460,7 +460,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 							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);
 					}
 				}
@@ -562,7 +561,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 								if(l < 90)
 									fcsjs.add(l);
 							}
-						if(temp0.containsKey(key))
+						if(temp1.containsKey(key))
 							for(Long l : temp1.get(key)){
 								if(l < 90)
 									fcsjAs.add(l);
@@ -1701,8 +1700,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					lc = schedule.getJhlc();
 				}
-				jhbc++;
-				jhlc += lc;
+				if(!schedule.isSflj()){
+					jhbc++;
+					jhlc += lc;
+				}
 				if(schedule.getStatus() != -1){
 					sjbc++;
 					sjlc += lc;
@@ -1928,7 +1929,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			int sjbc = 0, sddf = 0, zddf = 0,
 					dxtz = 0, lbtz = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
-				if(schedule.getFcsjActual() != null){
+				if(schedule.getFcsjActual() != null && schedule.getStatus() != -1){
 					boolean flag = false;
 					sjbc++;
 					if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
@@ -5,10 +5,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
@@ -49,6 +54,12 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	@Autowired
 	LineRepository lineRepository;
+	@Autowired
+    private EntityManager entityManager;
+	
+	@Value("${hibernate.jdbc.batch_size}")
+    private int batchSize;
+	
 	@Override
 	public Iterable<SectionRoute> list(Map<String, Object> map) {
 		List<Sort.Order> orderList = new ArrayList<>();
@@ -106,6 +117,9 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		return resultList;
 	}
+	
+		
+	
 	/**
 	 * @Description : TODO(根据路段路由Id查询详情)
 	 * 
@@ -297,4 +311,33 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		}
 		return resultMap;
 	}
+	
+	/**
+	 * @Description : TODO(根据路段路由Id批量撤销路段)
+	 * 
+	 * @param  map <id:路段路由ID> 
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> updateSectionRouteInfoFormId(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			//int i = 0;
+			String[] idsStr = map.get("ids").toString().split(",") ;
+	        for (String id : idsStr) {
+	         /*   entityManager.persist(Integer.parseInt(id));*/
+	            repository.sectionRouteIsDestroyUpdBatch(Integer.parseInt(id));
+/*	            i++;
+	            if (i % batchSize == 0) {
+	                entityManager.flush();
+	                entityManager.clear();
+	            }*/
+	        }
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
 }
 \ No newline at end of file
@@ -24,7 +24,6 @@ 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.*;
@@ -68,6 +67,29 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return repository.findAll(new CustomerSpecs<StationRoute>(map), new Sort(orderList));
 	}
+	
+	/**
+	 * @Description : TODO(根据路段路由Id批量撤销路段)
+	 * 
+	 * @param  map <id:路段路由ID> 
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> updateStationRouteInfoFormId(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			String[] idsStr = map.get("ids").toString().split(",") ;
+	        for (String id : idsStr) {
+	            repository.stationRouteIsDestroyUpdBatch(Integer.parseInt(id));
+	        }
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
+	
 	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
@@ -512,38 +534,57 @@ 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)
@@ -557,12 +598,6 @@ 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);
@@ -633,23 +668,25 @@ 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("") ? "0" : objects.get(i)[0].toString();
+				String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
 				// 纬度
-				String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
-				
-				Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
+				String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
 				lat = "\t" +  lat;
@@ -659,32 +696,23 @@ 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 =  String.valueOf(defaultZdxh);
+				String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
 				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;
@@ -704,33 +732,41 @@ 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) {
-					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);
+					
+					double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
+					
+					sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
+					
 				}else if(sobje.size()>1){
+					
+					/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 					for(int j =0;j<sobje.size();j++) {
-						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;
+						
+						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);
+							
 						}
+						
 					}
 				}
-				if(sleepStr.equals("")) 
-					sleepStr  =  "\t" + "60";
+				
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 			}
@@ -749,12 +785,9 @@ 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("") ? "0" : objects.get(i)[0].toString();
-					
+					String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
 					// 纬度
-					String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
-					
-					Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
+					String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
 					lat = "\t" +  lat;
 					// 站点类型
 					String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
@@ -769,17 +802,6 @@ 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);
@@ -795,28 +817,20 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 					List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
 					if(sobje.size()==1) {
-						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);
+						double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
+						sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
 					}else if(sobje.size()>1){
+						/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 						for(int j =0;j<sobje.size();j++) {
-							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;
+							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);
 							}
 						}
 					}
-					if(sleepStr.equals("")) 
-						sleepStr  =  "\t" + "60";
 					xh++;
 					restStr = restStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 				}
@@ -316,6 +316,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		// 取昨天 的日期
 		String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
 		StringBuffer sf = new StringBuffer();
+		String str;
 		try {
 			int counter = 0; // 计数器
 			int per = 10; // 每几条线路上传一次路单
@@ -400,26 +401,28 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				if(counter % per == per - 1){
 					counter = 0;
 					sf.append("</DLDS>");
-					Results results = ssop.setLD(userNameOther, passwordOther, sf.toString());
+					str = sf.toString().replace("'","");// 去掉'号
+					Results results = ssop.setLD(userNameOther, passwordOther, str);
 					if(results.isSuccess()){
 						result = "success";
 					}else{
 						result = "failure";
 					}
-					logger.info("setLD:"+sf.toString());
+					logger.info("setLD:"+str);
 					logger.info("setLD:"+result);
 				}
 			}
 			// 每per条线路上传后剩下的数据再上传
 			if(counter > 0){
 				sf.append("</DLDS>");
-				Results results = ssop.setLD(userNameOther, passwordOther, sf.toString());
+				str = sf.toString().replace("'","");// 去掉'号
+				Results results = ssop.setLD(userNameOther, passwordOther, str);
 				if(results.isSuccess()){
 					result = "success";
 				}else{
 					result = "failure";
 				}
-				logger.info("setLD:"+sf.toString());
+				logger.info("setLD:"+str);
 				logger.info("setLD:"+result);
 			}
 		} catch (Exception e) {
@@ -105,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<SchEditInfoDto> correctForm(String line,String date,String lpName,String code, String type);
+	List<SchEditInfoDto> correctForm(String line,String date,String endDate,String lpName,String code, String type);
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
@@ -1964,7 +1964,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }*/
     @Override
-    public List<SchEditInfoDto> correctForm(String line,String date,
+    public List<SchEditInfoDto> correctForm(String line,String date,String endDate,
     		String lpName,String code, String type) {
 //        var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班', 
@@ -1990,17 +1990,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          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=? )"
+         		+ "logger_sch_modify where rq BETWEEN ? and  ? 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);
+        		 new BeanPropertyRowMapper(SchEditInfoDto.class),date,endDate, 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());
+        		 t.setType2(t.getUser()+"于"+t.getTimeStr()+"进行"+map.get(t.getType()).toString()+";");
         	 }else{
         		 t.setType2("");
         	 }
@@ -2012,6 +2012,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					fage=false;
 				}
 			}
+        	 
         	 if(fage){
         		 lists.add(t);
         	 }
@@ -2029,6 +2030,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              for (SchEditInfoDto d : lists) {
             	 Map<String, Object> tempMap = new HashMap<String, Object>();
             	 tempMap.put("lpName", d.getLpName());
+            	 tempMap.put("rq", d.getRq());
             	 tempMap.put("clZbh", d.getClZbh());
             	 tempMap.put("jName", d.getjName()+"/"+d.getjGh());
             	 tempMap.put("fcsj", d.getFcsj());
@@ -10,6 +10,7 @@ public interface SheetService extends BaseService&lt;Sheet, Integer&gt;{
 	public List<Map<String, Object>> bcPunctual(Map<String, Object> map);
 	public String  saveSheetList(String date) throws Exception;
 	public List<Map<String, Object>> countList(Map<String, Object> map);
-	
+	public List<Map<String, Object>> listSheet(Map<String, Object> map);
 	public List<Sheet> sheetList(Integer id);
+	public List<Sheet> exportList(Integer id);
 }
@@ -157,7 +157,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					if(scheduleRealInfo.getStatus() == -1){
 						lbbc++;
 					}
-				}else{
+				}
+				/*else{
 					if(scheduleRealInfo.getStatus() == -1){
 						boolean fage=true;
 						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
@@ -174,7 +175,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							lbbc++;
 						}
 					}
-				}
+				}*/
 			}
 		}
 		return lbbc;
@@ -156,7 +156,9 @@ public class ReportServiceImpl implements ReportService{
 		while(rs.next()){
 			arr = new ArrivalInfo();
 			arr.setDeviceId(rs.getString("device_id"));
-			arr.setNbbm(BasicData.deviceId2NbbmMap.get(arr.getDeviceId()));
+			String nbbm=BasicData.deviceId2NbbmMap.get(arr.getDeviceId());
+			arr.setNbbm(nbbm);
+			arr.setPzh(BasicData.nbbmCompanyPlateMap.get(nbbm));
 			if(null == arr.getNbbm()){
 				logger.warn("未注册的设备号，" + arr.getDeviceId());
 				continue;
 package com.bsth.service.report.impl;
+import java.lang.reflect.InvocationTargetException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -42,6 +43,7 @@ import com.bsth.service.report.SheetService;
 import com.bsth.util.BatchSaveUtils;
 import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableReal;
+import com.bsth.util.ReportRelatedUtils;
 import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
 @Service
@@ -658,7 +660,8 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 			fgs=map.get("fgs").toString();
 		}
 		String date=map.get("date").toString();
-		String sql="select * from bsth_c_sheet where date='"+date+"'";
+		String endDate=map.get("endDate").toString();
+		String sql="select * from bsth_c_sheet where date BETWEEN '"+date+"' and '"+endDate+"'";
 		if(line.trim().equals("")){
 			sql +=" and gs like '%"+gs+"%' and fgs like '%"+fgs+"%'";
 		}else{
@@ -721,6 +724,7 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		String gs=BasicData.businessCodeNameMap.get(list.get(0).getGs());
 		String fgs=BasicData.businessFgsCodeNameMap.get(list.get(0).getFgs()+"_"+list.get(0).getGs());
 		String line=BasicData.lineCode2NameMap.get(list.get(0).getLine());
+		String date=list.get(0).getDate();
 		Integer id=list.get(0).getId();
 		int bcs=list.size();
 		int zdbcs=0;
@@ -740,6 +744,7 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		map.put("zdbcs", zdbcs);
 		map.put("zdlv", df.format(zdlv)+"%");
 		map.put("id", id);
+		map.put("date", date);
 		return map;
 	}
 	@Override
@@ -781,6 +786,128 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		return list;
 	}
+	@Override
+	public List<Sheet> exportList(Integer id) {
+		// TODO Auto-generated method stub
+		 ReportRelatedUtils rru = new ReportRelatedUtils();
+		Sheet sheet=sheetRepository.findOne(id);
+		String sql="select * from bsth_c_sheet where date='"+sheet.getDate()+"' and line = '"+sheet.getLine()+"'"
+				+ " order by xl_dir,jhsj";
+		
+		List<Sheet> list=jdbcTemplate.query(sql, 
+				 new RowMapper<Sheet>(){
+			 @Override 
+			 public Sheet mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 Sheet s=new Sheet();
+				 s.setId(rs.getInt("id"));
+				 s.setGs(rs.getString("gs"));
+				 s.setFgs(rs.getString("fgs"));
+				 s.setLine(rs.getString("line"));
+				 s.setDate(rs.getString("date"));
+				 s.setJhsj(rs.getString("jhsj"));
+				 s.setJhsjt(rs.getLong("jhsjt"));
+				 s.setSjsj(rs.getString("sjsj"));
+				 s.setSjsjt(rs.getLong("sjsjt"));
+				 s.setZdname(rs.getString("zdname"));
+				 return s;
+			 }
+		});
+		
+		List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+		for (int i = 0; i < list.size(); i++) {
+			Sheet t=list.get(i);
+			t.setLine(BasicData.lineCode2NameMap.get(t.getLine()));
+			Long sjc=t.getJhsjt()-t.getSjsjt();
+			if(sjc>= 3*60*1000*-1 && sjc <=1*60*1000){
+				t.setSfzd("准点");
+			}else{
+				t.setSfzd("不准点");
+			}
+			
+			try {
+				Map<String, Object> map = rru.getMapValue(t);
+				listMap.add(map);
+			} catch (ClassNotFoundException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IllegalAccessException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (InvocationTargetException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (NoSuchMethodException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (NoSuchFieldException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			
+		}
+		
+		return list;
+	}
+	@Override
+	public List<Map<String, Object>> listSheet(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>> listmap=new ArrayList<Map<String,Object>>();
+		Integer id=Integer.parseInt(map.get("id").toString());
+		Sheet sheet=sheetRepository.findOne(id);
+		String date=map.get("date").toString();
+		String endDate=map.get("endDate").toString();
+		
+		String sqlByDate="select date from bsth_c_sheet where date BETWEEN '"+date+"' and '"+endDate+"'"
+				+ "and line = '"+sheet.getLine()+"' group by date order by date";
+		
+		List<String> dateList=jdbcTemplate.query(sqlByDate, 
+				 new RowMapper<String>(){
+			 @Override 
+			 public String mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 String date=rs.getString("date");
+				 
+				 return date;
+			 }
+		});
+		
+		String sql="select * from bsth_c_sheet where date BETWEEN '"+date+"' and '"+endDate+"'"
+				+ " and line ='"+sheet.getLine()+"' order by date";
+		
+		List<Sheet> list=jdbcTemplate.query(sql, 
+				 new RowMapper<Sheet>(){
+			 @Override 
+			 public Sheet mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 Sheet s=new Sheet();
+				 s.setGs(rs.getString("gs"));
+				 s.setFgs(rs.getString("fgs"));
+				 s.setLine(rs.getString("line"));
+				 s.setDate(rs.getString("date"));
+				 s.setJhsj(rs.getString("jhsj"));
+				 s.setJhsjt(rs.getLong("jhsjt"));
+				 s.setSjsj(rs.getString("sjsj"));
+				 s.setSjsjt(rs.getLong("sjsjt"));
+				 s.setId(rs.getInt("id"));
+				 return s;
+			 }
+		});
+		for (int i = 0; i < dateList.size(); i++) {
+			String s=dateList.get(i);
+			List<Sheet> newList=new ArrayList<Sheet>();
+			for (int j = 0; j < list.size(); j++) {
+				Sheet t=list.get(j);
+				if(t.getDate().equals(s)){
+					newList.add(t);
+				}
+			}
+			
+			if(newList.size()>0){
+				  Map<String, Object> newmap=culateByLine(newList);
+				  listmap.add(newmap);
+			}
+		}
+		return listmap;
+	}
+	
 }
  class ComparableAcual implements Comparator<ScheduleRealInfo>{
 package com.bsth.service.schedule.impl;
 import java.math.BigDecimal;
-import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -140,6 +139,26 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return list;
 	}
+	public Set<String> getNotOperation(){
+		Set<String> lineSet = new HashSet<String>();
+		try {
+			String sql = "select name from bsth_c_line where sfyy = 0";
+			List<String> lineList = new ArrayList<>();
+			lineList = jdbcTemplate.query(sql,
+					new RowMapper<String>(){
+				@Override
+				public String mapRow(ResultSet rs, int rowNum) throws SQLException {
+					return rs.getString("name");
+				}
+			});
+			lineSet.addAll(lineList);
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+		return lineSet;
+	}
+	
 	@Override
 	public List<Map<String, Object>> queryPeopleCar(Map<String, Object> map) {
 		Map<String, List<SchedulePlanInfo>> keyMap = new HashMap<String, List<SchedulePlanInfo>>();
@@ -288,6 +307,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 	@Override
 	public List<Map<String, Object>> workDaily(Map<String, Object> map) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Set<String> lineSet = getNotOperation();
 		DecimalFormat df = new DecimalFormat("###0.##");
 		String company = map.get("company").toString();
@@ -305,7 +325,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
 		for(ScheduleRealInfo schedule : list){
 			String key = schedule.getXlName();
-			if(key == null || key.trim().equals(""))
+			if(key == null || key.trim().equals("") || lineSet.contains(key))
 				continue;
 			if(!keyMap.containsKey(key)){
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
@@ -457,8 +477,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("line", key);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("dftz", dftz);
-			tempMap.put("dftzl", df.format(((float)dftz/jhbc)*100) + "%");
-			tempMap.put("ccl", df.format(((float)sjcc/jhcc)*100) + "%");
+			tempMap.put("dftzl", jhbc==0?"0%":(df.format(((float)dftz/jhbc)*100) + "%"));
+			tempMap.put("ccl", jhcc==0?"100%":(df.format(((float)sjcc/jhcc)*100) + "%"));
 			tempMap.put("upfk", upfk);
 			tempMap.put("updk", updk);
 			tempMap.put("dnfk", dnfk);
@@ -1197,6 +1217,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Set<String> lineSet = getNotOperation();
+		
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
 		String line = map.get("line").toString();
@@ -1210,10 +1232,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
 					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
 					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'"
-					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			if(line.length() != 0)
+					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
+			if(line.trim().length() != 0)
 				sql += " and xl_bm = '"+line+"'";
-			if(company.length() != 0)
+			else if(company.length() != 0)
 				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
 			list = jdbcTemplate.query(sql,
@@ -1275,6 +1297,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String companyName = "", subCompanyName = "";
 		for(ScheduleRealInfo s : list){
+			if(lineSet.contains(s.getXlName())){
+				continue;
+			}
 			String xlName = s.getXlName();
 			if(!keyMap.containsKey(xlName))
 				keyMap.put(xlName, new ArrayList<ScheduleRealInfo>());
@@ -1398,6 +1423,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		nf.setMinimumFractionDigits(2);
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+
+		Set<String> lineSet = getNotOperation();
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
@@ -1427,7 +1454,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
 					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
 					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"
-					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.length() != 0)
 				sql += " and xl_bm = '"+line+"'";
 			if(company.length() != 0)
@@ -1492,6 +1519,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String companyName = "", subCompanyName = "";
 		for(ScheduleRealInfo s : list){
+			if(lineSet.contains(s.getXlName())){
+				continue;
+			}
 			String xlName = s.getXlName();
 			String date = s.getScheduleDateStr();
 			if(!keyMap.containsKey(xlName))
-package com.bsth.service.traffic;
-
-/**
- * 运管处基础数据操作接口类
- * Created by zlz on 2017/6/16.
- */
-public interface YgcBasicDataService {
-    /**
-     * 更新运管处基础数据
-     */
-    void updateYgcBasicData();
-}
-
+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.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;
-    }
-}
+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;
+    }
+}
@@ -199,6 +199,40 @@
                  </div>
                  <!-- 表单分组组件 form-group END -->
+                  <!-- 表单分组组件 form-group START -->
+                 <div class="form-group">
+                 	<!-- 是否营运START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>是否营运线路&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+	                 	<div class="col-md-4">
+	              			<div class="md-radio-inline">
+	              				<div class="md-radio">
+	              					<input type="radio" id="radio18" name="sfyy" class="md-radiobtn" value="1" data-title="是" checked="checked" >
+									<label for="radio18">
+										<span></span>
+										<span class="check"></span>
+										<span class="box"></span> 是 
+									</label>
+	                			</div>
+	                			<div class="md-radio has-error">
+	                				<input type="radio" id="radio19" name="sfyy" class="md-radiobtn" value="0" data-title="否" >
+	                				<label for="radio19" style="color:#FFC0CB">
+		                               	<span></span>
+		                               	<span class="check"></span>
+		                               	<span class="box"></span> 否
+	                     			</label>
+	              				</div>
+	               			</div>
+						 </div>
+	                </div>
+	                <!-- 是否营运 END -->
+	                
+	               
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
 					<!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
@@ -191,7 +191,39 @@
 	                <!-- 是否撤销 START -->
                  </div>
                  <!-- 表单分组组件 form-group END -->
-                 
+                  <!-- 表单分组组件 form-group START -->
+                 <div class="form-group">
+                 	<!-- 是否营运START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>是否营运线路&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+	                 	<div class="col-md-4">
+	              			<div class="md-radio-inline">
+	              				<div class="md-radio">
+	              					<input type="radio" id="radio18" name="sfyy" class="md-radiobtn" value="1" data-title="是" checked="checked" >
+									<label for="radio18">
+										<span></span>
+										<span class="check"></span>
+										<span class="box"></span> 是
+									</label>
+	                			</div>
+	                			<div class="md-radio has-error">
+	                				<input type="radio" id="radio19" name="sfyy" class="md-radiobtn" value="0" data-title="否" >
+	                				<label for="radio19" style="color:#FFC0CB">
+		                               	<span></span>
+		                               	<span class="check"></span>
+		                               	<span class="box"></span> 否
+	                     			</label>
+	              				</div>
+	               			</div>
+						 </div>
+	                </div>
+	                <!-- 是否营运 END -->
+	                
+	               
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
 					<!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
@@ -199,7 +199,39 @@
 	                <!-- 是否撤销 START -->
                  </div>
                  <!-- 表单分组组件 form-group END -->
-                 
+                  <!-- 表单分组组件 form-group START -->
+                 <div class="form-group">
+                 	<!-- 是否营运START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>是否营运线路&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+	                 	<div class="col-md-4">
+	              			<div class="md-radio-inline">
+	              				<div class="md-radio">
+	              					<input type="radio" id="radio18" name="sfyy" class="md-radiobtn" value="1" data-title="是" checked="checked" >
+									<label for="radio18">
+										<span></span>
+										<span class="check"></span>
+										<span class="box"></span> 是
+									</label>
+	                			</div>
+	                			<div class="md-radio has-error">
+	                				<input type="radio" id="radio19" name="sfyy" class="md-radiobtn" value="0" data-title="否" >
+	                				<label for="radio19" style="color:#FFC0CB">
+		                               	<span></span>
+		                               	<span class="check"></span>
+		                               	<span class="box"></span> 否
+	                     			</label>
+	              				</div>
+	               			</div>
+						 </div>
+	                </div>
+	                <!-- 是否营运 END -->
+	                
+	               
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
 					<!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
+<!-- 批量撤销选项 -->
+<div class="modal fade" id="delete_select_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="formBootbox" role="form">
+					<div class="form-group">
+						<label class="col-md-3 control-label">撤销选项：</label>
+						<div class="col-md-9">
+							<div class="icheck-list">
+								<label>
+									<input type="radio" name="deleteOptions" value="0" checked> 批量撤销站点
+								</label>
+								<label >
+									<input type="radio" name="deleteOptions" value="1" > 批量撤销路段
+								</label>
+							</div>
+						</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="deleteSelectnextButton">下一步</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+	$('#delete_select_mobal').on('deleteSelectMobal.show',function(e,ajaxd,line,fun,delBatch) {
+		// 加载显示mobal
+		$('#delete_select_mobal').modal({
+			show : true,
+			backdrop : 'static',
+			keyboard : false
+			});
+		// 获取表单元素
+		var form = $('#formBootbox');
+		// 下一步点击事件
+		$('#deleteSelectnextButton').on('click', function() {
+			// 获取撤销类型
+			deleteOptions = $("input[name='deleteOptions']:checked").val();
+			// 表单提交
+			form.submit();
+		});
+		// 表单验证
+		form.validate({
+			// 表单序列化
+			submitHandler : function(f) {
+				// 批量删除站点 （deleteOptions：0）
+				if(deleteOptions == 0) {
+					// 隐藏选项mobal
+					$('#delete_select_mobal').modal('hide');
+					//　加载deletestation页面
+					$.get('deletestation.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#delete_station_mobal').trigger('deleteStationMobal.show', [ajaxd,line,fun,delBatch]);
+					});
+				// 批量删除路段（deleteOptions：1）
+				} else if(deleteOptions == 1) {
+					// 隐藏选项mobal
+					$('#delete_select_mobal').modal('hide');
+					//　加载deletesection页面
+					$.get('deletesection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#delete_section_mobal').trigger('deleteSectionMobal.show', [ajaxd,line,fun,delBatch]);
+					});
+				}
+				
+			}
+		});
+	});
+</script>
 \ No newline at end of file
+<!-- 编辑路段 -->
+<div class="modal fade" id="delete_section_mobal" role="basic"
+	aria-hidden="true">
+	<div style="margin:5% auto">
+		<div class="modal-content">
+			<div class="col-md-12">
+				<div class="portlet light porttlet-fit bordered">
+					<div class="portlet-title">
+						<div class="tipso-animation">
+						</div>
+						<div class="caption">
+							<i class="fa fa-info-circle font-dark"></i> <span
+								class="caption-subject font-dark sbold uppercase">路段信息</span>
+						</div>
+						<div class="actions">
+							<div class="modal-footer-left">
+								<button type="button" class="btn btn-primary" id="batchDeleteSectionButton">批量撤销路段</button>									
+								<button type="button" class="btn default" data-dismiss="modal">取消</button>
+							</div>
+						</div>
+					</div>
+					<div class="portlet-body">
+						<div class="table-container" style="margin-top: 10px">
+							<from class="form-horizontal" role="form"
+								id="batch_delete_section_form">
+							<table
+								class="table table-striped table-bordered table-hover table-checkable"
+								id="datatable_section_detele">
+								<thead>
+									<tr role="row" class="heading">
+										<th width="2%"><input type="checkbox" name="scetionCheckItems"
+											id="scetionCheckItems"></input></th>
+										<th width="2%">序号</th>
+										<th width="5%">路段路由编号</th>
+										<th width="5%">线路编号</th>
+										<th width="11%">线路名称</th>
+										<th width="7%">线路方向</th>
+										<th width="11%">路段名称</th>
+										<th width="5%">路段编码</th>
+										<th width="5%">路段序号</th>
+										<th width="5%">路段限速</th>
+										<th width="5%">路段长度</th>
+										<th width="5%">路段历时</th>
+										<th width="5%">版本号</th>
+										<!-- 	<th width="6%">是否撤销</th>
+								<th width="9%">操作</th> -->
+									</tr>
+								</thead>
+								<tbody></tbody>
+							</table>
+							</from>
+							<div class="actions">
+								<div style="text-align: right">
+										<ul id="pagination" class="pagination"></ul>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script type="text/html" id="sectionInfo_list_table_temp_detele">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				<input type="checkbox" class="group-checkable icheck" name="items" value="{{obj.id}}" id="{{obj.id}}" >
+			</td>
+			<td style="vertical-align: middle;">
+				 {{(list.page*10)+(i+1)}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.id}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.lineCode}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.line.name}}
+			</td>
+			<td style="vertical-align: middle;"> 
+				{{if obj.directions == '0'}}
+					上行
+				{{else if obj.directions == '1'}}
+					下行
+				{{/if}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.section.sectionName}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.sectionCode}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.sectionrouteCode}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.speedLimit}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.sectionDistance}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.sectionTime}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.versions}}
+			</td>			
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan=13><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/javascript">
+$('#delete_section_mobal').on('deleteSectionMobal.show',function(e, ajaxd, line, fun, delBatch) {
+	layer.closeAll();
+	// 显示mobal
+	$('#delete_section_mobal').modal({
+		show : true,
+		backdrop : 'static',
+		keyboard : false
+	});
+	// 编辑表单元素
+	var form = $('#batch_delete_section_form');
+	// 提交数据按钮事件
+	$('#batchDeleteSectionButton').on('click', function() {
+		var checked = $("[name=items]:checked");
+		var ids = "";
+		checked.each(function() {
+			ids = ids + "," + $(this).val();
+			//ids.push($(this).val()); 
+		});
+		if (ids != "" && ids != null && ids != undefined) {
+			console.log("ids:" + ids);
+			ids = ids.substr(1, ids.length - 1);
+			var params = {};
+			params.ids = ids;
+			$.get('/sectionroute/batchDestroy',params,function(resuntDate) {
+				if (resuntDate.status == 'SUCCESS') {
+					// 弹出添加成功提示消息
+					layer.msg('修改成功...');
+					/** 通知更新缓存区 */
+					//$.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs) {console.log(rs)})
+				} else {
+					// 弹出添加失败提示消息
+					layer.msg('修改失败...');
+				}
+				initSearch();
+				// 刷新左边树
+				fun.resjtreeDate(line.id,delBatch.dir);
+				/** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
+				ajaxd.getSectionRouteInfo(line.id,delBatch.dir,function(data) {
+				/** 在地图上画出线路走向  @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
+					fun.linePanlThree(line.id,data,delBatch.dir);
+				});
+			});
+		} else {
+			layer.msg('请选择要删除的路段！！！');
+		}
+	});
+
+	/** 全选框 */
+	document.getElementById('scetionCheckItems').onclick = function() {
+		// 获取所有的复选框  
+		var checkElements = document.getElementsByName('items');
+		if (this.checked) {
+			for ( var i = 0; i < checkElements.length; i++) {
+				var checkElement = checkElements[i];
+				checkElement.checked = "checked";
+			}
+		} else {
+			for ( var i = 0; i < checkElements.length; i++) {
+				var checkElement = checkElements[i];
+				checkElement.checked = null;
+			}
+		}
+	}
+
+	/** 页面加载完显示数据 */
+	window.onload = initSearch();
+
+	/**
+	 * @description : (TODO) 页面加载事件
+	 * 
+	 */
+	function initSearch() {
+		var params = new getParams();
+		page = 0;
+		loadTableDate(params, true);
+	}
+	function getParams() {
+		// 搜索参数集合
+		params = {};
+		params.lineCode_eq = line.id;
+		params.directions_eq = delBatch.dir;
+		params.destroy_eq = "0"; //默认查没有撤销的路段
+		return params;
+	}
+	/**
+	 * @description : (TODO) 表格数据分页加载事件
+	 * 
+	 * ------@param : 查询参数
+	 * 
+	 * ------@isPon : 是否重新分页
+	 * 
+	 */
+	function loadTableDate(param, isPon) {
+		// 搜索参数
+		var params = {};
+		if (param)
+			params = param;
+		// 排序（按方向与序号）
+		params['order'] = 'directions,sectionrouteCode';
+		// 排序方向.
+		params['direction'] = 'ASC,ASC';
+		// 记录当前页数
+		params['page'] = page;
+		// 弹出正在加载层
+		var i = layer.load(2);
+		// 异步请求获取表格数据
+		$.get('/sectionroute',params,function(result) {
+			// 添加序号
+			result.content.page = page;
+			// 把数据填充到模版中
+			var tbodyHtml = template('sectionInfo_list_table_temp_detele',{list : result.content});
+			// 把渲染好的模版html文本追加到表格中
+			$('#datatable_section_detele tbody').html(tbodyHtml);
+			// 是重新分页且返回数据长度大于0
+			if (isPon && result.content.length > 0) {
+			// 重新分页
+			initPag = true;
+			// 分页栏
+			showPagination(result);
+			}
+			// 关闭弹出加载层
+			layer.close(i);
+		});
+	}
+	/**
+	 * @description : (TODO) 分页栏组件
+	 * 
+	 */
+	function showPagination(data) {
+		// 分页组件
+		$('#pagination').jqPaginator({
+			// 总页数
+			totalPages : data.totalPages,
+			// 中间显示页数
+			visiblePages : 6,
+			// 当前页
+			urrentPage : 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 (initPag) {
+					initPag = false;
+					return;
+				}
+				var pData = getParams();
+				page = num - 1;
+				loadTableDate(pData, false);
+			}
+		});
+	}
+});
+</script>
 \ No newline at end of file
+<!-- 编辑路段 -->
+<div class="modal fade" id="delete_station_mobal" role="basic"
+	aria-hidden="true">
+	<div style="margin:5% auto">
+		<div class="modal-content">
+			<div class="col-md-12">
+				<div class="portlet light porttlet-fit bordered">
+					<div class="portlet-title">
+						<div class="tipso-animation">
+						</div>
+						<div class="caption">
+							 <i class="fa fa-info-circle font-dark"></i> 
+							 <span class="caption-subject font-dark sbold uppercase">站点信息</span>
+						</div>
+						<div class="actions">
+							<div class="btn-group btn-group-devided" data-toggle="buttons">
+								<button type="button" class="btn btn-primary" id="batchDeleteStationButton">批量撤销站点</button>									
+								<button type="button" class="btn default" data-dismiss="modal">取消</button>
+							</div>
+						</div>
+					</div>
+					<div class="portlet-body">
+						<div class="table-container" style="margin-top: 10px">
+							<from class="form-horizontal" role="form" id="batch_delete_station_form">
+							<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_station_detele">
+								<thead>
+									<tr role="row" class="heading">
+										<th width="2%"><input type="checkbox" name="checkItems"
+											id="stationCheckItems"></input></th>
+										<th width="2%">序号</th>
+										<th width="5%">站点路由编号</th>
+										<th width="5%">线路编号</th>										
+										<th width="8%">线路名称</th>
+										<th width="5%">线路方向</th>
+										<th width="8%">站点路由名称</th>
+										<th width="4%">站点编码</th>
+										<th width="4%">站点序号</th>
+										<th width="4%">站点类型</th>
+										<th width="6%">站点距离(km)</th>
+										<th width="6%">站点时长(min)</th>
+										<th width="4%">版本号</th>
+									</tr>
+								</thead>
+								<tbody></tbody>
+							</table>
+							</from>
+							<div class="actions">
+								<div style="text-align: right">
+										<ul id="pagination" class="pagination"></ul>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script type="text/html" id="stationInfo_list_table_temp_detele">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				<input type="checkbox" class="group-checkable icheck" name="items" value="{{obj.id}}" id="{{obj.id}}" >
+			</td>
+			<td style="vertical-align: middle;">
+				 {{(list.page*10)+(i+1)}}
+			</td>
+			<td style="vertical-align: middle;">
+				{{obj.id}}
+			</td>
+			<td>
+				{{obj.lineCode}}
+			</td>
+			<td>
+				{{obj.line.name}}
+			</td>
+			<td>
+				{{if obj.directions == '0'}}
+					上行
+				{{else if obj.directions == '1'}}
+					下行
+				{{/if}}
+			</td>
+			<td>
+				{{obj.stationName}}
+			</td>
+			<td>
+				{{obj.stationCode}}
+			</td>
+			<td>
+				{{obj.stationRouteCode}}
+			</td>
+			<td>	
+				{{if obj.stationMark == 'B'}}
+					起始站
+				{{else if obj.stationMark == 'Z'}}
+					中途站
+				{{else if obj.stationMark== 'E'}}
+					终点站
+				{{/if}}
+			</td>
+			<td>
+				{{obj.distances}}
+			</td>
+			<td>
+				{{obj.toTime}} 
+			</td>
+			<td>
+				{{obj.versions}}
+			</td>		
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan=13><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/javascript">
+$('#delete_station_mobal').on('deleteStationMobal.show',function(e, ajaxd, line, fun, delBatch) {
+	layer.closeAll();
+	// 显示mobal
+	$('#delete_station_mobal').modal({
+		show : true,
+		backdrop : 'static',
+		keyboard : false
+	});
+	// 编辑表单元素
+	var form = $('#batch_delete_station_form');
+	// 提交数据按钮事件
+	$('#batchDeleteStationButton').on('click', function() {
+		var checked = $("[name=items]:checked");
+		var ids = "";
+		checked.each(function() {
+			ids = ids + "," + $(this).val();
+			//ids.push($(this).val()); 
+		});
+		if (ids != "" && ids != null && ids != undefined) {
+			console.log("ids:" + ids);
+			ids = ids.substr(1, ids.length - 1);
+			var params = {};
+			params.ids = ids;
+			$.get('/stationroute/batchDestroy',params,function(resuntDate) {
+				if (resuntDate.status == 'SUCCESS') {
+					// 弹出添加成功提示消息
+					layer.msg('修改成功...');
+					/** 通知更新缓存区 */
+					//$.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs) {console.log(rs)})
+				} else {
+					// 弹出添加失败提示消息
+					layer.msg('修改失败...');
+				}
+				initSearch();
+				// 刷新左边树
+				fun.resjtreeDate(line.id,delBatch.dir);
+				/** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */
+				ajaxd.getSectionRouteInfo(line.id,delBatch.dir,function(data) {
+				/** 在地图上画出线路走向  @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */
+					fun.linePanlThree(line.id,data,delBatch.dir);
+				});
+			});
+		} else {
+			layer.msg('请选择要删除的站点！！！');
+		}
+	});
+
+	/** 全选框 */
+	document.getElementById('stationCheckItems').onclick = function() {
+		// 获取所有的复选框  
+		var checkElements = document.getElementsByName('items');
+		if (this.checked) {
+			for ( var i = 0; i < checkElements.length; i++) {
+				var checkElement = checkElements[i];
+				checkElement.checked = "checked";
+			}
+		} else {
+			for ( var i = 0; i < checkElements.length; i++) {
+				var checkElement = checkElements[i];
+				checkElement.checked = null;
+			}
+		}
+	}
+
+	/** 页面加载完显示数据 */
+	window.onload = initSearch();
+
+	/**
+	 * @description : (TODO) 页面加载事件
+	 * 
+	 */
+	function initSearch() {
+		var params = new getParams();
+		page = 0;
+		loadTableDate(params, true);
+	}
+	function getParams() {
+		// 搜索参数集合
+		params = {};
+		params.lineCode_eq = line.id;
+		params.directions_eq = delBatch.dir;
+		params.destroy_eq = "0"; //默认查没有撤销的站点
+		return params;
+	}
+	/**
+	 * @description : (TODO) 表格数据分页加载事件
+	 * 
+	 * ------@param : 查询参数
+	 * 
+	 * ------@isPon : 是否重新分页
+	 * 
+	 */
+	function loadTableDate(param, isPon) {
+		// 搜索参数
+		var params = {};
+		if (param)
+			params = param;
+		// 排序（按方向与序号）
+		params['order'] = 'directions,stationRouteCode';
+		// 排序方向.
+		params['direction'] = 'ASC,ASC';
+		// 记录当前页数
+		params['page'] = page;
+		// 弹出正在加载层
+		var i = layer.load(2);
+		// 异步请求获取表格数据
+		$.get('/stationroute',params,function(result) {
+			// 添加序号
+			result.content.page = page;
+			// 把数据填充到模版中
+			var tbodyHtml = template('stationInfo_list_table_temp_detele',{list : result.content});
+			// 把渲染好的模版html文本追加到表格中
+			$('#datatable_station_detele tbody').html(tbodyHtml);
+			// 是重新分页且返回数据长度大于0
+			if (isPon && result.content.length > 0) {
+			// 重新分页
+			initPag = true;
+			// 分页栏
+			showPagination(result);
+			}
+			// 关闭弹出加载层
+			layer.close(i);
+		});
+	}
+	/**
+	 * @description : (TODO) 分页栏组件
+	 * 
+	 */
+	function showPagination(data) {
+		// 分页组件
+		$('#pagination').jqPaginator({
+			// 总页数
+			totalPages : data.totalPages,
+			// 中间显示页数
+			visiblePages : 6,
+			// 当前页
+			urrentPage : 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 (initPag) {
+					initPag = false;
+					return;
+				}
+				var pData = getParams();
+				page = num - 1;
+				loadTableDate(pData, false);
+			}
+		});
+	}
+});
+</script>
 \ No newline at end of file
+var DeleteBatchObj = function(){	
+	
+	/** 定义修改线路对象 */
+	
+	var deleteBatchObj = {
+			/** 获取批量撤销对象 @return：<Batch：批量撤销对象> */
+			getDeleteBatch : function() {
+				return deleteBatchObj;
+			},
+			
+			/** 设置批量撤销的线路方向 @param：<dir：方向（0：上行；1：下行）> */
+			setDeteleBatchDiraction : function(dir) {
+				
+				deleteBatchObj.dir = dir;
+			},
+	}	
+	
+	return deleteBatchObj;
+}();
@@ -7,7 +7,6 @@ var EditSectionObj = function () {
 			/** 获取修改路段集合对象 @return：<Section：修改路段对象> */
 			getEitdSection : function() {
-				
 				return Section;
 			},
@@ -56,6 +56,18 @@ $(function(){
 		PublicFunctions.stationRevoke(directionUpValue);
 	});
+	// 上行批量撤销事件
+	$('.module_tools #batchUpDelete').on('click', function() {
+		var Line = LineObj.getLineObj();
+		/** 设置批量删除的线路方向 @param：<directionUpValue：方向（0：上行；1：下行）> */
+		DeleteBatchObj.setDeteleBatchDiraction(directionUpValue);
+		// 加载选择新增方式mobal
+		$.get('delete_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#delete_select_mobal').trigger('deleteSelectMobal.show',[GetAjaxData,Line,PublicFunctions,DeleteBatchObj]);
+		});
+	});
+	
 	// 切换上下行.
 	$('.retweet').on('click',function() {
 		layer.confirm('您是否确定将【上、下】行站点和路段进行对换!', {
@@ -210,6 +222,18 @@ $(function(){
 	$('.module_tools #deleteDownStation').on('click', function() {
 		PublicFunctions.stationRevoke(directionDownValue);
 	});
+
+	// 下行批量撤销事件
+	$('.module_tools #batchDownDelete').on('click', function() {
+		var Line = LineObj.getLineObj();
+		/** 设置批量删除的线路方向 @param：<directionDownValue：方向（0：上行；1：下行）> */
+		DeleteBatchObj.setDeteleBatchDiraction(directionDownValue);
+		// 加载选择新增方式mobal
+		$.get('delete_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#delete_select_mobal').trigger('deleteSelectMobal.show',[GetAjaxData,Line,PublicFunctions,DeleteBatchObj]);
+		});
+	});
 	// 编辑线路下行走向
 	$('.module_tools #editDownlineTrend').on('click', function() {
@@ -242,5 +266,5 @@ $(function(){
 		$('.defeat-scroll').css('overflow','auto');
 	}).on('mouseleave',function() {
 		$('.defeat-scroll').css('overflow','hidden');
-	});
+	});	
 });
 \ No newline at end of file
@@ -59,6 +59,10 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
+			                                                    <a href="javascript:;" id="batchUpDelete"><i class="fa fa-trash-o"></i>  批量撤销</a>
+			                                                </li>
+			                                                <li class="divider"> </li>
+			                                                <li>
 			                                                    <a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i>  切换上下行</a>
 			                                                </li>
 			                                                <li class="divider"> </li>
@@ -69,6 +73,7 @@
 			                                                <li>
 			                                                    <a href="javascript:;" id="quoteDown"><i class="fa fa-long-arrow-down"></i>  引用下行路段</a>
 			                                                </li>
+			                                                 <li class="divider"> </li>
 			                                                <!-- <li>
 			                                                    <a href="javascript:;" id="editUplineTrend"><i class="fa fa-edit"></i>  编辑走向</a>
 			                                                </li> -->
@@ -154,6 +159,10 @@
 			                                                </li>
 			                                                <li class="divider"> </li>
 			                                                <li>
+			                                                    <a href="javascript:;" id="batchDownDelete"><i class="fa fa-trash-o"></i>  批量撤销</a>
+			                                                </li>
+			                                                <li class="divider"> </li>
+			                                                <li>
 			                                                    <a href="javascript:;" class="retweet"><i class="fa fa-retweet"></i>  切换上下行</a>
 			                                                </li>
 			                                                <li class="divider"> </li>
@@ -227,6 +236,8 @@
 <script src="/pages/base/stationroute/js/editstationobj.js"></script>
 <!-- 修改路段对象类 -->
 <script src="/pages/base/stationroute/js/editsection.js"></script>
+<!-- 批量撤销对象类 -->
+<script src="/pages/base/stationroute/js/deletebatch.js"></script>
 <!-- 绘图类 -->
 <script src="/pages/base/stationroute/js/drawingManager.js"></script>
 <!-- 地图类 -->
@@ -156,7 +156,7 @@
               </div>
               <div class="form-actions">
                  <div class="row">
-                     <div class="col-md-offset-3 col-md-9">
+                     <div class="col-md-offset-5 col-md-9">
                          <a href="javascript:;" class="btn default button-previous disabled" style="display: none;">
                              <i class="fa fa-angle-left"></i> 返回 </a>
                          <a href="javascript:;" class="btn btn-outline green button-next"> 下一步
@@ -324,6 +324,448 @@ var BaseFun = function() {
 						'bxrcgs':null};
 			},
+			/**
+			 * @description (TODO) 剔除不在上、下行时间范围内的班次.
+			 * 
+			 * 
+			 */
+			tcbzfwndbc02 : function(jsonArray,dataMap) {
+				var _obj = baseF.getsxAndxxbc(jsonArray,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);
+				return _obj.sxbc.concat(_obj.xxbc);
+			},
+			
+			/**
+			 * @description : (TODO) 调整某班型下的各个路牌对应的班次以及工时、停站时间、是否分班.
+			 * @param bxlpbc  班型下的各个路牌的所有班次数组.
+			 * @param map 表单参数信息 
+			 * @param dataMap  封装的 以上、下行方向成对存在的 一些参数数组 [下标0 -- 代表上行 ; 下标1 -- 代表下行].
+			 * @param saa 封装的一些 停站时间、周转时间、行驶时间、行驶里程等.
+			 * @param cara 路牌数组
+			 * @param bxrcObj 班次类型对象
+			 * @param dgminpcs 低谷最多配车数.
+			 * ***********************************  业务要求 ****************************************************
+			 * 		满足单个路牌对应的标准工时、满足某班型下的所有路牌的平均工时对应的日平均工时、停站时间、路牌是否分班的班次集合.
+			 * 								
+			 * ***********************************  业务分析与思路  **********************************************
+			 * 
+			 * 		首先判断出该路牌所属的班型，这里暂时考虑分两种情况.
+			 * 
+			 * 			  	 第一种情况 ：【五工二休】班型
+			 * 						
+			 * 						 	特点：一天标准工时为 ： 8个小时 ； 
+			 * 								 一般该班型下的路牌班次出现密集的地方 是在高峰时段以及高峰时段附近。(这种路牌在模型里,我们称为短(断)路牌)；
+			 * 								 这种班型现象一般是晚出早归.
+			 * 							
+			 * 							要求：单个路牌下的工时满足： 工时浮动范围在 标准工时【1-1.5】小时.
+			 * 								 相同班型路牌下的平均工时满足： 工时浮动范围在 以表单录入的日平均工时10分钟内.
+			 * 
+			 * 							剔除规则：从最后一个班次开始剔除，遇到高峰时段则跳过。一直剔除到满足到班型的判断标准工时8小时。
+			 * 		
+			 * 				 第二种情况 ： 其它班型(包括 一工一休 、 二工一休 、 三工一休 、 四工一休 、 五工一休 、 六工一休)
+			 * 			
+			 * 							 特点：一天标准工时：以各自对应的班型工时为准。这里会有单/双档 等的概念。现在我们暂时也只考虑单/双档这种情况. 
+			 * 											 单：一个路牌一个人开  /   双：一个路牌两个开	...... 
+			 * 											 那么一个路牌下的总工时为 各自对应的班型标准工时*档数.
+			 * 											 这种情况下的路牌
+			 * 												第一条件首先满足高峰时段。然后看情况(满足工时或者是防止工时超出)是否会产生分班。
+			 * 											 		如果不产生分班：则一定为连续的，也就是说从头开到尾.
+			 * 													如果产生分班： 
+			 * 																第一种情况 ： 中间会断掉.一般这个断掉的时间不会太长，但至少是3小时以上。
+			 * 																第二种情况 ： 连续的。这种情况一定是双档。不然工时会超出.
+			 * 
+			 *		 					 要求：单个路牌下的工时满足 ：工时浮动范围在 标准工时【1-1.5】小时.
+			 * 								  相同班型路牌下的平均工时满足 ： 工时浮动范围在 以表单录入的日平均工时10分钟内.
+			 * 
+			 * 							 剔除规则：这里情况比较复杂，因为先要考虑该路牌是否分班。
+			 * 									 
+			 * 									 判断是否会产生分班分两种条件
+			 * 		
+			 * 										第一种情况：是双档一定有分班班次.并且是连续的班次.
+			 * 						
+			 * 										第二种情况：是单档 ， 但是单个路牌工时超出了要求范围 ， 为了在满足工时的条件下。采取分班。 
+			 * 												  判断依据：反算出低谷最少配车数. 
+			 * 														  计算公式：(低谷上行行驶时间 + 低谷下行行驶时间 +  低谷最大停站时间*2) / 低谷最大发车间隙
+			 * 														  这里的取整数要求:四舍五入去整。
+			 * 
+			 * 
+			 *      共同满足的条件 ： 所有路牌下的相邻班次(前提条件是 不是分班班次)的停站时间不得超过 行业标准 行驶时间的10%~15%。如果有特殊情况，以表单录入的低谷最大停站时间为极限。
+			 * 								 
+			 * 
+			 **/ 
+			tzlpgs02 : function(bxlpbc , map , dataMap , saa  , cara , bxrcObj , dgminpcs) {
+				var rsultA = new Array();
+				for(var a = 0 ; a < bxlpbc.length ; a++) {
+					// 定义该版型下对应的路牌的班次数组、班次数组长度。
+					var lpbc = bxlpbc[a].lpbc, lpbclen_;
+					// 定义当前路牌的初始工时、班型对应的标准工时
+					var initCountGs = bxlpbc[a].initCountGs ,bzgs = bxlpbc[a].bzgs;
+					// 定义初始工时与日平均工时差值
+					var initdx = initCountGs - bxlpbc[a].gsavg;
+					// 定义剔除班次数、剔除的时间段.
+					var deletebcNum = Math.ceil((initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj) , tcbcgzA = new Array();
+					// var deletebcNum = parseInt((initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj) , tcbcgzA = new Array();
+					if(bxrcObj.type == '五工二休') {
+						if(lpbclen_>0) {
+							// 定义晚高峰后能剔除多少班次数.
+							var wgfhtcbcNum = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfsjd[0].ed ) / (60000 *　saa[0].zzsj.dgzzsj));
+							// 定义时间段内剔除班次规则.
+							tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed ,  'deletebcNum' : wgfhtcbcNum},
+									 	 {'minsj': dataMap.zgfsjd[0].ed  , 'maxsj' : dataMap.wgfsjd[0].st , 'deletebcNum' : deletebcNum - wgfhtcbcNum});
+							// 逆序排序剔除.
+							lpbc.sort(function(r,s){return s.fcno-r.fcno});
+							// 剔除不在高峰时间段内的班次.
+							baseF.spliceBc02(lpbc , tcbcgzA , dataMap , 'desc' , true);
+						}
+					}else {
+						/*console.log(bxlpbc[a].lpNo , initCountGs , bzgs , saa[0].zzsj.dgzzsj ,
+								initCountGs - bzgs , (initCountGs - bzgs) /saa[0].zzsj.dgzzsj ,
+								initCountGs - bxlpbc[a].gsavg , (initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj );*/
+						// 单档 一个路牌一档劳动力
+						if(bxlpbc[a].keepOff==1) {
+							// 如果低谷至少配车数大于零,则该班型下的路牌 存在一些 分班路牌,这里的分班 指的是 这个路牌先满足的前提条件就是 是单档。
+							// 为了满足工时的要求，在低谷断开一段时间.
+							if(dgminpcs>0 && dgminpcs <= bxrcObj.fpcls ) {
+								if( (a + 1) <= dgminpcs) {
+									var dgzjsj = baseF.getDateTime('12:30');
+									/*var zgfyh = dataMap.zgfsjd[0].ed;
+									zgfyh.setMinutes(zgfyh.getMinutes()+ Math.min.apply(null, dataMap.dgxxsjArr));*/
+									if( a % 2 == 0) {
+										// 定义早高峰结束 ~ 12:30 剔除规则.如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
+										var swmaxtcbcNum = parseInt(( dgzjsj - dataMap.zgfsjd[0].ed) / (60000 *　saa[0].zzsj.dgzzsj));
+										if(deletebcNum < swmaxtcbcNum) {
+											// tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
+											tcbcgzA.push({'minsj':  dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
+										}else { 
+											tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed, 'maxsj' : dgzjsj , 'order' : 'asc'   , 'deletebcNum' : swmaxtcbcNum},
+														 {'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed, 'order' : 'desc' , 'deletebcNum' : deletebcNum - swmaxtcbcNum});
+										}
+										// tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
+									}else {
+										// 定义12:30 ~ 晚高峰开始以前剔除规则. 如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
+										var xwmaxtcbcNum = parseInt(( dataMap.wgfsjd[0].st - dgzjsj) / (60000 *　saa[0].zzsj.dgzzsj));
+										if(deletebcNum < xwmaxtcbcNum) {
+											tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc',  'deletebcNum' : deletebcNum});
+										}else {
+											tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum - xwmaxtcbcNum},
+														 {'minsj': dgzjsj  , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum});
+										}
+										// tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc',  'deletebcNum' : deletebcNum});
+									}
+									// 按规则剔除班次.并且分班.路牌班次断开.
+									baseF.spliceBc02(lpbc , tcbcgzA , dataMap , true);
+								}else {
+									// 按规则剔除班次.不分班.路牌班次不会断开.
+									baseF.isdk02(lpbc , dataMap , deletebcNum , false);
+								}
+							// 该班型下的路牌 不存在分班路牌.
+							}else if(dgminpcs == 0){
+								// 按规则剔除班次.不分班.路牌班次不会断开.
+								baseF.isdk02(lpbc , dataMap , deletebcNum , false);
+							}
+						// 双档 一个路牌两档劳动力
+						}else if(bxlpbc[a].keepOff==2) {
+							// 按规则剔除班次.分班.但是路牌班次不会断开.
+							baseF.isdk02(lpbc , dataMap , deletebcNum , true);
+						}
+					}
+					rsultA = rsultA.concat(lpbc);
+				}
+				return rsultA;
+			},
+			
+			/**
+			 * @description (TODO) 定义不断开班次的路牌剔除规则.
+			 * 
+			 * 
+			 */
+			isdk02 : function(lpbc , dataMap , deletebcNum , isfb) {
+				if(deletebcNum > 0) {
+					var zgfzqtcbcNum = parseInt((  dataMap.zgfzqsjd[0].ed - dataMap.zgfzqsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj)),
+						wgfhtcbcNum  = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfzhsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj))
+						tcbcgzA = new Array();
+					if( wgfhtcbcNum  >= deletebcNum) {
+						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum});
+					}else if(zgfzqtcbcNum >= deletebcNum){
+						tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum});
+					}else if(deletebcNum >= (zgfzqtcbcNum + wgfhtcbcNum)){
+						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : wgfhtcbcNum},
+									 {'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed ,  'order' : 'asc', 'deletebcNum' : zgfzqtcbcNum});
+					}
+					// lpbc.sort(function(m,n){return n.fcno-m.fcno});
+					baseF.spliceBc02(lpbc ,  tcbcgzA , dataMap , isfb);
+				}
+			},
+			
+			/**
+			 * @description (TODO) 根据定义规则剔除班次.
+			 * @param  arr 班次数组.
+			 * @param  tcbcgzA 剔除规则.
+			 * @param  type 剔除类型【asc -- 顺序剔除 ； desc -- 逆序剔除】
+			 * @param  dataMap 封装的 以上、下行方向成对存在的 一些参数数组 [下标0 -- 代表上行 ; 下标1 -- 代表下行].
+			 * @param  isfb 剔除过程中是否会产生分班.
+			 */
+			spliceBc02 : function (arr , tcbcgzA , dataMap  , isfb) {
+				for(var t = 0 ; t < tcbcgzA.length ; t++) {
+					var order = tcbcgzA[t].order;
+					if(order == 'asc')
+						arr.sort(function(x,y){return x.fcno-y.fcno});
+					else if(order == 'desc')
+						arr.sort(function(m,n){return n.fcno-m.fcno});
+					for(var a = 0 ; a < arr.length ; a ++) {
+						var fcsj = baseF.getDateTime(arr[a].fcsj);
+						// 判断是否在高峰时间范围.【true--表示在，false--表示不在】.
+						if(!baseF.isgfsjd01(fcsj,dataMap) && fcsj > tcbcgzA[t].minsj && fcsj < tcbcgzA[t].maxsj) {
+							if(order == 'asc') {
+								arr[a-1].isfb =  isfb ? 1 : 0;
+								arr[a-1].STOPTIME = 0;
+							}else if(order == 'desc') {
+								var index_ = a + tcbcgzA[t].deletebcNum * 2;
+								arr[index_].STOPTIME = 0;
+								arr[index_].isfb = isfb && a > 0 ? 1 : 0;
+							}
+							arr.splice( a , tcbcgzA[t].deletebcNum * 2);
+							break;
+						} 
+					}
+				}
+			},
+			
+			/**
+			 * @description (TODO) 排列各个路牌下的班次.
+			 * @param bxrclist 班型数组对象.
+			 * @prarm jsonArray 所有路牌下的班次.
+			 * @param cara 路牌数组.
+			 * @prarm saa 封装的一些 停站时间、周转时间、行驶时间、行驶里程等.
+			 * @param dataMap 封装的 以上、下行方向成对存在的 一些参数数组 [下标0 -- 代表上行 ; 下标1 -- 代表下行].
+			 * @map map 表单参数.
+			 * @return 返回一个满足单个路牌对应的标准工时、满足某班型下的所有路牌的平均工时对应的日平均工时、停站时间、路牌是否分班的班次集合.
+ 			 */
+			jslpgsAndbcs : function(bxrclist , jsonArray , cara , saa , dataMap , map) {
+				// 定义低谷最大发车时间、最大停站时间来反算出低谷最少配车数.
+				var dgmaxfcjx = parseInt(map.dgmaxfcjx),
+					dgmaxtzsj = parseInt(map.dgmaxtzsj);
+				// 计算低谷最少配车数 (低谷上行行驶时间 + 低谷下行行驶时间 +  低谷最大停站时间*2) / 低谷最大发车间隙.
+				var dgminpcs = Math.round((dataMap.dgxxsjArr[0] + dataMap.dgxxsjArr[1] + dgmaxtzsj*2) / dgmaxfcjx);
+				// 定义返回数组.
+				var rs = new Array();
+				for(var x = 0 ; x < bxrclist.length; x++) {
+					// 定义当前班型下对应的路牌、 班型下的各个路牌的所有班次数组.
+					var cla = bxrclist[x].sslp , bxlpbc = new Array() ;
+					// 根据劳动力和配车数 算出是否 单/双 档.
+					var keepOff = bxrclist[x].rs/bxrclist[x].fpcls;
+					// 定义当前班型/人次/配车数 下的标准工时.
+					var hoursV = bxrclist[x].hoursV * keepOff;
+					for(var s = 0 ; s < cla.length; s++) {
+						// 定义路牌编号、定义当前路牌下的所有班次.
+						var lpNo = cla[s].lpNo , lpbc = new Array();
+						for(var i =0 ; i <jsonArray.length; i++) {
+							// 判断当期遍历的班次是否属于当前的路牌.
+							if(jsonArray[i].lpNo == lpNo) {
+								jsonArray[i].lpName =  bxrclist[x].type + '_' + lpNo ;
+								lpbc.push(jsonArray[i]);
+							}
+						}
+						// 更新路牌数组的路牌名称.
+						baseF.updlpArr(cara , lpNo , (bxrclist[x].type + '_' + lpNo));
+						if(lpbc.length > 0 ) {
+							// 按发车序号逆序排序路牌下的班次.
+							lpbc.sort(function(a,b){return b.fcno-a.fcno});
+							lpbc[0].STOPTIME = 0;
+							// 因为这里路牌下的班次特点是连续性的 
+							// 所以求这个路牌下当前的总工时(分钟)直接用最后一个班次的到达时间 - 第一个班次的发车时间，再加上进出场时间、早晚例保时间.
+							var initCountGs = parseInt((baseF.getDateTime(lpbc[0].ARRIVALTIME) - baseF.getDateTime(lpbc[lpbc.length-1].fcsj)) / 60000) +
+						  	  				  dataMap.jcsjArr[baseF.dirDmToIndex(lpbc[0].xlDir)] + 
+						  	  				  dataMap.ccsjArr[baseF.dirDmToIndex(lpbc[lpbc.length-1].xlDir)] +
+						  	  				  saa[0].lbsj*2;
+							
+							// 如果分班路牌数超过了该班型下的路牌总数.则提示无法排列。
+							if(keepOff == 1) {
+								if(bxrclist[x].gsavg > (hoursV + 1.5 * bxrclist[x].fpcls)) {
+									ErrorInfo.show('提示',
+											 " 班型【" + bxrclist[x].type + "】 下的 " +
+											 "日平均工时 " + bxrclist[x].gsavg + " 过大!最大值不能超过：" + 
+											 hoursV + " + " + "1.5" + "*" + bxrclist[x].fpcls + " 的和。");
+									return false;
+								}
+								if(dgminpcs > bxrclist[x].fpcls && bxrclist[x].type != '五工二休') {
+									ErrorInfo.show('提示',"请合理的搭配【低谷的最大停站时间、最大发车间隙】 与  【劳动力】 、  【配车数】之间的数值!" +
+											 " 在班型【" + bxrclist[x].type + " 】下会产生分班，" + "而低谷最少配车数为：" + dgminpcs + 
+											 " 辆，但是在该班型下只配了：" + bxrclist[x].fpcls + "辆" );
+									return false;
+								}
+							} else if(keepOff == 2) {
+								if(bxrclist[x].gsavg > (hoursV + 1.5*2*bxrclist[x].fpcls)) {
+									ErrorInfo.show('提示',
+											 " 班型【" + bxrclist[x].type + "】 下的 " +
+											 "日平均工时 " + bxrclist[x].gsavg + " 过大!最大值不能超过：" + 
+											 hoursV + " + " + "1.5" + "*2" + bxrclist[x].fpcls + " 的和。");
+									return false;
+								}
+							}
+							// 'initCountGs' : parseFloat((initCountGs/60).toFixed(2)),
+							bxlpbc.push({'bxtyp' : bxrclist[x].type , 'lpNo' : lpNo , 
+								 'lpbc' : lpbc , 'dygbcfcsj' : lpbc[lpbc.length-1].fcsj,
+								 'initCountGs' : initCountGs ,
+								 'keepOff' : keepOff , 'bzgs' : parseInt(hoursV*60) , 'gsavg' :  parseInt(bxrclist[x].gsavg*60) ,
+								 'fcint' :  baseF.getDateTime(lpbc[lpbc.length-1].fcsj).getTime()});
+						}
+					}
+					if(bxlpbc.length > 0 ) {
+						bxlpbc.sort(function(x,y){return x.fcint-y.fcint});
+						// console.log(bxlpbc);
+						// 调整某班型下的各个路牌对应的班次以及工时、停站时间、是否分班.
+						rs = rs.concat(baseF.tzlpgs02(bxlpbc , map , dataMap , saa  , cara , bxrclist[x] , dgminpcs));
+					}
+				}
+				return rs;
+			},
+			
+			/**
+			 * @description (TODO) 更新路牌数组的路牌名称.
+			 * @param cara 路牌数组
+			 * @param name 路牌新名称
+			 */
+			updlpArr : function(cara , lpNo , name) {
+				for(var l = 0 ; l <cara.length;l++  ) {
+					if(cara[l].lpNo == lpNo) {
+						cara[l].lpName =  name;
+					}
+				}
+			},
+			
+			BXPplaceClassesTime02 : function(saa , cara , map , seMap , dataMap , lpNoA) {
+				// 得到所有路牌下的班次数[从各路牌下的第一个班次发车时间 到 营运结束时间点并且是连续的班次数].
+				var jsonArray = baseF.plgfbc01(saa , cara , map , seMap , dataMap);
+				// return {'json':jsonArray,'bxrcgs':null};
+				
+				// 切割班型/人次/配车数 字符串 为 数组对象.
+				var list = baseF.splitBxRc02(map.bxrc);
+				// 把班型分配到对应的具体路牌上.
+				baseF.fprclp01(list,cara);
+				// console.log(list);
+				
+				var tempA = baseF.jslpgsAndbcs(list.data , baseF.tcbzfwndbc02(jsonArray , dataMap) , cara , saa , dataMap , map);
+				// return {'json':tempA,'bxrcgs':null};
+				return {'json':baseF.addjcclcbc01(cara,tempA,dataMap,saa,map),'bxrcgs':null};
+				var ttsmbA =  baseF.tzsmbcsj01(tempA,dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
+				
+				baseF.jhfcjx02(ttsmbA,dataMap);
+				//return {'json':baseF.addjcclcbc01(cara,ttsmbA,dataMap,saa,map),'bxrcgs':null};
+				//return {'json':ttsmbA,'bxrcgs':null};
+				var rsjar = baseF.tzsztest02(cara,ttsmbA,dataMap);
+				return {'json':rsjar,'bxrcgs':null};
+				return {'json':baseF.addjcclcbc01(cara,rsjar,dataMap,saa,map),'bxrcgs':null};
+			},
+			
+			tzsztest02 : function(cara,tempa,dataMap) {
+				var jsrs = new Array();
+				for(var t = 0 ; t < cara.length; t++) {
+					if(t>3)
+						continue;
+					var sslpbcA = new Array();
+					for(var j =0 ; j <tempa.length; j++) {
+						// 判断当期遍历的班次是否属于当前的路牌.
+						if(tempa[j].lpNo == cara[t].lpNo)
+							sslpbcA.push(tempa[j]);
+					}
+					sslpbcA.sort(function(a,b){return a.fcno-b.fcno});
+					baseF.tztzsjInit02(sslpbcA,dataMap);
+					jsrs = jsrs.concat(sslpbcA);
+				}
+				return jsrs;
+			},
+			
+			tztzsjInit02 : 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];
+					}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);
+					}
+				}
+			},
+			
+			
+			/** 
+			 * @description : (TODO) 均匀发车间隙
+			 * 
+			 * @params : [arr--某个方向下的班次数组;dir--方向;zzsj--周转时间]
+			 * 
+			 * @return : 返回一个数组.这里返回的是调整过后 发车间距均匀的班次数组
+			 **/
+			jhfcjx02 : function(bcArr,dataMap) {
+				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);
+					for(var b = 0;b<bcArr.length ; b++) {
+						bcArr[b].fcint = baseF.getDateTime(bcArr[b].fcsj).getTime();
+						if(bcArr[b].xlDir == fxdm)
+							fxbc.push(bcArr[b]);
+					}
+					var kssj = baseF.getDateTime(dataMap.smbcsjArr[cctag].kssj),// 开始时间.
+						jssj = baseF.getDateTime(dataMap.smbcsjArr[cctag].jssj);// 结束时间.
+					fxbc.sort(function(m,n){return m.fcint - n.fcint});
+					while(kssj<=jssj) {
+						var tagboolean = baseF.isgfsjd01(kssj,dataMap);
+						var zzsj =  tagboolean ?  dataMap.zzsj.gfzzsj : dataMap.zzsj.dgzzsj;
+						if(true){
+							var temp = new Date();
+							temp.setHours(kssj.getHours());
+							temp.setMinutes(kssj.getMinutes()+zzsj);
+							var sjdbcArr = baseF.getObjRegion(kssj,temp,fxbc,dataMap);
+							var len_ = sjdbcArr.length;
+							var bcCount = baseF.getlpNum(sjdbcArr);// 定长度
+							if(len_>0 && bcCount > 0) {
+								var _fcjx = parseInt(Math.ceil(zzsj/bcCount));
+								console.log(_fcjx);
+								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,
+											  dataMap.gfxxsjArr,baseF.dirDmToIndex(sjdbcArr[l].xlDir));// 获取行驶时间
+									sjdbcArr[l].bcsj = _xxsj;
+									var ddsj = new Date();
+									ddsj.setHours(fcnosj.getHours());
+									ddsj.setMinutes(fcnosj.getMinutes()+_xxsj);
+									sjdbcArr[l].ARRIVALTIME = baseF.getTimeStr(ddsj);
+									fcnosj.setMinutes(fcnosj.getMinutes() + _fcjx);
+								}
+							} 	
+						}
+						kssj = new Date(kssj.setMinutes(kssj.getMinutes() + zzsj));
+					}
+				}
+			},
+			
 			BXPplaceClassesTime01 : function(saa,cara,map,seMap,dataMap,lpNoA) {
 				var jsonArray = baseF.plgfbc(saa,cara,map,seMap,dataMap);
 				var list = baseF.splitBxRc(map.bxrc);
@@ -830,6 +1272,7 @@ var BaseFun = function() {
 							var bcCount = baseF.getlpNum(sjdbcArr);// 定长度
 							if(len_>0 && bcCount > 0) {
 								var _fcjx = parseInt(Math.ceil(zzsj/bcCount));
+								console.log(_fcjx);
 								var fcnosj = new Date(kssj);
 								for(var l = 0 ; l< len_ ; l++) {
 									// 每个路牌的末班车发车时间不准动.
@@ -1044,11 +1487,11 @@ var BaseFun = function() {
 				for(var r = 0 ; r<array.length;r++) {
 					tempA.push(array[r].STOPTIME + bs);
 				}
-				var v1 = Math.max.apply(null, maxXxsjA) *1.5;
+				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);
+					dx = parseInt(v2 - v1);
 				}
 				return {tag:tag,dx:dx};	
 			},
@@ -1565,6 +2008,115 @@ var BaseFun = function() {
 				return inv;
 			},
+			
+			/**
+			 * @discription : (TODO)获取所有路牌默认出场方向.
+			 * 
+			 * 				判定规则：
+			 * 						下行头班车时间  + 下行行驶时间 + 下行停站时间  大于了  上行头班车时间   判定都为上行出场 否则为下行出场.
+			 * 
+			 * 				举例：
+			 * 						浦东38路   上行头班车时间是7：00    下行头班车是6：30  ，下行行驶时间是25分钟 ， 下行停站时间为5分钟. 
+			 * 						所以浦东38的所有路牌的第一个班次都是下行出场.
+			 * 
+			 * @params : 起终点站的首末班车时间
+			 * 
+			 * @return : 返回方向结果. [0--上；1--下；2--未知].
+			 *  
+			 **/
+			getdefaultDir01 : function(list , xxsj , tzsj) {
+				var sxtbcsj =  baseF.getDateTime(list[0].kssj);
+				var xxtbcsj =  baseF.getDateTime(list[1].kssj);
+				xxtbcsj.setMinutes(xxtbcsj.getMinutes() + xxsj + tzsj);
+				if(xxtbcsj>sxtbcsj) {
+					return 0;
+				}else {
+					return 1;
+				}
+			},
+			/**
+			 * @description (TODO) 得到所有路牌下的班次数[从各路牌下的第一个班次发车时间 到 营运结束时间点并且是连续的班次数].
+			 * @param saa 封装的一些 停站时间、周转时间、行驶时间、行驶里程等.
+			 * @param cara 路牌数组
+			 * @param map 表单参数
+			 * @param seMap 线路营运开始 ~ 结束时间 
+			 * @param dataMap 封装的 以上、下行方向成对存在的 一些参数数组 [下标0 -- 代表上行 ; 下标1 -- 代表下行].
+			 * @return 返回一个所有路牌下的班次数[从各路牌下的第一个班次发车时间 ~ 营运结束时间点并且是连续的班次数].
+			 * 				
+			 * ********************************	思路 ********************************************************* 
+			 * 
+			 * 		首先，以早高峰开始时间作为开始点 ， 并且作为最后一个路牌的第一个班次的发车时间展开。
+			 * 				
+			 * 				纵向展开：
+			 * 						以最后一个路牌的第一个班次发车时间为开始点，以阶梯形式向上展开.
+			 * 
+			 * 						规则：
+			 * 							下一个路牌的第一个班次发车时间 = 当前路牌的第一个班次发车时间 + 在某时间范围内的发车间隙。
+			 * 							依次类推。可以得到每一个路牌下的第一个班次发车时间。
+			 * 
+			 * 						举例：以最后一个路牌第一个班次的发车时间为开始点向上展开.
+			 * 							 最后一个路牌的第一个班次的发车时间为 6：31
+			 * 							 倒数第二个路牌的第一个班次的发车时间为 6：39 =  6：31 + 某周转时间段内的发车间隙为：8 
+			 * 							 倒数第三个路牌的第一个班次的发车时间为 6：47 =  6：39 +  某周转时间段内的发车间隙为：8
+			 * 							 倒数第四个....
+			 * 							 以此类推. 
+			 * 
+			 * 				横向展开： 
+			 * 						就是以每个路牌下的第一个班次的发车时间去补全当前路牌后面并且为连续性的班次。
+			 * 
+			 * 						规则：
+			 * 							当前班次 ：班次的计划发车时间 + 当前方向下并且在某时间范围内的行驶时间  =  当前班次下的计划到达时间 以此推出下个班次的发车时间.
+			 * 							下个班次 ：下个班次的发车时间 = 以上个班次的到达时间 + 上个班次方向下并且在某时间范围内的停站时间. 
+			 * 							依次类推。以营运结束时间点作为结束。铺出当前路牌下并为连续性的班次数.
+			 * 						
+			 * 						举例：以最后一个路牌的第一个班次开始向水平方向连续性的补全.
+			 * 							 第一个班次的发车时间是 6：31 ， 某放下下的高峰行驶时间 25分钟 ，得到第一个班次的到达时间 6：31 + 25 = 6：56 ，
+			 * 							 第二个班次：
+			 * 									   发车时间是 7：01 =  第一个班次的到达时间 6：56 + 第一个班次方向下并且在某时间范围内的停站时间 5分钟 
+			 * 									   某放下下的高峰行驶时间 25分钟   得到到达时间 ： 7：01 + 25 = 7：26 
+			 * 							 第三个班次
+			 * 									   发车时间是 7：31  =  第二个班次的到达时间 7：26 + 第二个班次方向下并且在某时间范围内的停站时间 5分钟 
+			 * 									   某放下下的高峰行驶时间 25分钟   得到到达时间 ： 7：31 + 25 = 7：56
+			 * 							 第四个班次
+			 * 							 第五个班次
+			 * 							 ........
+			 */
+			plgfbc01 : function(saa , cara , map, seMap , dataMap) {
+				// 定义路牌长度 、所有路牌默认出场方向 [0--上行出场；1--下行出场] 、营运结束时间、返回数组.
+				var len = cara.length , cctag , endTime = baseF.getDateTime(seMap.e) , rs = new Array();
+				// 获取所有路牌默认出场方向.如果是环线则只有一个上行方向.
+				cctag = map.linePlayType=='1' ? 0 : baseF.getdefaultDir01(dataMap.smbcsjArr,saa[0].xxsj, saa[0].dgxxtzjx); 
+				for(var c = 0 ; c < len ; c++) {
+					// 定义当前路牌的第一个班次的开始时间.
+					var kssj = baseF.getDateTime(map.earlyStartTime);
+					kssj.setMinutes(kssj.getMinutes()-(len - cara[c].lpNo)*saa[0].fcjx.dgfcjx);
+					// 定义当前路牌方向变量 、 是否开启方向切换变量[0 --- 表示不开启 ； 1 -- 表示开启] 、 序号.
+					var fxTagDm = cctag , fxflag = 0 , xhNo = 3;
+					while(kssj <= endTime) {
+						// 获取当前班次方向,如果是当前路牌的第一个班次则为默认方向，否则切换方向.
+						fxTagDm = baseF.getfx(fxflag,fxTagDm);
+						// 开启方向切换.
+						fxflag = 1;
+						// 定义在某时间段内[高峰时间段、低谷时间段]的停站时间.
+						var tzsj =  baseF.isgfsjd01(kssj,dataMap) ?  dataMap.gftzsj[fxTagDm] : dataMap.dgtzsj[fxTagDm];
+						// 定义在某时间段内的行驶时间.
+						var _xxsj = baseF.getxssj(dataMap.zgfsjd,dataMap.wgfsjd,kssj,dataMap.pcxssjArr,dataMap.gfxxsjArr,fxTagDm);
+						// 定义当前班次的停站时间,这里是为了当计算到了最后一个班次的时候，那么停站时间为0 ，但是后续的班次的发车时间需要加上前一个班次的停站时间.
+						var xs_tzsj = baseF.isLastbc(kssj,endTime,tzsj,_xxsj)  ?  0 :　tzsj;
+						// 添加正常班次对象.
+						rs.push(baseF.getbcObj(kssj , _xxsj , cara[c] , 
+											   dataMap.bcTypeArr.normal,
+											   dataMap.dira[fxTagDm] ,  xhNo++,
+											   dataMap.pcxslcArr[fxTagDm] , map , 0,
+											   dataMap.qdzArr[fxTagDm],
+											   dataMap.zdzArr[fxTagDm], null , xs_tzsj , 0));
+						// 重新计算下一个班次的开始时间.
+						kssj = new Date(kssj.setMinutes(kssj.getMinutes() + tzsj));
+					}
+ 				}
+				return rs;
+			},
+			
 			plgfbc : function(saa , cara , map, seMap ,dataMap) {
 				var len = cara.length,rs = new Array();
 				var lbsj = map.lb=='' ? 0:parseInt(map.lb);
@@ -1610,9 +2162,10 @@ var BaseFun = function() {
 				return rs;
 			},
-			isgfsjd01 :　function(kssj,dataMap,type) {
+			isgfsjd01 :　function(kssj,dataMap) {
 				var tag = false;
-				if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) || ( dataMap.wgfsjd[0].st <= kssj && kssj <=  dataMap.wgfsjd[0].ed))
+				if((dataMap.zgfsjd[0].st <= kssj && kssj<= dataMap.zgfsjd[0].ed ) || 
+						( dataMap.wgfsjd[0].st <= kssj && kssj <=  dataMap.wgfsjd[0].ed))
 					tag = true;
 				return tag;
 			},
@@ -1653,6 +2206,34 @@ var BaseFun = function() {
 				return result;
 			},
+			splitBxRc02 : function(str) {
+				var list = new Array(),rsa = new Array();
+				var gsgd = baseF.getBxLs();
+				var bxrcAr = str.split(',');
+				for(var s = 0 ; s< bxrcAr.length;s++) {
+					var s1a = bxrcAr[s].split('/');
+					var rs = parseInt(s1a[1]);
+					var fpcls = parseInt(s1a[2]);
+					var gsavg = parseInt(s1a[3]);
+					var gsgdIndex = 0,hoursV = 0.0,minueV='' ;
+					for(var g = 0 ; g < gsgd.length; g++) {
+						if(gsgd[g].type == s1a[0]) {
+							gsgdIndex = g;
+							hoursV = gsgd[g].hoursV;
+							minueV = gsgd[g].minueV;
+						}
+					}
+					list.push({'type':s1a[0],
+							   'rs':rs,
+							   'fpcls':fpcls,
+							   'hoursV':hoursV,
+							   'minueV':minueV,
+							   'gsavg' : gsavg});
+					rsa.push(rs);
+				}
+				return {'data':list.sort(function(a,b){return b.rs-a.rs}),'rsa':rsa.sort().reverse()};
+			},
+			
 			splitBxRc : function(str) {
 				var list = new Array(),rsa = new Array();;
 				var gsgd = baseF.getBxLs();
@@ -966,9 +966,11 @@ var RelationshipGraph = function () {
     			var lpNo = array[a].lpNo;
     			var timeNum = 0 ,tempNum = 0;
     			for(var z = 0 ;z < tza.length;z++) {
-    				if(tza[z].lpNo == lpNo) {
+    				if(tza[z].lpNo == lpNo && tza[z].bcsj >0 ) {
     					timeNum = timeNum + tza[z].bcsj + tza[z].STOPTIME;
-    					tempNum ++;
+    					if( tza[z].bcType !='bd' && tza[z].bcType !='lc' ) {
+    						tempNum ++;
+    					}
     				}
 				}
     			var className = 'statis_container_' + lpNo;
@@ -64,7 +64,8 @@
 			}else if(map.baseRes== '1') {
 				// 采用班型人次数据获取渲染时刻表明细图形的配置参数数据.
 				// data = BaseFun.BXPplaceClassesTime(stopAraay,CSMap.maxCar,map,seMap,dataMap,getylp(CSMap.maxCar).lpNoA);
-				data = BaseFun.BXPplaceClassesTime01(stopAraay,CSMap.maxCar,map,seMap,dataMap,getylp(CSMap.maxCar).lpNoA);
+				// data = BaseFun.BXPplaceClassesTime01(stopAraay,CSMap.maxCar,map,seMap,dataMap,getylp(CSMap.maxCar).lpNoA);
+				data = BaseFun.BXPplaceClassesTime02(stopAraay,CSMap.maxCar,map,seMap,dataMap,getylp(CSMap.maxCar).lpNoA);
 			}
 		}else {
@@ -129,7 +130,11 @@
 	 * @returns 返回一个分装发车间隙、车辆数的最大值集合.
 	 * */
 	function getMaxCarAndStopSpace1(map) {
-		return {'gattA':null,'fcjx': {'gffcjx': Math.round(map.zzsj.gfzzsj/map.clzs) , 'dgfcjx': Math.round(map.zzsj.dgzzsj/map.clzs)},'maxCar':BaseFun.getYAxisCarArray(parseInt(map.clzs))};
+		return {'gattA':null,
+				'fcjx': {'gffcjx': Math.round(map.zzsj.gfzzsj/map.clzs) , 
+						 'dgfcjx': Math.round(map.zzsj.dgzzsj/map.clzs),
+						 'dgmaxfcjx' : parseInt(map.dgmaxfcjx)},
+				'maxCar':BaseFun.getYAxisCarArray(parseInt(map.clzs))};
 	}
 	/**
@@ -147,6 +152,8 @@
 				'pcxssjArr' : BaseFun.formatPairing(gatps.upTravelTime,gatps.downTravelTime),// 平常行驶时间。[下标0代表上；下标1代表下]
 				'gfxxsjArr' : BaseFun.formatPairing(gatps.lateUpTime=='' ? gatps.upTravelTime : gatps.lateUpTime,
 													gatps.lateDownTime=='' ? gatps.downTravelTime : gatps.lateDownTime),// 高峰行驶时间。[下标0代表上；下标1代表下]
+				'dgxxsjArr' : BaseFun.formatPairing(gatps.troughUpTime=='' ? gatps.upTravelTime : gatps.troughUpTime,
+										gatps.troughDownTime=='' ? gatps.downTravelTime : gatps.troughDownTime),// 低谷行驶时间。[下标0代表上；下标1代表下]
 				'pcxslcArr' : BaseFun.formatPairing(gatps.upMileage,gatps.downMileage),// 行驶里程。[下标0代表上；下标1代表下]
 				'qdzArr' : BaseFun.qzdz(gatps.up_s.split('_')[0],gatps.down_s.split('_')[0]),// 起始站。[下标0代表上；下标1代表下]
 				'zdzArr':BaseFun.qzdz(gatps.up_s.split('_')[1],gatps.down_s.split('_')[1]),// 终点站。[下标0代表上；下标1代表下]
@@ -170,6 +177,8 @@
 				// 'maxztjx' : parseInt(gatps.maxstopTime),		// 最大停站时间.
 				'gftzsj': BaseFun.formatPairing(gatps.gfupStopTime,gatps.gfdownStopTime),// 高峰停站时间.
 				'dgtzsj' : BaseFun.formatPairing(gatps.dgupStopTime,gatps.dgdownStopTime),// 低谷停站时间.
+				'dgmaxtzsj' :  parseInt(gatps.dgmaxtzsj),// 低谷最大停站时间.
+				'dgmaxfcjx' :  parseInt(gatps.dgmaxfcjx),// 低谷最大发车间隙.
 				'map' : gatps,
 				'zzsj':gatps.zzsj,// 周转时间.
 			};
@@ -191,6 +200,9 @@
 			'dgzzsj':  parseInt(map.troughUpTime==''? map.upTravelTime : map.troughUpTime) + 
 					   parseInt(map.dgupStopTime) + parseInt(map.dgdownStopTime) + 
 					   parseInt(map.troughDownTime==''? map.downTravelTime: map.troughDownTime),// 低谷周转时间
+			'dgmaxzzsj' : parseInt(map.troughUpTime==''? map.upTravelTime : map.troughUpTime) + 
+			   			  parseInt(map.dgmaxtzsj) + parseInt(map.dgmaxtzsj) + 
+			   			  parseInt(map.troughDownTime==''? map.downTravelTime: map.troughDownTime),// 低谷最大的周转时间
 		};
 	}
@@ -42,7 +42,8 @@ var ComponentsBootstrapTagsinput = function() {
         	var bctypeValue = $('#state_tagsinput_bctype').val();
         	var rcnum  = $('#state_tagsinput_rcsvalue').val();
         	var clnum = $('#state_tagsinput_clsvalue').val();
-        	if(isNull(bctypeValue,rcnum,clnum)) {
+        	var gsvag = $('#state_tagsinput_gsavgvalue').val();
+        	if(isNull(bctypeValue,rcnum,clnum,gsvag)) {
         		if(!Number.isInteger(parseInt(rcnum)/parseInt(clnum))) {
             		layer.msg('当前算法只支持【单/双挡】!请您重新输入!');
             		 $('#state_tagsinput_bctype').val(null);
@@ -56,22 +57,24 @@ var ComponentsBootstrapTagsinput = function() {
             		 if(s1a[0]==bctypeValue) {
             			 rcnum = parseInt(rcnum) + parseInt(s1a[1]);
             			 clnum = parseInt(clnum) + parseInt(s1a[2]);
+            			 gsvag = parseInt(s1a[3]);
             		 }
             	 }
         		 elt.tagsinput('add', { 
-                     "value": bctypeValue  + '/' + rcnum + '/' + clnum, 
-                     "text":  bctypeValue + '/' + rcnum + '/' + clnum, 
+                     "value": bctypeValue  + '/' + rcnum + '/' + clnum + '/' + gsvag, 
+                     "text":  bctypeValue + '/' + rcnum + '/' + clnum  + '/' + gsvag, 
                      "continent": bctypeValue,
                  });
         		 $('#state_tagsinput_bctype').val(null);
         		 $('#state_tagsinput_rcsvalue').val(null);
         		 $('#state_tagsinput_clsvalue').val(null);
+        		 $('#state_tagsinput_gsavgvalue').val(null);
         	}
         });
-        var isNull = function(v1,v2,v3) {
+        var isNull = function(v1,v2,v3,v4) {
         	var tag = true;
-        	if(v1==''|| v2=='' || v3=='')
+        	if(v1==''|| v2=='' || v3=='' || v4=='')
         		tag = false;
         	return tag;
         }
@@ -170,56 +170,83 @@
 <!-- 表单分组组件 form-group START -->
 <div class="form-group">
-	<!-- 高峰上行停站间隙  (* 必填项) START -->
+	<!-- 高峰上行停站时间  (* 必填项) START -->
 	<div class="col-md-6">
 		<label class="control-label col-md-5">
-			<span class="required"> * </span> 高峰上行停站间隙:
+			<span class="required"> * </span> 高峰上行停站时间:
 		</label>
 		<div class="col-md-5">
 		 	<input type="text" class="form-control" name="gfupStopTime"   id="gfupStopTimeInput" 
-				placeholder="请输入高峰上行停站间隙"> 
+				placeholder="请输入高峰上行停站时间"> 
 		</div>
 	</div>
-	<!-- 上行停站间隙 (* 必填项) END -->
+	<!-- 上行停站时间 (* 必填项) END -->
-	<!-- 高峰下行停站间隙  (* 必填项) START -->
+	<!-- 高峰下行停站时间  (* 必填项) START -->
 	<div class="col-md-6">
 		<label class="control-label col-md-5">
-			<span class="required"> * </span> 高峰下行停站间隙:
+			<span class="required"> * </span> 高峰下行停站时间:
 		</label>
 		<div class="col-md-5">
 		 	<input type="text" class="form-control" name="gfdownStopTime"   id="gfdownStopTimeInput" 
-				placeholder="请输入高峰下行停站间隙"> 
+				placeholder="请输入高峰下行停站时间"> 
 		</div>
 	</div>
-	<!-- 高峰下行停站间隙 (* 必填项) END -->
+	<!-- 高峰下行停站时间 (* 必填项) END -->
 </div>
 <!-- 表单分组组件 form-group END --> 
 <!-- 表单分组组件 form-group START -->
 <div class="form-group">
-	<!-- 低谷上行停站间隙(* 必填项) START -->
+	<!-- 低谷上行停站时间(* 必填项) START -->
 	<div class="col-md-6">
 		<label class="control-label col-md-5">
-			<span class="required"> * </span> 低谷上行停站间隙:
+			<span class="required"> * </span> 低谷上行停站时间:
 		</label>
 		<div class="col-md-5">
-		 	<input type="text" class="form-control" name="dgupStopTime"   id="dgupStopTimeInput" placeholder="请输入低谷上行停站间隙"> 
+		 	<input type="text" class="form-control" name="dgupStopTime"   id="dgupStopTimeInput" placeholder="请输入低谷上行停站时间"> 
 		</div>
 	</div>
-	<!--  低谷上行停站间隙(* 必填项) END -->
+	<!--  低谷上行停站时间(* 必填项) END -->
-	<!-- 低谷下行停站间隙(* 必填项) START -->
+	<!-- 低谷下行停站时间(* 必填项) START -->
 	<div class="col-md-6">
 		<label class="control-label col-md-5">
-			<span class="required"> * </span> 低谷下行停站间隙:
+			<span class="required"> * </span> 低谷下行停站时间:
 		</label>
 		<div class="col-md-5">
 		 	<input type="text" class="form-control" name="dgdownStopTime"  id="dgdownStopTimeInput" 
-				placeholder="请输入低谷下行停站间隙"> 
+				placeholder="请输入低谷下行停站时间"> 
 		</div>
 	</div>
-	<!--  低谷停站间隙 (* 必填项) END -->
+	<!--  低谷停站时间 (* 必填项) END -->
+</div>
+<!-- 表单分组组件 form-group END --> 
+
+<!-- 表单分组组件 form-group START -->
+<div class="form-group">
+	<!-- 低谷最大发车间隙(* 必填项) START -->
+	<div class="col-md-6">
+		<label class="control-label col-md-5">
+			<span class="required"> * </span> 低谷最大发车间隙:
+		</label>
+		<div class="col-md-5">
+		 	<input type="text" class="form-control" name="dgmaxfcjx"   id="dgmaxfcjxInput" placeholder="请输入低谷最大发车间隙"> 
+		</div>
+	</div>
+	<!--  低谷最大发车间隙(* 必填项) END -->
+	
+	<!-- 低谷最大停站时间(* 必填项) START -->
+	<div class="col-md-6">
+		<label class="control-label col-md-5">
+			<span class="required"> * </span> 低谷最大停站时间:
+		</label>
+		<div class="col-md-5">
+		 	<input type="text" class="form-control" name="dgmaxtzsj"  id="dgmaxtzsjInput" 
+				placeholder="请输入低谷最大停站时间"> 
+		</div>
+	</div>
+	<!--  低谷停站时间 (* 必填项) END -->
 </div>
 <!-- 表单分组组件 form-group END --> 
@@ -523,9 +550,14 @@
 	<div class="col-md-6 ">
 		<label class="control-label col-md-5"><span class="required"> * </span>班型/人次/车辆　:</label>
 		<div class="col-md-5 tagsDiv">
-			<input type="text" value="" name="bxrc" id="state_tagsinput" style="display: none;">
-			<div class="margin-top-10">
-    		 	<select class="form-control" id="state_tagsinput_bctype">
+			<div class="row" style="margin-left: 15px;">
+				<input type="text" value="" name="bxrc" id="state_tagsinput" style="display: none;">
+			</div>
+
+			<div class="row" style="margin-top: 10px;">
+				<label class="control-label col-md-4">工休类型　:</label>
+				<div class="col-md-8">
+				<select class="form-control" id="state_tagsinput_bctype">
 	  				<option value="">请选择工休类型...</option>
 					<option value="六工一休">六工一休</option>
 	  				<option value="五工一休">五工一休</option>
@@ -536,14 +568,31 @@
 	  				<option value="一工一休">一工一休</option>
 					<option value="无工休">无工休</option>
 				</select>
+				</div>		
+			</div>
+
+			<div class="row" style="margin-top: 10px;">
+				<label class="control-label col-md-4">分配人次数:</label>
+				<div class="col-md-8">
+		 			<input type="number" class="form-control" placeholder="请输入分配人次数" id="state_tagsinput_rcsvalue" min="1">
+				</div>	
 			</div>
-			<div class="margin-top-10">
-				<input type="number" class="form-control" placeholder="请输入分配人次数" id="state_tagsinput_rcsvalue" min="1">
+			 
+			<div class="row" style="margin-top: 10px;">
+				<label class="control-label col-md-4">分配车辆数:</label>
+				<div class="col-md-8">
+		 			<input type="number" class="form-control" placeholder="请输入分配车辆数" id="state_tagsinput_clsvalue" min="1">
+				</div>	
 			</div>
-			<div class="margin-top-10">
-				<input type="number" class="form-control" placeholder="请输入分配车辆数" id="state_tagsinput_clsvalue" min="1">
+			 
+			<div class="row" style="margin-top: 10px;">
+				<label class="control-label col-md-4">日平均工时:</label>
+				<div class="col-md-8">
+		 			<input type="number" class="form-control" placeholder="请输入日平均工时" id="state_tagsinput_gsavgvalue" min="1">
+				</div>	
 			</div>
-			<div class="margin-top-10">
+
+			<div class="row" style="margin-top: 10px;margin-left: 116px;">
     			<a href="javascript:;" class="btn red" id="state_tagsinput_add">添加</a>
 			</div>
 		</div>
@@ -710,43 +759,65 @@
 <!-- 表单分组组件 form-group START -->
 <div class="form-group">
-	<!--  高峰上行停站间隙(* 必填项) START -->
+	<!--  高峰上行停站时间(* 必填项) START -->
 	<div class="col-md-6">
-		<label class="control-label col-md-5">   高峰上行停站间隙: </label>
+		<label class="control-label col-md-5">   高峰上行停站时间: </label>
    		<div class="col-md-4">
        		<p class="form-control-static" data-display="gfupStopTime"> </p>
    		</div>
 	</div>
-	<!--  高峰上行停站间隙(* 必填项) END -->
-	<!--  高峰下行停站间隙(* 必填项) START -->
+	<!--  高峰上行停站时间(* 必填项) END -->
+	<!--  高峰下行停站时间(* 必填项) START -->
 	<div class="col-md-6">
-		<label class="control-label col-md-5"> 高峰下行停站间隙: </label>
+		<label class="control-label col-md-5"> 高峰下行停站时间: </label>
    		<div class="col-md-4">
        		<p class="form-control-static" data-display="gfdownStopTime"> </p>
    		</div>
 	</div>
-	<!--  高峰下行停站间隙(* 必填项) END -->
+	<!--  高峰下行停站时间(* 必填项) END -->
 </div>
 <!-- 表单分组组件 form-group END -->
 <!-- 表单分组组件 form-group START -->
 <div class="form-group">
-	<!-- 低谷上行停站间隙(* 必填项) START -->
+	<!-- 低谷上行停站时间(* 必填项) START -->
 	<div class="col-md-6">
- 		<label class="control-label col-md-5">  低谷上行停站间隙: </label>
+ 		<label class="control-label col-md-5">  低谷上行停站时间: </label>
   		<div class="col-md-4">
        		<p class="form-control-static" data-display="dgupStopTime"> </p>
    		</div>
 	</div>
-	<!--  低谷上行停站间隙(* 必填项) END -->
-	<!-- 低谷下行停站间隙(* 必填项) START -->
+	<!--  低谷上行停站时间(* 必填项) END -->
+	<!-- 低谷下行停站时间(* 必填项) START -->
 	<div class="col-md-6">
-		<label class="control-label col-md-5">  低谷下行停站间隙: </label>
+		<label class="control-label col-md-5">  低谷下行停站时间: </label>
 	 	<div class="col-md-4">
     		<p class="form-control-static" data-display="dgdownStopTime"> </p>
 	 	</div>
 	</div>
-	<!-- 低谷下行停站间隙(* 必填项) END --> 
+	<!-- 低谷下行停站时间(* 必填项) END --> 
+</div>
+<!-- 表单分组组件 form-group END -->
+
+<!-- 表单分组组件 form-group START -->
+<div class="form-group">
+	<!-- 低谷最大发车间隙(* 必填项) START -->
+	<div class="col-md-6">
+ 		<label class="control-label col-md-5">  低谷最大发车间隙: </label>
+  		<div class="col-md-4">
+       		<p class="form-control-static" data-display="dgmaxfcjx"> </p>
+   		</div>
+	</div>
+	<!--  低谷最大发车间隙(* 必填项) END -->
+
+	<!-- 低谷最大停站时间(* 必填项) START -->
+	<div class="col-md-6">
+		<label class="control-label col-md-5">  低谷最大停站时间: </label>
+	 	<div class="col-md-4">
+    		<p class="form-control-static" data-display="dgmaxtzsj"> </p>
+	 	</div>
+	</div>
+	<!-- 低谷最大停站时间(* 必填项) END --> 
 </div>
 <!-- 表单分组组件 form-group END -->
@@ -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>
+                        <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: 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>
@@ -59,10 +59,11 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="6">营运车辆修正统计表</th>
+								<th colspan="7">营运车辆修正统计表</th>
 							</tr>
 							<tr>
 								<td>编号</td>
+								<td>日期</td>
 								<td>路牌</td>
 								<td>车号</td>
 								<td>司机</td>
@@ -96,6 +97,10 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -105,6 +110,7 @@
 		if(day < 10)
 			day = "0" + day;
 		$("#date").val(year + "-" + month + "-" + day);
+		$("#endDate").val(year + "-" + month + "-" + day);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -197,16 +203,18 @@
         });
 	    var line = $("#line").val();
-	    var date = $("#startDate").val();
+	    var date = $("#date").val();endDate
 	    var lpName = $("#lpName").val();
+	    var endDate = $("#endDate").val();
 	    var code = $("#code").val();
 		$("#query").on("click",function(){
 		    line = $("#line").val();
 		    date = $("#date").val();
 		    lpName = $("#lpName").val();
 		    code = $("#code").val();
+		    endDate = $("#endDate").val();
 		    var type = "query";
-		    $get("/realSchedule/correctForm",{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
+		    $get("/realSchedule/correctForm",{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
 		        var list_correctForm = template('list_correctForm',{list:result});
                 // 把渲染好的模版html文本追加到表格中
                 $('#forms .list_correctForm').html(list_correctForm);
@@ -224,7 +232,7 @@
 		$("#export").on("click",function(){
 			var type = "export";
-			$get('/realSchedule/correctForm',{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
+			$get('/realSchedule/correctForm',{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
 				window.open("/downloadFile/download?fileName=修正报表"+date);
 			});
 		});
@@ -234,7 +242,8 @@
 <script type="text/html" id="list_correctForm">
 	{{each list as obj i}}
 		<tr>
-			<td>{{i+1}}</td>
+			<td>{{i+1}}</td>
+			<td>{{obj.rq}}</td>
 			<td>{{obj.lpName}}</td>
 			<td>{{obj.clZbh}}</td>
 			<td>{{obj.jName}}/{{obj.jGh}}</td>
@@ -244,7 +253,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -157,35 +157,71 @@
 				}
 			}
 			$('#subCompany').html(options);
-			initXl();
 		}
-		$("#subCompany").on("change",initXl);
-		function initXl(){
-			var data=[];
-			if(fage){
-				$("#line").select2("destroy").html('');
-			}
-			var fgs=$('#subCompany').val();
-			var gs=$('#company').val();
+// 		$("#subCompany").on("change",initXl);
+
+// 		function initXl(){
+// 			var data=[];
+// 			data.push({id: " ", text: "全部线路"});
+// 			if(fage){
+// 				$("#line").select2("destroy").html('');
+// 			}
+// 			var fgs=$('#subCompany').val();
+// 			var gs=$('#company').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;
+// 		}
+
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
 			data.push({id: " ", text: "全部线路"});
-			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"]});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
 						}
 					}
 				}
-			}
-			initPinYinSelect2('#line',data,'');
-			fage=true;
-		}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#company").attr("disabled", false);
+				$("#subCompany").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#company").val(temp[0]);
+				updateCompany();
+				$("#subCompany").val(temp[1]);
+				$("#company").attr("disabled", true);
+				$("#subCompany").attr("disabled", true);
+			}
+		});
 		$("#query").on("click",jsDoQuery);
@@ -312,22 +312,50 @@
 		<tr>
 			<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>
+			{{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>
+				<td style="background-color: #FF9999">{{obj.delayFirst0}}</td>
+			{{else}}
+				<td>{{obj.qdzFirst0}}</td>
+				<td>{{obj.jhfcFirst0}}</td>
+				<td>{{obj.sjfcFirst0}}</td>
+				<td>{{obj.delayFirst0}}</td>
+			{{/if}}
+			{{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>
+				<td style="background-color: #FF9999">{{obj.delayLast0}}</td>
+			{{else}}
+				<td>{{obj.qdzLast0}}</td>
+				<td>{{obj.jhfcLast0}}</td>
+				<td>{{obj.sjfcLast0}}</td>
+				<td>{{obj.delayLast0}}</td>
+			{{/if}}
+			{{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>
+				<td style="background-color: #FF9999">{{obj.delayFirst1}}</td>
+			{{else}}
+				<td>{{obj.qdzFirst1}}</td>
+				<td>{{obj.jhfcFirst1}}</td>
+				<td>{{obj.sjfcFirst1}}</td>
+				<td>{{obj.delayFirst1}}</td>
+			{{/if}}
+			{{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>
+				<td style="background-color: #FF9999">{{obj.delayLast1}}</td>
+			{{else}}
+				<td>{{obj.qdzLast1}}</td>
+				<td>{{obj.jhfcLast1}}</td>
+				<td>{{obj.sjfcLast1}}</td>
+				<td>{{obj.delayLast1}}</td>
+			{{/if}}
 		</tr>
 	{{/each}}
 </script>
 \ No newline at end of file
@@ -46,7 +46,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" id="table" style="margin-top: 10px;overflow:auto;min-width: 906px;">
+				<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 class="hidden">
@@ -80,7 +80,6 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
-		$("#table").height($(window).height()-280);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -93,7 +93,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" id="table" style="margin-top: 0px;overflow:auto;min-width: 906px;height:481px;">
+				<div class="table-container" id="table" style="margin-top: 0px;overflow:auto;min-width: 906px;">
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
@@ -135,7 +135,6 @@
 			format : 'HH:mm',
 			locale : 'zh-cn'
 		});
-		$("#table").height($(window).height()-320);
 		var d = new Date();
 		var year = d.getFullYear();
@@ -346,7 +345,12 @@
 					$('#export').attr('disabled', "true");
 				else
 					$("#export").removeAttr("disabled");
-				
+
+				if($("#forms").height()+70 > $(window).height()-110){
+					$("#table").height($(window).height()-110);
+				} else {
+					$("#table").height($("#forms").height()+70);
+				}
 			});
 		}
@@ -294,7 +294,7 @@ word-wrap: break-word;
 			day = "0" + day;
 		$("#date").val(year + "-" + month + "-" + day);
-		$("#ddrbBody").height($(window).height()-280);
+		$("#ddrbBody").height($(window).height()-100);
 		/* $.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -407,6 +407,7 @@ word-wrap: break-word;
 				layer.msg("请选择时间");
 				return;
 			}
+			$("#ddrbBody").height($(window).height()-100);
 			$("c").html("全日");
 			$("#export").removeAttr("disabled");
 			$get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
@@ -65,7 +65,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container"  id="ddrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
+				<div class="table-container"  id="tjrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
 					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
@@ -248,6 +248,7 @@
 				layer.msg("请选择时间范围！");
 				return;
 			}
+			$("#tjrbBody").height($(window).height()-100);
 			line = $("#line").val();
 			xlName = $("#select2-line-container").html();
 			date = $("#date").val();
@@ -282,7 +283,7 @@
 			}
 		});
-		$("#ddrbBody").height($(window).height()-280);
+		$("#tjrbBody").height($(window).height()-100);
 		$("#export").on("click",function(){
 			 var params = {};
 			 params['gsdm'] = gsdm;
@@ -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: 520px">
+						<div class="" id="left_height" style="margin-top: 10px;overflow:auto;">
 							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
 								<thead>
 									<tr class="hidden">
@@ -106,7 +106,9 @@
 			locale : 'zh-cn'
 		});
+		$("#left_height").height($(window).height()-100);
 		$("#xcld_height").height($(window).height()-100);
+		
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -187,8 +189,9 @@
 			fage=true;
 		}
 		var date = '';
-		var line ='';
+		var line = '';
 		$("#query").on("click",function(){
+			$("#left_height").height($(window).height()-100);
 			line = $("#line").val();
 			date = $("#date").val();
 			$(".hidden").removeClass("hidden");
@@ -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; }
@@ -169,7 +169,7 @@
 		$("#fgsdmOperat").on("change",initXl);
 		function initXl(){
 			var data=[];
-			data.push({id: " ", text: "请选择"});
+			data.push({id: " ", text: "全部线路"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}
@@ -173,7 +173,7 @@
 				<div class="row">
 					<div class="col-md-offset-3 col-md-4">
 						<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
-						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
+						<a type="button" class="btn default" href="list_ph.html" data-pjax><i class="fa fa-times"></i> 取消</a>
 					</div>
 				</div>
 			</div>
@@ -31,7 +31,7 @@
 						<div style="display: inline-block;margin-left: 15px;">
 							<input   class="item-label"  type="radio" name="typeLx"  checked="checked" value="1" />
 							班次执行情况   
-							<input  class="item-label"  type="radio" name="typeLX" value="2" />
+							<input  class="item-label"  type="radio" name="typeLx" value="2" />
 							车辆/站点 
 						</div>
 						<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
@@ -116,16 +116,17 @@
 							<thead>
 								<tr>
 									<td width="3%"></td>
-									<td width="9%">内部编码</td>
-									<td width="8%">到站名称</td>
-									<td width="8%">到站时刻</td>
-									<td width="8%">离站时刻</td>
-									<td width="8%">是否开关门</td>
-									<td width="8%">上下行</td>
+									<td width="8%">内部编码</td>
+									<td width="8%">牌照号</td>
+									<td width="7%">到站名称</td>
+									<td width="7%">到站时刻</td>
+									<td width="7%">离站时刻</td>
+									<td width="7%">是否开关门</td>
+									<td width="7%">上下行</td>
 									<td width="8%">开门速度(公里/小时)</td>
-									<td width="8%">补发</td>
-									<td width="8%">刷卡次数</td>
-									<td width="8%">刷卡金额</td>
+									<td width="7%">补发</td>
+									<td width="7%">刷卡次数</td>
+									<td width="7%">刷卡金额</td>
 									<td width="8%">免费刷卡次数</td>
 									<td width="8%">免费刷卡金额</td>
 								</tr>
@@ -497,6 +498,7 @@
 		<tr>
 			<td>{{i+1}}</td>
 			<td>{{obj.nbbm}}</td>
+			<td>{{obj.pzh}}</td>
 			<td>{{obj.stopName}}</td>
 			<td>{{obj.jzsj}}</td>
 			<td>{{obj.czsj}}</td>
@@ -42,7 +42,7 @@
 					<div class="form-group" style="display: inline-block;margin-left: 15px;">
 						<input class="btn btn-default" type="button" id="query" value="查询"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
-						<input class="btn btn-default" type="button" id="print" value="打印"/>
+<!-- 						<input class="btn btn-default" type="button" id="print" value="打印"/> -->
 <!-- 						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/> -->
 					</div>
 				</form>
@@ -50,7 +50,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="" id="left_table" style="margin-top: 10px;overflow:auto;height: 860px">
 							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info_msg">
 								<thead>
 									<tr class="hidden">
@@ -67,7 +67,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="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">
@@ -106,6 +106,10 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		
+		$("#left_table").height($(window).height()-100);
+		$("#table").height($(window).height()-100);
+		
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -171,7 +175,8 @@
 			if($("#date").val() == null || $("#date").val().trim().length == 0){
 				layer.msg("请选择时间！");
 				return;
-			}
+			}
+			$("#left_table").height($(window).height()-100);
 			line = $("#line").val();
 			date = $("#date").val();
 			var code = $("#code").val();
@@ -194,13 +199,15 @@
 		$("#info_msg tbody").on("click","tr",function(){
 			if($(this).children().size() < 2){
 				return;
-			}
+			}
+			$("#table").height($(window).height()-100);
 			$(this).children().each(function(index){
 				params[index] = $(this).text();
 			});
 			jName = params[1];
 			line = $("#line").val();
 			date = $("#date").val();
+			var obj = $(this);
 			$get('/realSchedule/historyMessage',{line:line,date:date,code:jName,type:"query"},function(result){
 				var list_history_msg = template('list_history_msg',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -214,7 +221,9 @@
 					$("#print").removeAttr("disabled");
 				}
 				$('#printArea').show();
-				
+				
+				$("#info_msg tbody tr").css('background-color', '');
+			    obj.css('background-color', '#99CCFF');
 			});
 		});
@@ -18,7 +18,7 @@
 <div class="page-head">
 	<div class="page-title" style="margin-left: 20px">
-		<button>数据导出</button>
+		<button id="exportList">数据导出</button>
 	</div>
 </div>
@@ -27,7 +27,7 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 600px">
-					<table class="table table-bordered table-hover table-checkable" id="forms_1">
+					<table class="table table-bordered table-hover table-checkable" id="forms_2">
 						<thead>
 							<tr>
 								<td></td>
@@ -40,7 +40,7 @@
 							</tr>
 						</thead>
-						<tbody >
+						<tbody>
 						</tbody>
 					</table>
@@ -55,32 +55,28 @@
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
+		var no="";
 		 $("#sheetList").on('init', function (e, id) {
+			 no=id;
 			 $get('/sheet/sheetList',{id:id},function(result){
-					var sheetList_1 = template('sheetList_1',{list:result});
-					$('#forms_1 tbody').html(sheetList_1);
+					var sheetList_2 = template('sheetList_2',{list:result});
+					$('#forms_2 tbody').html(sheetList_2);
 				});
 		 })
-		/* $("#query").on('click',function(){
-			var line = $("#line").val();
-			var date = $("#date").val();
-			var fgs=$('#fgsdm').val();
-			var gs=$('#gsdm').val();
-			   $get('/sheet/countList',{line:line,date:date,gs:gs,fgs:fgs},function(result){
-				var sheetList = template('sheetList',{list:result});
-				$('#forms tbody').html(sheetList);
-				$('.btn-sheetList').on('click', openSheetList);
-			});  
-		}); */
+		 $("#exportList").on('click',function(){
+			
+			 $get('/sheet/exportList',params,function(result){
+					window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment($("#startDate").val()).format("YYYYMMDD"));
+				});
+		}); 
 	});
 </script>
-<script type="text/html" id="sheetList_1">
+<script type="text/html" id="sheetList_2">
 	{{each list as obj i}}
 		<tr {{if obj.sfzd!="Y"}}style="color: red" {{/if}}>
-		<td>{{i}}</td>
+		<td>{{i+1}}</td>
 		<td>{{obj.date}}</td>
 		<td>{{obj.line}}</td>
 		<td>{{obj.zdname}}</td>
@@ -35,14 +35,20 @@
 							<span class="item-label" style="width: 80px;">分公司: </span>
 							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 						</div>
-					<div style="display: inline-block;margin-left: 15px;">
+						<div style="margin-top: 10px">
+                    </div>
+					<div style="display: inline-block;margin-left: 33px;">
                     	 <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     </div>
 					<div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;">时间: </span>
+                        <span class="item-label" style="width: 80px;margin-left: 24px;">开始时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 180px;"/>
                     </div>
+                    <div style="display: inline-block;">
+                        <span class="item-label" style="width: 80px;margin-left: 24px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 180px;"/>
+                    </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
@@ -65,7 +71,28 @@
 							</tr>
 						</thead>
-						<tbody >
+						<tbody>
+							
+						</tbody>
+					</table>
+				</div>
+				
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms_1">
+						<thead>
+							<tr class="hidden">
+								<td>公司</td>
+								<td>分公司</td>
+								<td>日期</td>
+								<td>线路</td>
+								<td>班次数</td>
+								<td>准点班次数</td>
+								<td>准点率</td>
+								<td>查看</td>
+							</tr>
+						</thead>
+						
+						<tbody>
 						</tbody>
 					</table>
@@ -85,6 +112,10 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -93,8 +124,10 @@
 			day = "0"+day;
 		if(month > 9){
 			$("#date").val(year + "-" + month + "-" + day);
+			$("#endDate").val(year + "-" + month + "-" + day);
 		} else {
 			$("#date").val(year + "-0" + month + "-" + day);
+			$("#endDate").val(year + "-" + month + "-" + day);
 		}
 		var fage=false;
@@ -172,19 +205,34 @@
 		$("#query").on('click',function(){
 			var line = $("#line").val();
 			var date = $("#date").val();
+			var endDate = $("#endDate").val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
-			   $get('/sheet/countList',{line:line,date:date,gs:gs,fgs:fgs},function(result){
+			   $get('/sheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs},function(result){
 				var sheetList = template('sheetList',{list:result});
 				$('#forms tbody').html(sheetList);
-				$('.btn-sheetList').on('click', openSheetList);
+				$('.btn-sheetList').on('click', showSheetList);
 			});   
 // 			 $post('/sheet/saveListSheet',function(result){
 // 			}); 
 		});
-		
+		function showSheetList(){
+			var id = $(this).data('id');
+			var date = $("#date").val();
+			var endDate = $("#endDate").val();
+			$get('/sheet/listSheet',{id:id,date:date,endDate:endDate},function(result){
+				var sheetList = template('sheetList_1',{list:result});
+				
+				$('#forms_1 tbody').html(sheetList);
+				$('.btn-sheetList_1').on('click', openSheetList);
+				$("#forms_1 .hidden").removeClass("hidden");
+				$("html,body").animate({scrollTop:$("#forms_1").offset().top},1000);
+				
+			});
+		}
 		function openSheetList(){
 			var id = $(this).data('id');
+			console.log(id);
 			$.get('/pages/report/sheet/list.html', function (content) {
 				layer.open({
 					type: 1,
@@ -221,4 +269,27 @@
 			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
+</script>
+
+<script type="text/html" id="sheetList_1">
+	{{each list as obj i}}
+		<tr>
+		<td>{{obj.gs}}</td>
+		<td>{{obj.fgs}}</td>
+		<td>{{obj.date}}</td>
+		<td>{{obj.line}}</td>
+		<td>{{obj.bcs}}</td>
+		<td>{{obj.zdbcs}}</td>
+		<td>{{obj.zdlv}}</td>
+		<td>
+			<button type="button" class="btn btn-sm blue btn-sheetList_1" 
+			data-id="{{obj.id}}">详细</button>
+		</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
 </script>
 \ No newline at end of file
@@ -520,7 +520,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     return {
         rest : $resource(
             '/spic/:id',
-            {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id'},
+            {order: 'xl,scheduleDate,lp,xlDir,fcno', direction: 'ASC,ASC,ASC,ASC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -84,10 +84,20 @@
                     <span ng-bind="info.bcType | dict:'ScheduleType':'未知' "></span>
                 </td>
                 <td>
-                    <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
+                    <a href="#" ng-if="info.xlDir == '0'">
+                        <i class="fa fa-arrow-up" aria-hidden="true"></i>
+                        <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
+                    </a>
+                    <a href="#" ng-if="info.xlDir == '1'">
+                        <i class="fa fa-arrow-circle-down" aria-hidden="true"></i>
+                        <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
+                    </a>
                 </td>
                 <td>
-                    <span ng-bind="info.fcsj"></span>
+                    <a href="#">
+                        <i class="fa fa-clock-o" aria-hidden="true"></i>
+                        <span ng-bind="info.fcsj"></span>
+                    </a>
                 </td>
                 <td>
                     <a href="#"
@@ -64,7 +64,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     return {
         rest : $resource(
             '/spic/:id',
-            {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id'},
+            {order: 'xl,scheduleDate,lp,xlDir,fcno', direction: 'ASC,ASC,ASC,ASC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',