Merge branch 'pudong_jdk8' of 192.168.168.201:panzhaov5/bsth_control into pudong_jdk8

youxiw2000
2 parents abe8327d 0ad6862a
Showing 69 changed files with 7065 additions and 3049 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/schedule/core/legacy/EmployeeConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/legacy/TTInfoDetailController.java
src/main/java/com/bsth/controller/schedule/datasync/VehicleDataSyncController.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/calc/CalcStatistics.java
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
src/main/java/com/bsth/repository/calc/CalcIntervalRepository.java
src/main/java/com/bsth/repository/calc/CalcLineMileageRepository.java
src/main/java/com/bsth/repository/calc/CalcStatisticsRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/repository/schedule/TTInfoDetailRepository.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/ReportService.java
src/main/java/com/bsth/service/report/impl/CalcSheetServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/EmployeeConfigInfoService.java
-package com.bsth.controller.realcontrol;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.*;
-
-import com.bsth.data.forecast.entity.ArrivalEntity;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.util.ReportUtils;
-import com.bsth.util.db.DBUtils_MS;
-import com.bsth.util.db.DBUtils_control;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import com.alibaba.fastjson.JSONArray;
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController;
-import com.bsth.controller.realcontrol.dto.ChangePersonCar;
-import com.bsth.controller.realcontrol.dto.DfsjChange;
-import com.bsth.data.BasicData;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.report.RepairReport;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.realcontrol.ScheduleRealInfoService;
-
-@RestController
-@RequestMapping("/realSchedule")
-public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
-
-	@Autowired
-	ScheduleRealInfoService scheduleRealInfoService;
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-
-	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
-	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId, String jGh, String sGh, String nbbm){
-		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
-	}
-
-	@RequestMapping(value = "/lines")
-	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
-		return scheduleRealInfoService.findByLines(lines);
-	}
-
-	@RequestMapping(value = "/car")
-	public List<ScheduleRealInfo> findByCar(String nbbm){
-		return dayOfSchedule.findByNbbm(nbbm);
-	}
-
-	/**
-	 *
-	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
-	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
-	 */
-	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
-	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
-										   @RequestParam String dfsj,String bcType,
-										   @RequestParam(defaultValue = "") String opType) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
-	}
-
-	/**
-	 *
-	 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID ,分隔 
-	 */
-	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
-	public Map<String, Object> destroy(@RequestParam String idsStr
-			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
-									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
-		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
-	}
-
-	/**
-	 *
-	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
-	 */
-	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
-	public Map<String, String> carDeviceMapp() {
-		return BasicData.deviceId2NbbmMap.inverse();
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/driver", method = RequestMethod.GET)
-	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findDriverByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/conductor", method = RequestMethod.GET)
-	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findConductorByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/cars", method = RequestMethod.GET)
-	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findCarByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
-	 */
-	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
-	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
-		return scheduleRealInfoService.sreachVehic(nbbm);
-	}
-	/**
-	 *
-	 * @Title: realOutAdjust
-	 * @Description: TODO(实发调整)
-	 * @param @param id 班次ID
-	 * @param @param fcsjActual 实际发车时间 HH:mm
-	 * @param @param remarks 备注
-	 * @throws
-	 */
-	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
-	public Map<String, Object> realOutAdjust(@RequestParam Map<String, String> map) {
-		return scheduleRealInfoService.realOutAdjust(map);
-	}
-
-	/**
-	 *
-	 * @Title: revokeDestroy
-	 * @Description: TODO(撤销烂班)
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value = "/revokeDestroy", method = RequestMethod.POST)
-	public Map<String, Object> revokeDestroy(@RequestParam Long id){
-		return scheduleRealInfoService.revokeDestroy(id);
-	}
-
-	/**
-	 *
-	 * @Title: revokeRealOutgo
-	 * @Description: TODO(撤销实发)
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value = "/revokeRealOutgo", method = RequestMethod.POST)
-	public Map<String, Object> revokeRealOutgo(@RequestParam Long id){
-		return scheduleRealInfoService.revokeRealOutgo(id);
-	}
-
-	/**
-	 * 撤销执行
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/revokeRealArrive", method = RequestMethod.POST)
-	public Map<String, Object> revokeRealArrive(@RequestParam Long id){
-		return scheduleRealInfoService.revokeRealArrive(id);
-	}
-
-	/**
-	 *
-	 * @Title: spaceAdjust
-	 * @Description: TODO(间隔调整)
-	 * @param @param ids 要调整的班次数组ID
-	 * @param @param space 间隔
-	 * @throws
-	 */
-	@RequestMapping(value = "/spaceAdjust", method = RequestMethod.POST)
-	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
-		return scheduleRealInfoService.spaceAdjust(ids, space);
-	}
-
-	/**
-	 *
-	 * @Title: schInfoFineTune
-	 * @Description: TODO(发车信息微调)
-	 * @param @param map
-	 * @throws
-	 */
-	@RequestMapping(value = "/schInfoFineTune", method = RequestMethod.POST)
-	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
-		return scheduleRealInfoService.schInfoFineTune(map);
-	}
-
-	/**
-	 *
-	 * @Title: outgoAdjustAll
-	 * @Description: TODO(批量待发调整)
-	 * @param @param list
-	 * @throws
-	 */
-	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
-	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
-		//反转义
-		params = StringEscapeUtils.unescapeHtml4(params);
-		return scheduleRealInfoService.outgoAdjustAll(params);
-	}
-
-	/**
-	 *
-	 * @Title: findByLineAndUpDown
-	 * @Description: TODO(根据线路和走向获取班次)
-	 * @param @param line
-	 * @param @param upDown
-	 */
-	@RequestMapping(value = "/findByLineAndUpDown")
-	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
-		return dayOfSchedule.findByLineAndUpDown(line, upDown);
-	}
-
-	/**
-	 *
-	 * @Title: findRouteByLine
-	 * @Description: TODO(获取线路的站点，路段路由)
-	 * @param @param lineCode
-	 * @throws
-	 */
-	@RequestMapping(value = "/findRouteByLine")
-	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
-		return scheduleRealInfoService.findRouteByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: removeChildTask
-	 * @Description: TODO(删除子任务)
-	 * @param @param taskId 子任务ID
-	 * @throws
-	 */
-	@RequestMapping(value = "/childTask/{taskId}", method = RequestMethod.DELETE)
-	public Map<String, Object> removeChildTask(@PathVariable("taskId") Long taskId){
-		return scheduleRealInfoService.removeChildTask(taskId);
-	}
-
-	/**
-	 *
-	 * @Title: findByLineCode
-	 * @Description: TODO(根据线路获取班次信息)
-	 * @param @param lineCode
-	 */
-	@RequestMapping(value = "/lineCode/{lineCode}")
-	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
-		return dayOfSchedule.findByLineCode(lineCode);
-	}
-
-	@RequestMapping(value = "/queryUserInfo")
-	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
-												@RequestParam String date,@RequestParam String state) {
-		return scheduleRealInfoService.queryUserInfo(line, date,state);
-	}
-
-	@RequestMapping(value = "/queryUserInfoPx")
-	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
-												  @RequestParam String date,@RequestParam String state,@RequestParam String type) {
-		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
-	}
-
-	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName,@RequestParam String jGh, @RequestParam String clZbh,
-												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
-		return scheduleRealInfoService.exportWaybill(jName,jGh, clZbh, lpName,date,line);
-	}
-
-	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
-			,@RequestParam String date,@RequestParam String line) {
-		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
-	}
-
-
-	@RequestMapping(value = "/dailyInfo")
-	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
-		return scheduleRealInfoService.dailyInfo(line, date, type);
-	}
-
-	@RequestMapping(value = "/historyMessage")
-	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
-										 @RequestParam String code, @RequestParam String type) {
-		return scheduleRealInfoService.historyMessage(line, date, code, type);
-	}
-
-	@RequestMapping(value="/findLine")
-	public List<Map<String,String>> findLine(@RequestParam String line){
-		return scheduleRealInfoService.findLine(line);
-	}
-
-	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
-	public Map<String,Object> findKMBC(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
-	}
-
-	/**
-	 * 路单公里统计 （闵行审计专用）
-	 * @param jGh
-	 * @param clZbh
-	 * @param lpName
-	 * @param date
-	 * @param line
-	 * @return
-	 */
-	@RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
-	public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
-	}
-
-	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
-	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
-	}
-
-	@RequestMapping(value="/findLpName")
-	public List<Map<String,String>> findLpName(@RequestParam String lpName){
-		return scheduleRealInfoService.findLpName(lpName);
-	}
-
-	@RequestMapping(value = "/account")
-	public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
-											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
-		return scheduleRealInfoService.account(line, date, code, xlName, type);
-	}
-	
-	@RequestMapping(value = "/accountPx")
-	public List<Map<String,Object>> accountPx(@RequestParam String line, @RequestParam String date,
-											@RequestParam String code,@RequestParam String xlName, @RequestParam String px) {
-		return scheduleRealInfoService.accountPx(line, date, code, xlName, px);
-	}
-
-	@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,@RequestParam String changType) {
-		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type,changType);
-	}
-	/**
-	 * @Title queryListWaybill
-	 * @Description 查询行车路单列表
-	 * @param jGh 驾驶员名字
-	 * @param clZbh 车辆自编号（内部编号）
-	 * @param lpName 路牌
-	 * @return
-	 */
-	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybill(jGh, clZbh,lpName,date,line);
-	}
-
-	/**
-	 * @Title queryListWaybill
-	 * @Description 查询行车路单列表（闵行审计专用路单）
-	 * @param jName 驾驶员名字
-	 * @param clZbh 车辆自编号（内部编号）
-	 * @param lpName 路牌
-	 * @return
-	 */
-	@RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
-	}
-
-	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
-													 @RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
-	}
-
-	@RequestMapping(value="/statisticsDaily")
-	public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
-													@RequestParam String xlName, @RequestParam String type){
-		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
-	}
-
-	@RequestMapping(value="/statisticsDaily_mh_2")
-	public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
-													@RequestParam String xlName, @RequestParam String type){
-		return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
-	}
-
-	@RequestMapping(value="/statisticsDailyTj")
-	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		String type="";
-		if(map.get("type")!=null){
-			type=map.get("type").toString();
-		}
-		String nature="0";
-		if(map.get("nature")!=null){
-			nature=map.get("nature").toString();
-		}
-		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type,nature);
-	}
-	
-	/*
-	 * 公里修正报表
-	 */
-	@RequestMapping(value="/mileageReportTj")
-	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
-	}
-	
-	/*
-	 * 班次修正报表
-	 */
-	@RequestMapping(value="/scheduleCorrectionReport")
-	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
-	}
-
-	@RequestMapping(value="/MapById",method = RequestMethod.GET)
-	public Map<String, Object> MapById(@RequestParam("id") Long id){
-		return scheduleRealInfoService.MapById(id);
-	}
-	
-	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
-	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
-		return scheduleRealInfoService.MapByIdQp(id);
-	}
-
-	/**
-	 * @Title: scheduleDaily
-	 * @Description: TODO(调度日报表)
-	 * @param line 线路
-	 * @param date 时间
-	 * @return
-	 */
-	@RequestMapping(value="/scheduleDaily")
-	public Map<String,Object> scheduleDaily(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.scheduleDaily(line,date);
-	}
-
-	@RequestMapping(value="/realScheduleList")
-	public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList(line,date);
-	}
-
-	@RequestMapping(value="/realScheduleList_zrw")
-	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList_zrw(line,date);
-	}
-	
-	@RequestMapping(value="/realScheduleList_mh_2")
-	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
-	}
-
-	@RequestMapping(value="/realScheduleListQp")
-	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleListQp(line,date);
-	}
-
-	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
-	public synchronized Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
-		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
-		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
-		return scheduleRealInfoService.multi_tzrc(cpcs, null);
-	}
-
-	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
-	public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
-		dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
-		List<DfsjChange> dfsjcs = JSONArray.parseArray(dcsJson, DfsjChange.class);
-		return scheduleRealInfoService.multi_dftz(dfsjcs);
-	}
-
-	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
-	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
-		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
-	}
-
-	@RequestMapping(value="/history", method=RequestMethod.POST)
-	public Map<String,Object> historySave(ScheduleRealInfo sch){
-		return scheduleRealInfoService.historySave(sch);
-	}
-
-
-	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
-	private final static long ONE_DAY = 1000 * 60 * 60 * 24;
-	/**
-	 * 获取可编辑的历史班次日期
-	 * @return
-	 */
-	@RequestMapping("dateArray")
-	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
-		List<String> rs = new ArrayList<>();
-
-		long t = System.currentTimeMillis();
-		if(c != 1)
-			t -= (ONE_DAY + (1000 * 60 * 60 * 6));
-		for(int i = 0; i < 3; i ++){
-			rs.add(fmtyyyyMMdd.print(t));
-			t -= ONE_DAY;
-		}
-		return rs;
-	}
-
-	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
-	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
-		return scheduleRealInfoService.svgAttr(jsonStr);
-	}
-
-	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
-	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
-		return scheduleRealInfoService.findSvgAttr(idx);
-	}
-
-	@RequestMapping(value = "addRemarks", method = RequestMethod.POST)
-	public Map<String, Object> addRemarks(@RequestParam Long id, @RequestParam String remarks){
-		return scheduleRealInfoService.addRemarks(id, remarks);
-	}
-
-	@RequestMapping(value = "scheduleDailyQp", method = RequestMethod.GET)
-	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.scheduleDailyQp(line,date);
-	}
-
-	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
-	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
-		return scheduleRealInfoService.scheduleDailyExport(map);
-	}
-
-	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
-	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
-		return scheduleRealInfoService.exportWaybillMore(map);
-	}
-
-	/**
-	 * 获取当日计划排班 ， 从计划表抓取数据
-	 * @return
-	 */
-	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
-	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
-		return scheduleRealInfoService.currentSchedulePlan(lineCode);
-	}
-
-	@RequestMapping(value = "lpChangeMulti", method = RequestMethod.POST)
-	public Map<String, Object> lpChangeMulti(@RequestParam String leftIdx, @RequestParam String rightIdx,@RequestParam int type){
-		return scheduleRealInfoService.lpChangeMulti(leftIdx, rightIdx, type);
-	}
-
-	/**
-	 * 删除当日实际排班
-	 * @return
-	 */
-	@RequestMapping(value = "deleteRealSchedule", method = RequestMethod.POST)
-	public Map<String, Object> deleteRealSchedule(@RequestParam String lineCode){
-		return dayOfSchedule.deleteRealSchedule(lineCode);
-	}
-
-	/**
-	 * 从计划表重新加载当日排班
-	 * @param lineCode
-	 * @return
-	 */
-	@RequestMapping(value = "reLoadRealSchedule", method = RequestMethod.POST)
-	public Map<String, Object> reLoadRealSchedule(@RequestParam String lineCode){
-		Map<String, Object> rs = new HashMap<>();
-		List<ScheduleRealInfo> list = dayOfSchedule.findByLineCode(lineCode);
-		if(list != null && list.size() > 0){
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", "失败，" + list.get(0).getXlName() + "当日存在实际排班，无法重新加载。");
-			return rs;
-		}
-
-		int code = dayOfSchedule.reloadSch(lineCode);
-
-		//重新按公司编码索引数据
-		dayOfSchedule.groupByGsbm();
-		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
-		return rs;
-	}
-
-	/**
-	 * 误点调整
-	 * @param idx
-	 * @param minute
-	 * @return
-	 */
-	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
-	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
-		return scheduleRealInfoService.lateAdjust(idx, minute);
-	}
-
-	/**
-	 * 获取所有应发未到的班次
-	 * @param idx
-	 * @return
-	 */
-	@RequestMapping(value = "allLate2")
-	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
-		return scheduleRealInfoService.allLate2(idx);
-	}
-
-	/**
-	 * 添加一个临加到历史库
-	 * @param sch
-	 * @return
-	 */
-	@RequestMapping(value = "history/add", method = RequestMethod.POST)
-	public Map<String, Object> addToHistory(ScheduleRealInfo sch){
-		return scheduleRealInfoService.addToHistory(sch);
-	}
-
-	/**
-	 * 从历史库里删除临加班次
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "history/{id}", method = RequestMethod.DELETE)
-	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
-		return scheduleRealInfoService.deleteToHistory(id);
-	}
-
-    @RequestMapping(value = "isCircleQdz", method = RequestMethod.POST)
-    public Map<String, Object> isCircleQdz(@RequestParam String line,  String nbbm, String ts, String qdzCode){
-        Map<String, Object> map =new HashMap<>();
-        map.put("isExist",scheduleRealInfoService.isCircleQdz(nbbm, ts, line, qdzCode));
-	    return map;
-    }
-	
-	/**
-	 * 从历史库里删除临加班次
-	 * @param param
-	 * @return
-	 */
-	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
-	public Map<String, Object> repairReport(@RequestParam Map<String, Object> param){
-		return scheduleRealInfoService.repairReport(param, true);
-	}
-	
-	@RequestMapping(value = "wxsb", method = RequestMethod.GET)
-	public List<RepairReport> repairReportList(@RequestParam String line, @RequestParam String date, @RequestParam String code, @RequestParam String type){
-		return scheduleRealInfoService.repairReportList(line, date, code, type);
-	}
-	
-	@RequestMapping(value = "lineLevel", method = RequestMethod.GET)
-	public Map<String, String> lineLevel(@RequestParam String idx){
-		return scheduleRealInfoService.getLevelsByLines(Arrays.asList(idx.split(",")));
-	}
-
-	/**
-	 * 反馈安全驾驶系统
-	 * @param param
-	 * @return
-	 */
-	@RequestMapping(value = "ackDsm", method = RequestMethod.POST)
-	public Map<String, Object> ackDsm(@RequestParam Map<String, Object> param){
-		Map<String, Object> res = new HashMap<>();
-		InputStream in = null;
-		SysUser user = SecurityUtils.getCurrentUser();
-		DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
-		StringBuilder url = new StringBuilder("http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?"), uri = new StringBuilder();
-		HttpURLConnection con = null;
-		try {
-			uri.append("ddyName=").append(URLEncoder.encode(user == null ? "admin" : user.getUserName(), "UTF-8"));
-			uri.append("&checkTime=").append(URLEncoder.encode(fmt.print(System.currentTimeMillis()), "UTF-8"));
-			uri.append("&nbbm=").append(URLEncoder.encode(param.get("nbbm").toString(), "UTF-8"));
-			uri.append("&starttime=").append(URLEncoder.encode(fmt.print(Long.parseLong(param.get("ts").toString())), "UTF-8"));
-			url.append(uri);
-			con = (HttpURLConnection)new URL(url.toString()).openConnection();
-			con.setDoInput(true);
-			con.setRequestMethod("POST");
-			con.setConnectTimeout(5000);
-			con.setReadTimeout(5000);
-			con.setRequestProperty("keep-alive", "true");
-			con.setRequestProperty("accept", "*/*");
-			con.setRequestProperty("content-type", "application/x-www-form-urlencoded");
-			con.connect();
-
-			if (con.getResponseCode() == 200) {
-				in = con.getInputStream();
-				ByteArrayOutputStream bout = new ByteArrayOutputStream();
-				IOUtils.copy(in, bout);
-				Map<String, Object> map = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
-				System.out.println(map);
-			}
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			if (con != null) {
-				con.disconnect();
-			}
-		}
-
-		return res;
-	}
-
-	@RequestMapping(value = "exportPlan", method = RequestMethod.GET)
-	public Map<String, Object> exportPlan(@RequestParam String date){
-		Map<String, Object> res = new HashMap<>();
-		DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm");
-		Connection conn = null;
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-
-		List<Map<String, Object>> list = new ArrayList<>();
-		String sql = "select xl_name,xl_dir,schedule_date,fcsj,cl_zbh,j_name,bcsj from bsth_c_s_sp_info where schedule_date = ? and xl_bm in (22205, 202104, 202105, 202106, 202107, 210415) and bc_type = 'normal'";
-		try{
-			conn = DBUtils_control.getConnection();
-			ps = conn.prepareStatement(sql);
-			ps.setString(1, date);
-			rs = ps.executeQuery();
-			ObjectMapper mapper = new ObjectMapper();
-
-			while (rs.next()) {
-				SchedulePlan schedulePlan = new SchedulePlan();
-				schedulePlan.setXlName(rs.getString("xl_name"));
-				schedulePlan.setXlDir(rs.getInt("xl_dir"));
-				Date scheduleDate = rs.getDate("schedule_date");
-				schedulePlan.setScheduleDate(new DateTime(scheduleDate.getTime()).toString("yyyy-MM-dd"));
-				String fcsj = rs.getString("fcsj");
-				int bcsj = rs.getInt("bcsj");
-				DateTime fcsjDt = dateTimeFormatter.parseDateTime(schedulePlan.getScheduleDate() + " " + fcsj);
-				schedulePlan.setFcsj(fcsjDt.toString("HH:mm:00"));
-				DateTime ddsjDt = fcsjDt.plusMinutes(bcsj);
-				schedulePlan.setDdsj(ddsjDt.toString("HH:mm:00"));
-				schedulePlan.setSjdStart(fcsjDt.toString("HH:00:00"));
-				DateTime endDt = fcsjDt.plusHours(1);
-				schedulePlan.setSjdEnd(endDt.toString("HH:00:00"));
-				schedulePlan.setClZbh(rs.getString("cl_zbh"));
-				schedulePlan.setJsy(rs.getString("j_name"));
-				schedulePlan.setBcsj(bcsj);
-
-				list.add(mapper.readValue(mapper.writeValueAsString(schedulePlan), HashMap.class));
-			}
-			List<Iterator<?>> iterators = new ArrayList<Iterator<?>>();
-			iterators.add(list.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			String sourcePath = path + "mould/schedulePlan.xls";
-
-			new ReportUtils().excelReplace(iterators, new Object[]{}, sourcePath, path + "export/" + date + "-花博会专线班次.xls");
-
-			res.put("status", ResponseCode.SUCCESS);
-			res.put("msg", "成功");
-		} catch (Exception e) {
-			res.put("status", ResponseCode.ERROR);
-			res.put("msg", e.getMessage());
-		} finally {
-			DBUtils_control.close(rs, ps, conn);
-		}
-
-		return res;
-	}
-
-	public final static class SchedulePlan {
-		private String company = "浦东公司[46]";
-
-		private String xlName = "";
-
-		private int xlDir;
-
-		private String xlDirStr = "";
-
-		private String scheduleDate = "";
-
-		private String sjdStart = "";
-
-		private String sjdEnd = "";
-
-		private String fcsj = "";
-
-		private int bcsj;
-
-		private String ddsj = "";
-
-		private int yys = 25;
-
-		private String clZbh = "";
-
-		private String cph = "";
-
-		private String color = "绿牌";
-
-		private String jsy = "";
-
-		private String jsydh = "";
-
-		private int pj = 10;
-
-		public String getCompany() {
-			return company;
-		}
-
-		public void setCompany(String company) {
-			this.company = company;
-		}
-
-		public String getXlName() {
-			return xlName;
-		}
-
-		public void setXlName(String xlName) {
-			this.xlName = xlName;
-		}
-
-		public int getXlDir() {
-			return xlDir;
-		}
-
-		public void setXlDir(int xlDir) {
-			this.xlDir = xlDir;
-		}
-
-		public String getXlDirStr() {
-			xlDirStr = "";
-			if (xlDir == 0) {
-				xlDirStr = "上行";
-			} else if (xlDir == 1) {
-				xlDirStr = "下行";
-			}
-			return xlDirStr;
-		}
-
-		public void setXlDirStr(String xlDirStr) {
-			this.xlDirStr = xlDirStr;
-		}
-
-		public String getScheduleDate() {
-			return scheduleDate;
-		}
-
-		public void setScheduleDate(String scheduleDate) {
-			this.scheduleDate = scheduleDate;
-		}
-
-		public String getSjdStart() {
-			return sjdStart;
-		}
-
-		public void setSjdStart(String sjdStart) {
-			this.sjdStart = sjdStart;
-		}
-
-		public String getSjdEnd() {
-			return sjdEnd;
-		}
-
-		public void setSjdEnd(String sjdEnd) {
-			this.sjdEnd = sjdEnd;
-		}
-
-		public String getFcsj() {
-			return fcsj;
-		}
-
-		public void setFcsj(String fcsj) {
-			this.fcsj = fcsj;
-		}
-
-		public int getBcsj() {
-			return bcsj;
-		}
-
-		public void setBcsj(int bcsj) {
-			this.bcsj = bcsj;
-		}
-
-		public String getDdsj() {
-			return ddsj;
-		}
-
-		public void setDdsj(String ddsj) {
-			this.ddsj = ddsj;
-		}
-
-		public int getYys() {
-			return yys;
-		}
-
-		public void setYys(int yys) {
-			this.yys = yys;
-		}
-
-		public String getClZbh() {
-			return clZbh;
-		}
-
-		public void setClZbh(String clZbh) {
-			this.clZbh = clZbh;
-		}
-
-		public String getCph() {
-			cph = BasicData.nbbmCompanyPlateMap.get(clZbh);
-			if (cph == null) {
-				cph = "";
-			}
-			return cph;
-		}
-
-		public void setCph(String cph) {
-			this.cph = cph;
-		}
-
-		public String getColor() {
-			return color;
-		}
-
-		public void setColor(String color) {
-			this.color = color;
-		}
-
-		public String getJsy() {
-			return jsy;
-		}
-
-		public void setJsy(String jsy) {
-			this.jsy = jsy;
-		}
-
-		public String getJsydh() {
-			return jsydh;
-		}
-
-		public void setJsydh(String jsydh) {
-			this.jsydh = jsydh;
-		}
-
-		public int getPj() {
-			return pj;
-		}
-
-		public void setPj(int pj) {
-			this.pj = pj;
-		}
-	}
-}
+package com.bsth.controller.realcontrol;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.*;
+
+import com.bsth.data.forecast.entity.ArrivalEntity;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.util.ReportUtils;
+import com.bsth.util.db.DBUtils_MS;
+import com.bsth.util.db.DBUtils_control;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.BaseController;
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.controller.realcontrol.dto.DfsjChange;
+import com.bsth.data.BasicData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.report.RepairReport;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+
+@RestController
+@RequestMapping("/realSchedule")
+public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
+
+	@Autowired
+	ScheduleRealInfoService scheduleRealInfoService;
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+
+	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
+	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId, String jGh, String sGh, String nbbm){
+		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
+	}
+
+	@RequestMapping(value = "/lines")
+	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
+		return scheduleRealInfoService.findByLines(lines);
+	}
+
+	@RequestMapping(value = "/car")
+	public List<ScheduleRealInfo> findByCar(String nbbm){
+		return dayOfSchedule.findByNbbm(nbbm);
+	}
+
+	/**
+	 *
+	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
+	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
+	 */
+	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
+										   @RequestParam String dfsj,String bcType,
+										   @RequestParam(defaultValue = "") String opType) {
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
+	}
+
+	/**
+	 *
+	 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID ,分隔 
+	 */
+	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
+	public Map<String, Object> destroy(@RequestParam String idsStr
+			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
+									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
+		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
+	}
+
+	/**
+	 *
+	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
+	 */
+	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
+	public Map<String, String> carDeviceMapp() {
+		return BasicData.deviceId2NbbmMap.inverse();
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/driver", method = RequestMethod.GET)
+	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findDriverByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/conductor", method = RequestMethod.GET)
+	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findConductorByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/cars", method = RequestMethod.GET)
+	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findCarByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
+	 */
+	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
+	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
+		return scheduleRealInfoService.sreachVehic(nbbm);
+	}
+	/**
+	 *
+	 * @Title: realOutAdjust
+	 * @Description: TODO(实发调整)
+	 * @param @param id 班次ID
+	 * @param @param fcsjActual 实际发车时间 HH:mm
+	 * @param @param remarks 备注
+	 * @throws
+	 */
+	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
+	public Map<String, Object> realOutAdjust(@RequestParam Map<String, String> map) {
+		return scheduleRealInfoService.realOutAdjust(map);
+	}
+
+	/**
+	 *
+	 * @Title: revokeDestroy
+	 * @Description: TODO(撤销烂班)
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/revokeDestroy", method = RequestMethod.POST)
+	public Map<String, Object> revokeDestroy(@RequestParam Long id){
+		return scheduleRealInfoService.revokeDestroy(id);
+	}
+
+	/**
+	 *
+	 * @Title: revokeRealOutgo
+	 * @Description: TODO(撤销实发)
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/revokeRealOutgo", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealOutgo(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealOutgo(id);
+	}
+
+	/**
+	 * 撤销执行
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/revokeRealArrive", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealArrive(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealArrive(id);
+	}
+
+	/**
+	 *
+	 * @Title: spaceAdjust
+	 * @Description: TODO(间隔调整)
+	 * @param @param ids 要调整的班次数组ID
+	 * @param @param space 间隔
+	 * @throws
+	 */
+	@RequestMapping(value = "/spaceAdjust", method = RequestMethod.POST)
+	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
+		return scheduleRealInfoService.spaceAdjust(ids, space);
+	}
+
+	/**
+	 *
+	 * @Title: schInfoFineTune
+	 * @Description: TODO(发车信息微调)
+	 * @param @param map
+	 * @throws
+	 */
+	@RequestMapping(value = "/schInfoFineTune", method = RequestMethod.POST)
+	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
+		return scheduleRealInfoService.schInfoFineTune(map);
+	}
+
+	/**
+	 *
+	 * @Title: outgoAdjustAll
+	 * @Description: TODO(批量待发调整)
+	 * @param @param list
+	 * @throws
+	 */
+	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
+		//反转义
+		params = StringEscapeUtils.unescapeHtml4(params);
+		return scheduleRealInfoService.outgoAdjustAll(params);
+	}
+
+	/**
+	 *
+	 * @Title: findByLineAndUpDown
+	 * @Description: TODO(根据线路和走向获取班次)
+	 * @param @param line
+	 * @param @param upDown
+	 */
+	@RequestMapping(value = "/findByLineAndUpDown")
+	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
+		return dayOfSchedule.findByLineAndUpDown(line, upDown);
+	}
+
+	/**
+	 *
+	 * @Title: findRouteByLine
+	 * @Description: TODO(获取线路的站点，路段路由)
+	 * @param @param lineCode
+	 * @throws
+	 */
+	@RequestMapping(value = "/findRouteByLine")
+	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
+		return scheduleRealInfoService.findRouteByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: removeChildTask
+	 * @Description: TODO(删除子任务)
+	 * @param @param taskId 子任务ID
+	 * @throws
+	 */
+	@RequestMapping(value = "/childTask/{taskId}", method = RequestMethod.DELETE)
+	public Map<String, Object> removeChildTask(@PathVariable("taskId") Long taskId){
+		return scheduleRealInfoService.removeChildTask(taskId);
+	}
+
+	/**
+	 *
+	 * @Title: findByLineCode
+	 * @Description: TODO(根据线路获取班次信息)
+	 * @param @param lineCode
+	 */
+	@RequestMapping(value = "/lineCode/{lineCode}")
+	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
+		return dayOfSchedule.findByLineCode(lineCode);
+	}
+
+	@RequestMapping(value = "/queryUserInfo")
+	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
+												@RequestParam String date,@RequestParam String state) {
+		return scheduleRealInfoService.queryUserInfo(line, date,state);
+	}
+
+	@RequestMapping(value = "/queryUserInfoPx")
+	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
+												  @RequestParam String date,@RequestParam String state,@RequestParam String type) {
+		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
+	}
+
+	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName,@RequestParam String jGh, @RequestParam String clZbh,
+												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybill(jName,jGh, clZbh, lpName,date,line);
+	}
+
+	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
+	}
+
+
+	@RequestMapping(value = "/dailyInfo")
+	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
+		return scheduleRealInfoService.dailyInfo(line, date, type);
+	}
+
+	@RequestMapping(value = "/historyMessage")
+	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
+										 @RequestParam String code, @RequestParam String type) {
+		return scheduleRealInfoService.historyMessage(line, date, code, type);
+	}
+
+	@RequestMapping(value="/findLine")
+	public List<Map<String,String>> findLine(@RequestParam String line){
+		return scheduleRealInfoService.findLine(line);
+	}
+
+	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
+	public Map<String,Object> findKMBC(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
+	}
+
+	/**
+	 * 路单公里统计 （闵行审计专用）
+	 * @param jGh
+	 * @param clZbh
+	 * @param lpName
+	 * @param date
+	 * @param line
+	 * @return
+	 */
+	@RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
+	public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
+	}
+
+	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
+	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
+	}
+
+	@RequestMapping(value="/findLpName")
+	public List<Map<String,String>> findLpName(@RequestParam String lpName){
+		return scheduleRealInfoService.findLpName(lpName);
+	}
+
+	@RequestMapping(value = "/account")
+	public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
+		return scheduleRealInfoService.account(line, date, code, xlName, type);
+	}
+	
+	@RequestMapping(value = "/accountPx")
+	public List<Map<String,Object>> accountPx(@RequestParam String line, @RequestParam String date,
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String px) {
+		return scheduleRealInfoService.accountPx(line, date, code, xlName, px);
+	}
+
+	@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,@RequestParam String changType) {
+		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type,changType);
+	}
+	/**
+	 * @Title queryListWaybill
+	 * @Description 查询行车路单列表
+	 * @param jGh 驾驶员名字
+	 * @param clZbh 车辆自编号（内部编号）
+	 * @param lpName 路牌
+	 * @return
+	 */
+	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill(jGh, clZbh,lpName,date,line);
+	}
+
+	/**
+	 * @Title queryListWaybill
+	 * @Description 查询行车路单列表（闵行审计专用路单）
+	 * @param jName 驾驶员名字
+	 * @param clZbh 车辆自编号（内部编号）
+	 * @param lpName 路牌
+	 * @return
+	 */
+	@RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
+	}
+
+	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
+													 @RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
+	}
+
+	@RequestMapping(value="/statisticsDaily")
+	public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
+													@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
+	}
+
+	@RequestMapping(value="/statisticsDaily_mh_2")
+	public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
+													@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
+	}
+
+	@RequestMapping(value="/dispatchDailySum")
+	public List<Map<String,Object>> dispatchDailySum(@RequestParam Map<String, Object> map){
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		return scheduleRealInfoService.dispatchDailySum(date, date2, nature, type);
+	}
+
+	@RequestMapping(value="/statisticsDailyTj")
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type,nature);
+	}
+	
+	/*
+	 * 公里修正报表
+	 */
+	@RequestMapping(value="/mileageReportTj")
+	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
+	}
+	
+	/*
+	 * 班次修正报表
+	 */
+	@RequestMapping(value="/scheduleCorrectionReport")
+	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
+	}
+
+	@RequestMapping(value="/MapById",method = RequestMethod.GET)
+	public Map<String, Object> MapById(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapById(id);
+	}
+	
+	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
+	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapByIdQp(id);
+	}
+
+	/**
+	 * @Title: scheduleDaily
+	 * @Description: TODO(调度日报表)
+	 * @param line 线路
+	 * @param date 时间
+	 * @return
+	 */
+	@RequestMapping(value="/scheduleDaily")
+	public Map<String,Object> scheduleDaily(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.scheduleDaily(line,date);
+	}
+
+	@RequestMapping(value="/realScheduleList")
+	public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList(line,date);
+	}
+
+	@RequestMapping(value="/realScheduleList_zrw")
+	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_zrw(line,date);
+	}
+	
+	@RequestMapping(value="/realScheduleList_mh_2")
+	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
+	}
+
+	@RequestMapping(value="/realScheduleListQp")
+	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleListQp(line,date);
+	}
+
+	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
+	public synchronized Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
+		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
+		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
+		return scheduleRealInfoService.multi_tzrc(cpcs, null);
+	}
+
+	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
+	public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
+		dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
+		List<DfsjChange> dfsjcs = JSONArray.parseArray(dcsJson, DfsjChange.class);
+		return scheduleRealInfoService.multi_dftz(dfsjcs);
+	}
+
+	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
+	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
+		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
+	}
+
+	@RequestMapping(value="/history", method=RequestMethod.POST)
+	public Map<String,Object> historySave(ScheduleRealInfo sch){
+		return scheduleRealInfoService.historySave(sch);
+	}
+
+
+	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+	private final static long ONE_DAY = 1000 * 60 * 60 * 24;
+	/**
+	 * 获取可编辑的历史班次日期
+	 * @return
+	 */
+	@RequestMapping("dateArray")
+	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
+		List<String> rs = new ArrayList<>();
+
+		long t = System.currentTimeMillis();
+		if(c != 1)
+			t -= (ONE_DAY + (1000 * 60 * 60 * 6));
+		for(int i = 0; i < 3; i ++){
+			rs.add(fmtyyyyMMdd.print(t));
+			t -= ONE_DAY;
+		}
+		return rs;
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
+	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
+		return scheduleRealInfoService.svgAttr(jsonStr);
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
+	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
+		return scheduleRealInfoService.findSvgAttr(idx);
+	}
+
+	@RequestMapping(value = "addRemarks", method = RequestMethod.POST)
+	public Map<String, Object> addRemarks(@RequestParam Long id, @RequestParam String remarks){
+		return scheduleRealInfoService.addRemarks(id, remarks);
+	}
+
+	@RequestMapping(value = "scheduleDailyQp", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.scheduleDailyQp(line,date);
+	}
+
+	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.scheduleDailyExport(map);
+	}
+
+	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
+	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.exportWaybillMore(map);
+	}
+
+	/**
+	 * 获取当日计划排班 ， 从计划表抓取数据
+	 * @return
+	 */
+	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
+	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
+		return scheduleRealInfoService.currentSchedulePlan(lineCode);
+	}
+
+	@RequestMapping(value = "lpChangeMulti", method = RequestMethod.POST)
+	public Map<String, Object> lpChangeMulti(@RequestParam String leftIdx, @RequestParam String rightIdx,@RequestParam int type){
+		return scheduleRealInfoService.lpChangeMulti(leftIdx, rightIdx, type);
+	}
+
+	/**
+	 * 删除当日实际排班
+	 * @return
+	 */
+	@RequestMapping(value = "deleteRealSchedule", method = RequestMethod.POST)
+	public Map<String, Object> deleteRealSchedule(@RequestParam String lineCode){
+		return dayOfSchedule.deleteRealSchedule(lineCode);
+	}
+
+	/**
+	 * 从计划表重新加载当日排班
+	 * @param lineCode
+	 * @return
+	 */
+	@RequestMapping(value = "reLoadRealSchedule", method = RequestMethod.POST)
+	public Map<String, Object> reLoadRealSchedule(@RequestParam String lineCode){
+		Map<String, Object> rs = new HashMap<>();
+		List<ScheduleRealInfo> list = dayOfSchedule.findByLineCode(lineCode);
+		if(list != null && list.size() > 0){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", "失败，" + list.get(0).getXlName() + "当日存在实际排班，无法重新加载。");
+			return rs;
+		}
+
+		int code = dayOfSchedule.reloadSch(lineCode);
+
+		//重新按公司编码索引数据
+		dayOfSchedule.groupByGsbm();
+		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
+		return rs;
+	}
+
+	/**
+	 * 误点调整
+	 * @param idx
+	 * @param minute
+	 * @return
+	 */
+	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
+	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
+		return scheduleRealInfoService.lateAdjust(idx, minute);
+	}
+
+	/**
+	 * 获取所有应发未到的班次
+	 * @param idx
+	 * @return
+	 */
+	@RequestMapping(value = "allLate2")
+	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
+		return scheduleRealInfoService.allLate2(idx);
+	}
+
+	/**
+	 * 添加一个临加到历史库
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "history/add", method = RequestMethod.POST)
+	public Map<String, Object> addToHistory(ScheduleRealInfo sch){
+		return scheduleRealInfoService.addToHistory(sch);
+	}
+
+	/**
+	 * 从历史库里删除临加班次
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "history/{id}", method = RequestMethod.DELETE)
+	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
+		return scheduleRealInfoService.deleteToHistory(id);
+	}
+
+    @RequestMapping(value = "isCircleQdz", method = RequestMethod.POST)
+    public Map<String, Object> isCircleQdz(@RequestParam String line,  String nbbm, String ts, String qdzCode){
+        Map<String, Object> map =new HashMap<>();
+        map.put("isExist",scheduleRealInfoService.isCircleQdz(nbbm, ts, line, qdzCode));
+	    return map;
+    }
+	
+	/**
+	 * 从历史库里删除临加班次
+	 * @param param
+	 * @return
+	 */
+	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
+	public Map<String, Object> repairReport(@RequestParam Map<String, Object> param){
+		return scheduleRealInfoService.repairReport(param, true);
+	}
+	
+	@RequestMapping(value = "wxsb", method = RequestMethod.GET)
+	public List<RepairReport> repairReportList(@RequestParam String line, @RequestParam String date, @RequestParam String code, @RequestParam String type){
+		return scheduleRealInfoService.repairReportList(line, date, code, type);
+	}
+	
+	@RequestMapping(value = "lineLevel", method = RequestMethod.GET)
+	public Map<String, String> lineLevel(@RequestParam String idx){
+		return scheduleRealInfoService.getLevelsByLines(Arrays.asList(idx.split(",")));
+	}
+
+	/**
+	 * 反馈安全驾驶系统
+	 * @param param
+	 * @return
+	 */
+	@RequestMapping(value = "ackDsm", method = RequestMethod.POST)
+	public Map<String, Object> ackDsm(@RequestParam Map<String, Object> param){
+		Map<String, Object> res = new HashMap<>();
+		InputStream in = null;
+		SysUser user = SecurityUtils.getCurrentUser();
+		DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+		StringBuilder url = new StringBuilder("http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?"), uri = new StringBuilder();
+		HttpURLConnection con = null;
+		try {
+			uri.append("ddyName=").append(URLEncoder.encode(user == null ? "admin" : user.getUserName(), "UTF-8"));
+			uri.append("&checkTime=").append(URLEncoder.encode(fmt.print(System.currentTimeMillis()), "UTF-8"));
+			uri.append("&nbbm=").append(URLEncoder.encode(param.get("nbbm").toString(), "UTF-8"));
+			uri.append("&starttime=").append(URLEncoder.encode(fmt.print(Long.parseLong(param.get("ts").toString())), "UTF-8"));
+			url.append(uri);
+			con = (HttpURLConnection)new URL(url.toString()).openConnection();
+			con.setDoInput(true);
+			con.setRequestMethod("POST");
+			con.setConnectTimeout(5000);
+			con.setReadTimeout(5000);
+			con.setRequestProperty("keep-alive", "true");
+			con.setRequestProperty("accept", "*/*");
+			con.setRequestProperty("content-type", "application/x-www-form-urlencoded");
+			con.connect();
+
+			if (con.getResponseCode() == 200) {
+				in = con.getInputStream();
+				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+				IOUtils.copy(in, bout);
+				Map<String, Object> map = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+				System.out.println(map);
+			}
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			if (con != null) {
+				con.disconnect();
+			}
+		}
+
+		return res;
+	}
+
+	@RequestMapping(value = "exportPlan", method = RequestMethod.GET)
+	public Map<String, Object> exportPlan(@RequestParam String date){
+		Map<String, Object> res = new HashMap<>();
+		DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm");
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+
+		List<Map<String, Object>> list = new ArrayList<>();
+		String sql = "select xl_name,xl_dir,schedule_date,fcsj,cl_zbh,j_name,bcsj from bsth_c_s_sp_info where schedule_date = ? and xl_bm in (22205, 202104, 202105, 202106, 202107, 210415) and bc_type = 'normal'";
+		try{
+			conn = DBUtils_control.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setString(1, date);
+			rs = ps.executeQuery();
+			ObjectMapper mapper = new ObjectMapper();
+
+			while (rs.next()) {
+				SchedulePlan schedulePlan = new SchedulePlan();
+				schedulePlan.setXlName(rs.getString("xl_name"));
+				schedulePlan.setXlDir(rs.getInt("xl_dir"));
+				Date scheduleDate = rs.getDate("schedule_date");
+				schedulePlan.setScheduleDate(new DateTime(scheduleDate.getTime()).toString("yyyy-MM-dd"));
+				String fcsj = rs.getString("fcsj");
+				int bcsj = rs.getInt("bcsj");
+				DateTime fcsjDt = dateTimeFormatter.parseDateTime(schedulePlan.getScheduleDate() + " " + fcsj);
+				schedulePlan.setFcsj(fcsjDt.toString("HH:mm:00"));
+				DateTime ddsjDt = fcsjDt.plusMinutes(bcsj);
+				schedulePlan.setDdsj(ddsjDt.toString("HH:mm:00"));
+				schedulePlan.setSjdStart(fcsjDt.toString("HH:00:00"));
+				DateTime endDt = fcsjDt.plusHours(1);
+				schedulePlan.setSjdEnd(endDt.toString("HH:00:00"));
+				schedulePlan.setClZbh(rs.getString("cl_zbh"));
+				schedulePlan.setJsy(rs.getString("j_name"));
+				schedulePlan.setBcsj(bcsj);
+
+				list.add(mapper.readValue(mapper.writeValueAsString(schedulePlan), HashMap.class));
+			}
+			List<Iterator<?>> iterators = new ArrayList<Iterator<?>>();
+			iterators.add(list.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			String sourcePath = path + "mould/schedulePlan.xls";
+
+			new ReportUtils().excelReplace(iterators, new Object[]{}, sourcePath, path + "export/" + date + "-花博会专线班次.xls");
+
+			res.put("status", ResponseCode.SUCCESS);
+			res.put("msg", "成功");
+		} catch (Exception e) {
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", e.getMessage());
+		} finally {
+			DBUtils_control.close(rs, ps, conn);
+		}
+
+		return res;
+	}
+
+	public final static class SchedulePlan {
+		private String company = "浦东公司[46]";
+
+		private String xlName = "";
+
+		private int xlDir;
+
+		private String xlDirStr = "";
+
+		private String scheduleDate = "";
+
+		private String sjdStart = "";
+
+		private String sjdEnd = "";
+
+		private String fcsj = "";
+
+		private int bcsj;
+
+		private String ddsj = "";
+
+		private int yys = 25;
+
+		private String clZbh = "";
+
+		private String cph = "";
+
+		private String color = "绿牌";
+
+		private String jsy = "";
+
+		private String jsydh = "";
+
+		private int pj = 10;
+
+		public String getCompany() {
+			return company;
+		}
+
+		public void setCompany(String company) {
+			this.company = company;
+		}
+
+		public String getXlName() {
+			return xlName;
+		}
+
+		public void setXlName(String xlName) {
+			this.xlName = xlName;
+		}
+
+		public int getXlDir() {
+			return xlDir;
+		}
+
+		public void setXlDir(int xlDir) {
+			this.xlDir = xlDir;
+		}
+
+		public String getXlDirStr() {
+			xlDirStr = "";
+			if (xlDir == 0) {
+				xlDirStr = "上行";
+			} else if (xlDir == 1) {
+				xlDirStr = "下行";
+			}
+			return xlDirStr;
+		}
+
+		public void setXlDirStr(String xlDirStr) {
+			this.xlDirStr = xlDirStr;
+		}
+
+		public String getScheduleDate() {
+			return scheduleDate;
+		}
+
+		public void setScheduleDate(String scheduleDate) {
+			this.scheduleDate = scheduleDate;
+		}
+
+		public String getSjdStart() {
+			return sjdStart;
+		}
+
+		public void setSjdStart(String sjdStart) {
+			this.sjdStart = sjdStart;
+		}
+
+		public String getSjdEnd() {
+			return sjdEnd;
+		}
+
+		public void setSjdEnd(String sjdEnd) {
+			this.sjdEnd = sjdEnd;
+		}
+
+		public String getFcsj() {
+			return fcsj;
+		}
+
+		public void setFcsj(String fcsj) {
+			this.fcsj = fcsj;
+		}
+
+		public int getBcsj() {
+			return bcsj;
+		}
+
+		public void setBcsj(int bcsj) {
+			this.bcsj = bcsj;
+		}
+
+		public String getDdsj() {
+			return ddsj;
+		}
+
+		public void setDdsj(String ddsj) {
+			this.ddsj = ddsj;
+		}
+
+		public int getYys() {
+			return yys;
+		}
+
+		public void setYys(int yys) {
+			this.yys = yys;
+		}
+
+		public String getClZbh() {
+			return clZbh;
+		}
+
+		public void setClZbh(String clZbh) {
+			this.clZbh = clZbh;
+		}
+
+		public String getCph() {
+			cph = BasicData.nbbmCompanyPlateMap.get(clZbh);
+			if (cph == null) {
+				cph = "";
+			}
+			return cph;
+		}
+
+		public void setCph(String cph) {
+			this.cph = cph;
+		}
+
+		public String getColor() {
+			return color;
+		}
+
+		public void setColor(String color) {
+			this.color = color;
+		}
+
+		public String getJsy() {
+			return jsy;
+		}
+
+		public void setJsy(String jsy) {
+			this.jsy = jsy;
+		}
+
+		public String getJsydh() {
+			return jsydh;
+		}
+
+		public void setJsydh(String jsydh) {
+			this.jsydh = jsydh;
+		}
+
+		public int getPj() {
+			return pj;
+		}
+
+		public void setPj(int pj) {
+			this.pj = pj;
+		}
+	}
+}
@@ -304,6 +304,12 @@ public class ReportController {
 		return service.userList(map);
 	}
+	@RequestMapping(value="/countMileageSum")
+	public List<Map<String,Object>> countMileageSum(@RequestParam Map<String, Object> map){
+		
+		return service.countMileageSum(map);
+	}
+	
 	@RequestMapping(value="/countLineMileage")
 	public List<Map<String,Object>> countLineMileage(@RequestParam Map<String, Object> map){
@@ -61,13 +61,10 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
     }
     @RequestMapping(value = "/validate_get_destroy_info", method = RequestMethod.GET)
-    public Map<String, Object> validate_get_destroy_info(HttpServletRequest request) {
-        HttpSession session = request.getSession();
-        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
-
+    public Map<String, Object> validate_get_destroy_info() {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            rtn.put("data", this.employeeConfigInfoService.validate_get_destroy_info(cmyAuths));
+            rtn.put("data", this.employeeConfigInfoService.validate_get_destory_info());
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -77,21 +74,17 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         return rtn;
     }
     @GetMapping(value = "/validate_get_destroy_info/download")
-    public void exportValidateGetDestroyInfo(
-            HttpServletRequest request,
-            HttpServletResponse response) throws Exception {
+    public void exportValidateGetDestroyInfo(HttpServletResponse response) throws Exception {
         // 流输出导出文件
         response.setHeader("content-type", "application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("人员配置停用信息.txt", "UTF-8"));
+        response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("排班人员停用信息.txt", "UTF-8"));
         response.setContentType("application/octet-stream");
         try (
                 OutputStream os = response.getOutputStream();
                 PrintWriter printWriter = new PrintWriter(os);
         ) {
-            HttpSession session = request.getSession();
-            List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
-            List<String> infos = this.employeeConfigInfoService.validate_get_destroy_info(cmyAuths);
+            List<String> infos = this.employeeConfigInfoService.validate_get_destory_info();
             for (String info : infos) {
                 printWriter.println(info);
             }
@@ -10,6 +10,7 @@ import com.bsth.service.schedule.datatools.TTinfoDetailDynamicData;
 import com.bsth.service.schedule.timetable.ExcelFormatType;
 import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsFileType;
+import com.bsth.service.schedule.utils.MyHttpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.*;
@@ -118,12 +119,12 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
         }
         return rtn;
     }
-    
+
     /**
      * 时刻表明细批量插入
-     * 
+     *
      * @param entities
-     * 
+     *
      * @return
      */
     @RequestMapping(value = "/skbDetailMxSave" ,method = RequestMethod.POST)
@@ -131,6 +132,60 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
     	return ttInfoDetailService.skbDetailMxSave(entities);
     }
+    // 导出预览视图数据
+    @GetMapping(value = "/exportPvInfo/{id}")
+    public void exportPvInfo(@PathVariable("id") Long ttInfoId, HttpServletResponse response) throws Exception {
+        DataToolsFile dataToolsFile = this.ttInfoDetailService.exportPvInfo(ttInfoId);
+        MyHttpUtils.responseStreamFile(response, dataToolsFile.getFile());
+    }
+    // 添加路牌
+    @GetMapping(value = "/addLp/{ttInfoId}/{lpId}")
+    public Map<String, Object> addLp(@PathVariable("ttInfoId") Long ttInfoId, @PathVariable("lpId") Long lpId) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            this.ttInfoDetailService.addLp(ttInfoId, lpId);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", "添加路牌成功！");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", "添加路牌失败：" + exp.getMessage());
+        }
+        return rtn;
+    }
+    // 删除路牌
+    @GetMapping(value = "/removeLp/{ttInfoId}/{lpId}")
+    public Map<String, Object> removeLp(@PathVariable("ttInfoId") Long ttInfoId, @PathVariable("lpId") Long lpId) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            this.ttInfoDetailService.removeBcByLp(ttInfoId, lpId);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", "删除路牌成功！");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", "删除路牌失败：" + exp.getMessage());
+        }
+        return rtn;
+    }
+    // 调换路牌
+    @GetMapping(value = "/switchLp/{ttInfoId}/{lpAId}/{lpBId}")
+    public Map<String, Object> switchLp(@PathVariable("ttInfoId") Long ttInfoId,
+                                        @PathVariable("lpAId") Long lpAId,
+                                        @PathVariable("lpBId") Long lpBId) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            this.ttInfoDetailService.switchBcByLp(ttInfoId, lpAId, lpBId);
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", "调换路牌成功！");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", "调换路牌失败：" + exp.getMessage());
+        }
+        return rtn;
+    }
+
     @RequestMapping(value = "/exportDTDFile/{type}", method = RequestMethod.POST)
     public void exportFile(
@@ -6,13 +6,12 @@ import com.bsth.controller.schedule.datasync.request.VehicleDataSyncTaskRequest;
 import com.bsth.entity.schedule.datasync.VehicleDataSyncTask;
 import com.bsth.entity.schedule.datasync.VehicleDataSyncTaskTypeEnum;
 import com.bsth.service.schedule.datasync.VehicleDataSyncTaskService;
-import com.bsth.service.schedule.utils.MyStringUtils;
+import com.bsth.service.schedule.utils.MyHttpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URLEncoder;
+import java.io.File;
 import java.util.Date;
 @RestController
@@ -107,38 +106,11 @@ public class VehicleDataSyncController extends BController&lt;VehicleDataSyncTask, 
         }
         try {
-            responseStreamFile(response, file);
+            MyHttpUtils.responseStreamFile(response, file);
         } catch (Exception exp) {
             exp.printStackTrace();
             throw new RuntimeException("获取同步日志文件错误：" + exp.getMessage());
         }
     }
-    // 流输出文件
-    private void responseStreamFile(HttpServletResponse response, File file) throws IOException {
-        // 流输出导出文件
-        response.setHeader("content-type", "application/octet-stream");
-        String fileName = file.getName();
-        if (MyStringUtils.isContainChinese(fileName)) {
-            response.setHeader("Content-Disposition", "attachment; filename*=" + URLEncoder.encode(fileName, "UTF-8"));
-        } else {
-            response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
-        }
-        response.setContentType("application/octet-stream");
-
-        try (
-                OutputStream os = response.getOutputStream();
-                BufferedOutputStream bos = new BufferedOutputStream(os);
-                InputStream is = new FileInputStream(file);
-                BufferedInputStream bis = new BufferedInputStream(is)
-        ) {
-            int length;
-            byte[] temp = new byte[1024 * 10];
-            while ((length = bis.read(temp)) != -1) {
-                bos.write(temp, 0, length);
-            }
-            bos.flush();
-        }
-    }
-
 }
@@ -25,6 +25,7 @@ import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -52,6 +53,9 @@ import java.util.concurrent.ConcurrentMap;
 @Component
 public class DayOfSchedule {
+    @Value("${ms.fl.generate}")
+    private boolean generate;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     //按线路分组的 “原始计划” 排班数据
@@ -203,7 +207,9 @@ public class DayOfSchedule {
             putAll(list);
             //标记首末班
-            FirstAndLastHandler.marks(list);
+            if (generate) {
+                FirstAndLastHandler.marks(list);
+            }
             Set<String> lps = searchAllLP(list);
             for (String lp : lps) {
-package com.bsth.entity.calc;
-
-import java.util.Date;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name = "calc_statistics")
-public class CalcStatistics {
-	/* 主键*/
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Long id;
-	/* 日期*/
-	private Date date;
-	/* 日期字符串*/
-	private String dateStr;
-	/* 线路编码*/
-	private String xl;
-	/* 线路名称*/
-	private String xlName;
-	/* 公司代码*/
-	private String gsdm;
-	/* 分公司代码*/
-	private String fgsdm;
-	/* 计划总公里*/
-	private Double jhzlc;
-	/* 计划营运公里*/
-	private Double jhyylc;
-	/* 计划空驶公里*/
-	private Double jhkslc;
-	/* 实际总公里*/
-	private Double sjzlc;
-	/* 实际营运公里*/
-	private Double sjyylc;
-	/* 实际空驶公里*/
-	private Double sjkslc;
-	/* 少驶公里*/
-	private Double sslc;
-	/* 少驶班次*/
-	private int ssbc;
-	/* 路阻公里*/
-	private Double lzlc;
-	/* 吊慢公里*/
-	private Double dmlc;
-	/* 故障公里*/
-	private Double gzlc;
-	/* 纠纷公里*/
-	private Double jflc;
-	/* 肇事公里*/
-	private Double zslc;
-	/* 缺人公里*/
-	private Double qrlc;
-	/* 缺车公里*/
-	private Double qclc;
-	/* 客稀公里*/
-	private Double kxlc;
-	/* 气候公里*/
-	private Double qhlc;
-	/* 援外公里*/
-	private Double ywlc;
-	/* 其他公里*/
-	private Double qtlc;
-	/* 临加公里*/
-	private Double ljlc;
-	/* 临加空驶公里*/
-	private Double ljkslc;
-	/* 计划班次*/
-	private int jhbcq;
-	/* 计划班次(早高峰)*/
-	private int jhbcz;
-	/* 计划班次(晚高峰)*/
-	private int jhbcw;
-	/* 实际班次*/
-	private int sjbcq;
-	/* 实际班次(早高峰)*/
-	private int sjbcz;
-	/* 实际班次(晚高峰)*/
-	private int sjbcw;
-	/* 临加班次*/
-	private int ljbcq;
-	/* 临加班次(早高峰)*/
-	private int ljbcz;
-	/* 临加班次(晚高峰)*/
-	private int ljbcw;
-	/* 放站班次*/
-	private int fzbcq;
-	/* 放站班次(早高峰)*/
-	private int fzbcz;
-	/* 放站班次(晚高峰)*/
-	private int fzbcw;
-	/* 调头班次*/
-	private int dtbcq;
-	/* 调头班次(早高峰)*/
-	private int dtbcz;
-	/* 调头班次(晚高峰)*/
-	private int dtbcw;
-	/* 大间隔次数*/
-	private int djgq;
-	/* 大间隔次数(早高峰)*/
-	private int djgz;
-	/* 大间隔次数(晚高峰)*/
-	private int djgw;
-	/* 最大大间隔时间*/
-	private int djgsj;
-	/* 备注*/
-	private String remark;
-	/*分公司名字*/
-	@Transient
-	private String fgsName;
-	public Long getId() {
-		return id;
-	}
-	public void setId(Long id) {
-		this.id = id;
-	}
-	public Date getDate() {
-		return date;
-	}
-	public void setDate(Date date) {
-		this.date = date;
-	}
-	public String getDateStr() {
-		return dateStr;
-	}
-	public void setDateStr(String dateStr) {
-		this.dateStr = dateStr;
-	}
-	public String getXl() {
-		return xl;
-	}
-	public void setXl(String xl) {
-		this.xl = xl;
-	}
-	public String getXlName() {
-		return xlName;
-	}
-	public void setXlName(String xlName) {
-		this.xlName = xlName;
-	}
-	public String getGsdm() {
-		return gsdm;
-	}
-	public void setGsdm(String gsdm) {
-		this.gsdm = gsdm;
-	}
-	public String getFgsdm() {
-		return fgsdm;
-	}
-	public void setFgsdm(String fgsdm) {
-		this.fgsdm = fgsdm;
-	}
-	public Double getJhzlc() {
-		return jhzlc;
-	}
-	public void setJhzlc(Double jhzlc) {
-		this.jhzlc = jhzlc;
-	}
-	public Double getJhyylc() {
-		return jhyylc;
-	}
-	public void setJhyylc(Double jhyylc) {
-		this.jhyylc = jhyylc;
-	}
-	public Double getJhkslc() {
-		return jhkslc;
-	}
-	public void setJhkslc(Double jhkslc) {
-		this.jhkslc = jhkslc;
-	}
-	public Double getSjzlc() {
-		return sjzlc;
-	}
-	public void setSjzlc(Double sjzlc) {
-		this.sjzlc = sjzlc;
-	}
-	public Double getSjyylc() {
-		return sjyylc;
-	}
-	public void setSjyylc(Double sjyylc) {
-		this.sjyylc = sjyylc;
-	}
-	public Double getSjkslc() {
-		return sjkslc;
-	}
-	public void setSjkslc(Double sjkslc) {
-		this.sjkslc = sjkslc;
-	}
-	public Double getSslc() {
-		return sslc;
-	}
-	public void setSslc(Double sslc) {
-		this.sslc = sslc;
-	}
-	public int getSsbc() {
-		return ssbc;
-	}
-	public void setSsbc(int ssbc) {
-		this.ssbc = ssbc;
-	}
-	public Double getLzlc() {
-		return lzlc;
-	}
-	public void setLzlc(Double lzlc) {
-		this.lzlc = lzlc;
-	}
-	public Double getDmlc() {
-		return dmlc;
-	}
-	public void setDmlc(Double dmlc) {
-		this.dmlc = dmlc;
-	}
-	public Double getGzlc() {
-		return gzlc;
-	}
-	public void setGzlc(Double gzlc) {
-		this.gzlc = gzlc;
-	}
-	public Double getJflc() {
-		return jflc;
-	}
-	public void setJflc(Double jflc) {
-		this.jflc = jflc;
-	}
-	public Double getZslc() {
-		return zslc;
-	}
-	public void setZslc(Double zslc) {
-		this.zslc = zslc;
-	}
-	public Double getQrlc() {
-		return qrlc;
-	}
-	public void setQrlc(Double qrlc) {
-		this.qrlc = qrlc;
-	}
-	public Double getQclc() {
-		return qclc;
-	}
-	public void setQclc(Double qclc) {
-		this.qclc = qclc;
-	}
-	public Double getKxlc() {
-		return kxlc;
-	}
-	public void setKxlc(Double kxlc) {
-		this.kxlc = kxlc;
-	}
-	public Double getQhlc() {
-		return qhlc;
-	}
-	public void setQhlc(Double qhlc) {
-		this.qhlc = qhlc;
-	}
-	public Double getYwlc() {
-		return ywlc;
-	}
-	public void setYwlc(Double ywlc) {
-		this.ywlc = ywlc;
-	}
-	public Double getQtlc() {
-		return qtlc;
-	}
-	public void setQtlc(Double qtlc) {
-		this.qtlc = qtlc;
-	}
-	public Double getLjlc() {
-		return ljlc;
-	}
-	public void setLjlc(Double ljlc) {
-		this.ljlc = ljlc;
-	}
-	public Double getLjkslc() {
-		return ljkslc;
-	}
-	public void setLjkslc(Double ljkslc) {
-		this.ljkslc = ljkslc;
-	}
-	public int getJhbcq() {
-		return jhbcq;
-	}
-	public void setJhbcq(int jhbcq) {
-		this.jhbcq = jhbcq;
-	}
-	public int getJhbcz() {
-		return jhbcz;
-	}
-	public void setJhbcz(int jhbcz) {
-		this.jhbcz = jhbcz;
-	}
-	public int getJhbcw() {
-		return jhbcw;
-	}
-	public void setJhbcw(int jhbcw) {
-		this.jhbcw = jhbcw;
-	}
-	public int getSjbcq() {
-		return sjbcq;
-	}
-	public void setSjbcq(int sjbcq) {
-		this.sjbcq = sjbcq;
-	}
-	public int getSjbcz() {
-		return sjbcz;
-	}
-	public void setSjbcz(int sjbcz) {
-		this.sjbcz = sjbcz;
-	}
-	public int getSjbcw() {
-		return sjbcw;
-	}
-	public void setSjbcw(int sjbcw) {
-		this.sjbcw = sjbcw;
-	}
-	public int getLjbcq() {
-		return ljbcq;
-	}
-	public void setLjbcq(int ljbcq) {
-		this.ljbcq = ljbcq;
-	}
-	public int getLjbcz() {
-		return ljbcz;
-	}
-	public void setLjbcz(int ljbcz) {
-		this.ljbcz = ljbcz;
-	}
-	public int getLjbcw() {
-		return ljbcw;
-	}
-	public void setLjbcw(int ljbcw) {
-		this.ljbcw = ljbcw;
-	}
-	public int getFzbcq() {
-		return fzbcq;
-	}
-	public void setFzbcq(int fzbcq) {
-		this.fzbcq = fzbcq;
-	}
-	public int getFzbcz() {
-		return fzbcz;
-	}
-	public void setFzbcz(int fzbcz) {
-		this.fzbcz = fzbcz;
-	}
-	public int getFzbcw() {
-		return fzbcw;
-	}
-	public void setFzbcw(int fzbcw) {
-		this.fzbcw = fzbcw;
-	}
-	public int getDtbcq() {
-		return dtbcq;
-	}
-	public void setDtbcq(int dtbcq) {
-		this.dtbcq = dtbcq;
-	}
-	public int getDtbcz() {
-		return dtbcz;
-	}
-	public void setDtbcz(int dtbcz) {
-		this.dtbcz = dtbcz;
-	}
-	public int getDtbcw() {
-		return dtbcw;
-	}
-	public void setDtbcw(int dtbcw) {
-		this.dtbcw = dtbcw;
-	}
-	public int getDjgq() {
-		return djgq;
-	}
-	public void setDjgq(int djgq) {
-		this.djgq = djgq;
-	}
-	public int getDjgz() {
-		return djgz;
-	}
-	public void setDjgz(int djgz) {
-		this.djgz = djgz;
-	}
-	public int getDjgw() {
-		return djgw;
-	}
-	public void setDjgw(int djgw) {
-		this.djgw = djgw;
-	}
-	public int getDjgsj() {
-		return djgsj;
-	}
-	public void setDjgsj(int djgsj) {
-		this.djgsj = djgsj;
-	}
-	public String getRemark() {
-		return remark;
-	}
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-	public String getFgsName() {
-		return fgsName;
-	}
-	public void setFgsName(String fgsName) {
-		this.fgsName = fgsName;
-	}
-	
-}
+package com.bsth.entity.calc;
+
+import java.util.Date;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "calc_statistics")
+public class CalcStatistics {
+	/* 主键*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+	/* 日期*/
+	private Date date;
+	/* 日期字符串*/
+	private String dateStr;
+	/* 线路编码*/
+	private String xl;
+	/* 线路名称*/
+	private String xlName;
+	/* 公司代码*/
+	private String gsdm;
+	/* 分公司代码*/
+	private String fgsdm;
+	/* 计划总公里*/
+	private Double jhzlc;
+	/* 计划营运公里*/
+	private Double jhyylc;
+	/* 计划空驶公里*/
+	private Double jhkslc;
+	/* 实际总公里*/
+	private Double sjzlc;
+	/* 实际营运公里*/
+	private Double sjyylc;
+	/* 实际空驶公里*/
+	private Double sjkslc;
+	/* 少驶公里*/
+	private Double sslc;
+	/* 少驶班次*/
+	private int ssbc;
+	/* 路阻公里*/
+	private Double lzlc;
+	/* 吊慢公里*/
+	private Double dmlc;
+	/* 故障公里*/
+	private Double gzlc;
+	/* 纠纷公里*/
+	private Double jflc;
+	/* 肇事公里*/
+	private Double zslc;
+	/* 缺人公里*/
+	private Double qrlc;
+	/* 缺车公里*/
+	private Double qclc;
+	/* 客稀公里*/
+	private Double kxlc;
+	/* 气候公里*/
+	private Double qhlc;
+	/* 援外公里*/
+	private Double ywlc;
+	/* 其他公里*/
+	private Double qtlc;
+	/* 临加公里*/
+	private Double ljlc;
+	/* 临加空驶公里*/
+	private Double ljkslc;
+	/* 计划班次*/
+	private int jhbcq;
+	/* 计划班次(早高峰)*/
+	private int jhbcz;
+	/* 计划班次(晚高峰)*/
+	private int jhbcw;
+	/* 实际班次*/
+	private int sjbcq;
+	/* 实际班次(早高峰)*/
+	private int sjbcz;
+	/* 实际班次(晚高峰)*/
+	private int sjbcw;
+	/* 临加班次*/
+	private int ljbcq;
+	/* 临加班次(早高峰)*/
+	private int ljbcz;
+	/* 临加班次(晚高峰)*/
+	private int ljbcw;
+	/* 放站班次*/
+	private int fzbcq;
+	/* 放站班次(早高峰)*/
+	private int fzbcz;
+	/* 放站班次(晚高峰)*/
+	private int fzbcw;
+	/* 调头班次*/
+	private int dtbcq;
+	/* 调头班次(早高峰)*/
+	private int dtbcz;
+	/* 调头班次(晚高峰)*/
+	private int dtbcw;
+	/* 大间隔次数*/
+	private int djgq;
+	/* 大间隔次数(早高峰)*/
+	private int djgz;
+	/* 大间隔次数(晚高峰)*/
+	private int djgw;
+	/* 最大大间隔时间*/
+	private int djgsj;
+	/* 备注*/
+	private String remark;
+	
+	/*公司名字*/
+	@Transient
+	private String gsName;
+	/*分公司名字*/
+	@Transient
+	private String fgsName;
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Date getDate() {
+		return date;
+	}
+	public void setDate(Date date) {
+		this.date = date;
+	}
+	public String getDateStr() {
+		return dateStr;
+	}
+	public void setDateStr(String dateStr) {
+		this.dateStr = dateStr;
+	}
+	public String getXl() {
+		return xl;
+	}
+	public void setXl(String xl) {
+		this.xl = xl;
+	}
+	public String getXlName() {
+		return xlName;
+	}
+	public void setXlName(String xlName) {
+		this.xlName = xlName;
+	}
+	public String getGsdm() {
+		return gsdm;
+	}
+	public void setGsdm(String gsdm) {
+		this.gsdm = gsdm;
+	}
+	public String getFgsdm() {
+		return fgsdm;
+	}
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+	public Double getJhzlc() {
+		return jhzlc;
+	}
+	public void setJhzlc(Double jhzlc) {
+		this.jhzlc = jhzlc;
+	}
+	public Double getJhyylc() {
+		return jhyylc;
+	}
+	public void setJhyylc(Double jhyylc) {
+		this.jhyylc = jhyylc;
+	}
+	public Double getJhkslc() {
+		return jhkslc;
+	}
+	public void setJhkslc(Double jhkslc) {
+		this.jhkslc = jhkslc;
+	}
+	public Double getSjzlc() {
+		return sjzlc;
+	}
+	public void setSjzlc(Double sjzlc) {
+		this.sjzlc = sjzlc;
+	}
+	public Double getSjyylc() {
+		return sjyylc;
+	}
+	public void setSjyylc(Double sjyylc) {
+		this.sjyylc = sjyylc;
+	}
+	public Double getSjkslc() {
+		return sjkslc;
+	}
+	public void setSjkslc(Double sjkslc) {
+		this.sjkslc = sjkslc;
+	}
+	public Double getSslc() {
+		return sslc;
+	}
+	public void setSslc(Double sslc) {
+		this.sslc = sslc;
+	}
+	public int getSsbc() {
+		return ssbc;
+	}
+	public void setSsbc(int ssbc) {
+		this.ssbc = ssbc;
+	}
+	public Double getLzlc() {
+		return lzlc;
+	}
+	public void setLzlc(Double lzlc) {
+		this.lzlc = lzlc;
+	}
+	public Double getDmlc() {
+		return dmlc;
+	}
+	public void setDmlc(Double dmlc) {
+		this.dmlc = dmlc;
+	}
+	public Double getGzlc() {
+		return gzlc;
+	}
+	public void setGzlc(Double gzlc) {
+		this.gzlc = gzlc;
+	}
+	public Double getJflc() {
+		return jflc;
+	}
+	public void setJflc(Double jflc) {
+		this.jflc = jflc;
+	}
+	public Double getZslc() {
+		return zslc;
+	}
+	public void setZslc(Double zslc) {
+		this.zslc = zslc;
+	}
+	public Double getQrlc() {
+		return qrlc;
+	}
+	public void setQrlc(Double qrlc) {
+		this.qrlc = qrlc;
+	}
+	public Double getQclc() {
+		return qclc;
+	}
+	public void setQclc(Double qclc) {
+		this.qclc = qclc;
+	}
+	public Double getKxlc() {
+		return kxlc;
+	}
+	public void setKxlc(Double kxlc) {
+		this.kxlc = kxlc;
+	}
+	public Double getQhlc() {
+		return qhlc;
+	}
+	public void setQhlc(Double qhlc) {
+		this.qhlc = qhlc;
+	}
+	public Double getYwlc() {
+		return ywlc;
+	}
+	public void setYwlc(Double ywlc) {
+		this.ywlc = ywlc;
+	}
+	public Double getQtlc() {
+		return qtlc;
+	}
+	public void setQtlc(Double qtlc) {
+		this.qtlc = qtlc;
+	}
+	public Double getLjlc() {
+		return ljlc;
+	}
+	public void setLjlc(Double ljlc) {
+		this.ljlc = ljlc;
+	}
+	public Double getLjkslc() {
+		return ljkslc;
+	}
+	public void setLjkslc(Double ljkslc) {
+		this.ljkslc = ljkslc;
+	}
+	public int getJhbcq() {
+		return jhbcq;
+	}
+	public void setJhbcq(int jhbcq) {
+		this.jhbcq = jhbcq;
+	}
+	public int getJhbcz() {
+		return jhbcz;
+	}
+	public void setJhbcz(int jhbcz) {
+		this.jhbcz = jhbcz;
+	}
+	public int getJhbcw() {
+		return jhbcw;
+	}
+	public void setJhbcw(int jhbcw) {
+		this.jhbcw = jhbcw;
+	}
+	public int getSjbcq() {
+		return sjbcq;
+	}
+	public void setSjbcq(int sjbcq) {
+		this.sjbcq = sjbcq;
+	}
+	public int getSjbcz() {
+		return sjbcz;
+	}
+	public void setSjbcz(int sjbcz) {
+		this.sjbcz = sjbcz;
+	}
+	public int getSjbcw() {
+		return sjbcw;
+	}
+	public void setSjbcw(int sjbcw) {
+		this.sjbcw = sjbcw;
+	}
+	public int getLjbcq() {
+		return ljbcq;
+	}
+	public void setLjbcq(int ljbcq) {
+		this.ljbcq = ljbcq;
+	}
+	public int getLjbcz() {
+		return ljbcz;
+	}
+	public void setLjbcz(int ljbcz) {
+		this.ljbcz = ljbcz;
+	}
+	public int getLjbcw() {
+		return ljbcw;
+	}
+	public void setLjbcw(int ljbcw) {
+		this.ljbcw = ljbcw;
+	}
+	public int getFzbcq() {
+		return fzbcq;
+	}
+	public void setFzbcq(int fzbcq) {
+		this.fzbcq = fzbcq;
+	}
+	public int getFzbcz() {
+		return fzbcz;
+	}
+	public void setFzbcz(int fzbcz) {
+		this.fzbcz = fzbcz;
+	}
+	public int getFzbcw() {
+		return fzbcw;
+	}
+	public void setFzbcw(int fzbcw) {
+		this.fzbcw = fzbcw;
+	}
+	public int getDtbcq() {
+		return dtbcq;
+	}
+	public void setDtbcq(int dtbcq) {
+		this.dtbcq = dtbcq;
+	}
+	public int getDtbcz() {
+		return dtbcz;
+	}
+	public void setDtbcz(int dtbcz) {
+		this.dtbcz = dtbcz;
+	}
+	public int getDtbcw() {
+		return dtbcw;
+	}
+	public void setDtbcw(int dtbcw) {
+		this.dtbcw = dtbcw;
+	}
+	public int getDjgq() {
+		return djgq;
+	}
+	public void setDjgq(int djgq) {
+		this.djgq = djgq;
+	}
+	public int getDjgz() {
+		return djgz;
+	}
+	public void setDjgz(int djgz) {
+		this.djgz = djgz;
+	}
+	public int getDjgw() {
+		return djgw;
+	}
+	public void setDjgw(int djgw) {
+		this.djgw = djgw;
+	}
+	public int getDjgsj() {
+		return djgsj;
+	}
+	public void setDjgsj(int djgsj) {
+		this.djgsj = djgsj;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public String getGsName() {
+		return gsName;
+	}
+	public void setGsName(String gsName) {
+		this.gsName = gsName;
+	}
+	public String getFgsName() {
+		return fgsName;
+	}
+	public void setFgsName(String fgsName) {
+		this.fgsName = fgsName;
+	}
+	
+}
@@ -54,6 +54,22 @@ public class EmployeeConfigInfo extends BEntity implements Serializable {
     @Column(nullable = false)
     private Boolean isCancel = false;
+    /** 驾驶员停用信息 */
+    @Formula("(" +
+            "(select IFNULL(t2.destroy, 0) from bsth_c_s_ecinfo t1 left join bsth_c_personnel t2 on t1.jsy = t2.id where t1.id = id)" +
+            "+" +
+            "(select IFNULL(t2.destroy, 0) from bsth_c_s_ecinfo t1 left join bsth_c_personnel t2 on t1.spy = t2.id where t1.id = id)" +
+            ")")
+    private Integer ryDestroyStatus;
+
+    public Integer getRyDestroyStatus() {
+        return ryDestroyStatus;
+    }
+
+    public void setRyDestroyStatus(Integer ryDestroyStatus) {
+        this.ryDestroyStatus = ryDestroyStatus;
+    }
+
     public EmployeeConfigInfo() {}
     public EmployeeConfigInfo(Object id, Object xlid, Object xlname, Object jsyid, Object spyid) {
@@ -33,6 +33,12 @@ public interface CalcIntervalRepository extends BaseRepository&lt;CalcInterval, Int
 	@Query(value="select DISTINCT c from CalcInterval c where c.xlBm = ?1  and c.date = ?2  and c.level like %?3%  order by c.xlBm")
 	List<CalcInterval> selectByDateAndLine(String line,String date,String level);
+	//按照时间段统计
+	@Query(value="select gsbm,fgsbm,xl_bm,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
+			+ " from bsth_c_calc_interval where date >=?1 and date <=?2 " 
+			+ " group by  xl_bm,gsbm,fgsbm",nativeQuery=true)
+	List<Object[]> countByDate(String date,String date2);
+	
 	//按照时间段，公司统计
 	@Query(value="select gsbm,fgsbm,xl_bm,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
 			+ " from bsth_c_calc_interval where gsbm like %?1% and  fgsbm like %?2% and date >=?3 and date <=?4 " 
@@ -25,6 +25,10 @@ public interface CalcLineMileageRepository extends BaseRepository&lt;CalcLineMileag
 	@Query(value="select DISTINCT c from CalcLineMileage c where c.xl = ?1  and c.dateStr between ?2 and ?3 order by c.id")
 	List<CalcLineMileage> selectByDateAndLineTj2(String line,String date,String date2);
+	//按照时间段统计，全部线路
+	@Query(value="select DISTINCT c from CalcLineMileage c where c.dateStr between ?1 and ?2 order by c.id")
+	List<CalcLineMileage> selectByDateAndLineTj3(String date,String date2);
+	
 	//按照日期和线路删除数据
 	@Modifying
 	@Transactional
@@ -28,6 +28,10 @@ public interface CalcStatisticsRepository extends BaseRepository&lt;CalcStatistics,
 	@Query(value="select DISTINCT c from CalcStatistics c where c.xl = ?1  and c.dateStr between ?2 and ?3 order by c.fgsdm,c.xl")
 	List<CalcStatistics> selectByDateAndLineTj2(String line,String date,String date2);
+	//按照时间段统计
+	@Query(value="select DISTINCT c from CalcStatistics c where c.dateStr between ?1 and ?2 order by c.gsdm,c.fgsdm,c.xl")
+	List<CalcStatistics> selectByDateAndLineTj3(String date,String date2);
+	
 	//按照日期和线路删除数据
 	@Modifying
 	@Transactional
@@ -188,6 +188,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and s.scheduleDateStr >= ?2  and s.scheduleDateStr<= ?3 order by s.fgsBm,s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj2(String line,String date,String date2);
+	
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr >= ?1 and s.scheduleDateStr<= ?2 order by s.gsBm,s.fgsBm,s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLineTj3(String date,String date2);
+	
 		//月报表
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and s.scheduleDateStr >= ?2  and s.scheduleDateStr<= ?3  order by s.xlBm")
 package com.bsth.repository.schedule;
-import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.repository.BaseRepository;
 import org.springframework.data.domain.Page;
@@ -10,9 +9,6 @@ import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
@@ -42,9 +38,15 @@ public interface TTInfoDetailRepository extends BaseRepository&lt;TTInfoDetail, Lon
     @Query(value = "select max(tt.fcno) as mx from bsth_c_s_ttinfo_detail tt where tt.xl =?1 and tt.ttinfo =?2", nativeQuery = true)
     Long findMaxFcno(Integer xlid, Long ttinfoid);
+    @Query(value = "select max(tt.bcs) as mx from bsth_c_s_ttinfo_detail tt where tt.ttinfo =?1", nativeQuery = true)
+    Long findMaxBcs(Long ttinfoid);
+
     @Query(value = "select tt from TTInfoDetail tt where tt.xl.id = ?1 and tt.ttinfo.id = ?2 and tt.lp.id = ?3 order by tt.fcno asc")
     List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId);
+    @Query(value = "select tt from TTInfoDetail tt where tt.ttinfo.id = ?1 and tt.lp.id = ?2 order by tt.fcno asc")
+    List<TTInfoDetail> findBcdetails(Long ttinfoId, Long lpId);
+
     List<TTInfoDetail> findByTtinfoId(Long id);
     @Modifying
@@ -52,6 +54,10 @@ public interface TTInfoDetailRepository extends BaseRepository&lt;TTInfoDetail, Lon
     void deleteByTtinfoIdWithModify(Long ttinfoid);
     @Modifying
+    @Query(value = "delete from TTInfoDetail t where t.ttinfo.id = ?1 and t.lp.id = ?2")
+    void deleteByTtinfoIdAndLpidWithModify(Long ttinfoid, Long lpid);
+
+    @Modifying
     @Query(value = "delete from TTInfoDetail t where t.xl.id=?1 and t.ttinfo.id = ?2")
     void deltidc(int xl , Long ttinfoid );
 }
@@ -47,6 +47,8 @@ import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import javax.transaction.Transactional;
+
+import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -738,7 +740,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			String line, String date, String date2, String xlName, String type,String nature) {
 		// TODO Auto-generated method stub
 		List<CalcStatistics> listAll = new ArrayList<CalcStatistics>();
-		if(line.length() > 0){
+		if(gsdm.equals("") && fgsdm.equals("") && line.equals("")){
+			listAll = calcStatisticsRepository.selectByDateAndLineTj3(date, date2);
+        } else if(line.length() > 0){
 			listAll = calcStatisticsRepository.selectByDateAndLineTj2(line, date, date2);
 		} else {
 			listAll = calcStatisticsRepository.selectByDateAndLineTj(line, date, date2, gsdm, fgsdm);
@@ -767,13 +771,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		for(CalcStatistics s : list){
     		try {
-//				String key = PinyinHelper.convertToPinyinString(s.getXl(), "" , PinyinFormat.WITHOUT_TONE);
-				String key =s.getFgsdm()+s.getXl();
-//				if(line.equals("")){
-//					key =s.getFgsdm()+s.getXl();
-//				}else{
-//					key =s.getXl();
-//				}
+//				String key =s.getGsdm()+"/"+s.getFgsdm()+"/"+s.getXl();
+    			String key = PinyinHelper.convertToPinyinString(s.getGsdm()+s.getFgsdm()+s.getXlName(), "", PinyinFormat.WITHOUT_TONE);
     			if(!keyMap.containsKey(key)){
 					keyMap.put(key, new ArrayList<CalcStatistics>());
 					keyList.add(key);
@@ -789,18 +788,14 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		for(String key : keyList){
 			if(keyMap.get(key).size() > 0){
 				CalcStatistics s = keyMap.get(key).get(0);
-				if(keyMap.get(key).size() > 1)
+				if(keyMap.get(key).size() > 1){
 					for(int i = 1; i < keyMap.get(key).size(); i++){
 						CalcStatistics s_ = keyMap.get(key).get(i);
 						s = addStatistics(s, s_);
 					}
-//				if(line.equals("")){
-					s.setFgsName(BasicData.businessFgsCodeNameMap.get(s.getFgsdm()+"_"+s.getGsdm()));
-				/*}else{
-					List<Line> l=lineRepository.findLineByCode(line);
-		        	if(l.size()>0)
-		        		s.setFgsName(BasicData.businessFgsCodeNameMap.get(l.get(0).getBrancheCompany()+"_"+l.get(0).getCompany()));
-				}*/
+				}
+				s.setGsName(BasicData.businessCodeNameMap.get(s.getGsdm()));
+				s.setFgsName(BasicData.businessFgsCodeNameMap.get(s.getFgsdm()+"_"+s.getGsdm()));
 				resList.add(s);
 			}
 		}
@@ -809,6 +804,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			CalcStatistics temp = new CalcStatistics();
 			temp.setXlName("合计");
 			temp.setFgsName("");
+			temp.setGsName("");
 			for(CalcStatistics s : resList){
 				temp = addStatistics(temp, s);
 			}
@@ -818,6 +814,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 		for(CalcStatistics c : resList){
 			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("gsName", c.getGsName());
 			m.put("fgsName", c.getFgsName());
 			m.put("xlName", c.getXlName());
 			m.put("jhzlc", c.getJhzlc());
@@ -888,6 +885,69 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
             	logger.info("" , e);
             }
         }
+        
+		if (type != null && type.length() != 0 && type.equals("exportAll")) {
+			List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+			Map<String, Map<String, Object>> tempMap = new HashMap<String, Map<String, Object>>();
+			List<Map<String, Object>> removeList = new ArrayList<Map<String, Object>>();
+			for(Map<String, Object> m : mapList){
+				if(m.get("gsName") != null && m.get("gsName").toString().trim().length() > 0
+						&& m.get("gsName").toString().trim().contains("临港")){
+					removeList.add(m);
+				}
+			}
+			for(Map<String, Object> m : removeList){
+				mapList.remove(m);
+			}
+			for(Map<String, Object> m : mapList){
+				if(m.get("gsName") != null && m.get("gsName").toString().trim().length() > 0){
+					String gsName = m.get("gsName").toString().trim();
+					Map<String, Object> temp = new HashMap<String, Object>();
+					if(tempMap.get(gsName) != null){
+						temp = tempMap.get(gsName);
+					} else {
+						temp.put("gsName", gsName);
+						temp.put("fgsName", "小计");
+						temp.put("xlName", "");
+						tempList.add(temp);
+						tempMap.put(gsName, temp);
+					}
+					for(String key : m.keySet()){
+						try {
+							temp.put(key, new BigDecimal(m.get(key).toString()).add(
+									new BigDecimal(temp.get(key)!=null?temp.get(key).toString():"0")));
+						} catch (Exception e) {
+							// TODO: handle exception
+						}
+					}
+				}
+			}
+			mapList.addAll(mapList.size()>0?mapList.size()-1:0, tempList);
+			
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            m.put("date", date + "至" + date2);
+            ReportUtils ee = new ReportUtils();
+            try {
+                String dateTime = "";
+                if (date.equals(date2)) {
+                    dateTime = sdfSimple.format(sdfMonth.parse(date));
+                } else {
+                    dateTime = sdfSimple.format(sdfMonth.parse(date))
+                            + "-" + sdfSimple.format(sdfMonth.parse(date2));
+                }
+                listI.add(mapList.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_4.xls",
+                        path + "export/" + dateTime + "-全部公司-统计日报.xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                //e.printStackTrace();
+                logger.info("", e);
+            }
+		}
 		return resList;
 	}
@@ -1512,7 +1572,11 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		List<String> keyList = new ArrayList<String>();
 		Map<String, List<CalcLineMileage>> keyMap = new HashMap<String, List<CalcLineMileage>>();
-		if(line == null || line.trim().length() == 0){
+		if((line == null || line.trim().length() == 0) 
+				&& (gsdm == null || gsdm.trim().length() == 0)
+				&& (fgsdm == null || fgsdm.trim().length() == 0)){
+			list = calcLineMileageRepository.selectByDateAndLineTj3(date, date2);
+		} else if(line == null || line.trim().length() == 0){
 			list = calcLineMileageRepository.selectByDateAndLineTj(line, date, date2, gsdm, fgsdm);
 		} else {
 			list = calcLineMileageRepository.selectByDateAndLineTj2(line, date, date2);
@@ -1558,6 +1622,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				m.put("fgsdm", c.getFgsdm());
 				m.put("fgs", c.getFgsName());
 			}
+			m.put("xl", c.getXl());
 			m.put("xlName", c.getXlName());
 			m.put("jhzlc", c.getJhzlc());
 			m.put("jhlc", c.getJhlc());
@@ -118,6 +118,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> statisticsDaily(String line, String date, String xlName, String type);
+	List<Map<String,Object>> dispatchDailySum(String date, String date2, String nature, String type);
+	
 	List<Map<String,Object>> statisticsDailyTj(String gsdm,String fgsdm,String line, String date,String date2, String xlName, String type,String nature);
 	//用于实时数据与统计数据合并查询
 package com.bsth.service.realcontrol.impl;
 import java.io.*;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -69,6 +71,7 @@ import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.calc.CalcInterval;
+import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
@@ -103,6 +106,7 @@ import com.bsth.repository.schedule.GuideboardInfoRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.LineService;
 import com.bsth.service.SectionRouteService;
+import com.bsth.service.calc.CalcWaybillService;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
@@ -155,6 +159,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     DictionaryService dictionaryService;
     @Autowired
+    CalcWaybillService calcWaybillService;
+    
+    @Autowired
     CalcIntervalRepository calcIntervalRepository;
 	/*@Autowired
     BorrowCenter borrowCenter;*/
@@ -2863,12 +2870,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         Map<String, Object> map = new HashMap<String, Object>();
         if (list.size() > 0) {
+        	map.put("gsBm", list.get(0).getGsBm());
         	map.put("fgsBm", list.get(0).getFgsBm());
         	map.put("xlBm", list.get(0).getXlBm());
             map.put("xlName", list.get(0).getXlName());
             map.put("fgsName", list.get(0).getFgsName());
+            map.put("gsName", list.get(0).getGsName());
+            
             try {
-                map.put("xlNamePy", PinyinHelper.convertToPinyinString(list.get(0).getFgsBm()+list.get(0).getXlName(), "", PinyinFormat.WITHOUT_TONE));
+                map.put("xlNamePy", PinyinHelper.convertToPinyinString(list.get(0).getGsBm()+list.get(0).getFgsBm()+list.get(0).getXlName(), "", PinyinFormat.WITHOUT_TONE));
             } catch (PinyinException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
@@ -2948,6 +2958,250 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         return map;
     }
+    
+    @Override
+    public List<Map<String, Object>> dispatchDailySum(String date, String date2, String nature, String type) {
+    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+    	
+//    	List<Map<String, Object>> list = statisticsDailyTj("", "", "", date, date2, "", "query", nature);
+    	List<CalcStatistics> calc = calcWaybillService.calcStatisticsDaily("", "", "", date, date2, "", "query", nature);
+    	List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+		try {
+			List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+	    	for(CalcStatistics c : calc){
+	    		Map<String, Object> m = new HashMap<>();
+	    		Field[] fields = c.getClass().getDeclaredFields();
+	    		for(Field f : fields){
+	    			f.setAccessible(true);
+	    			String key = new String(f.getName());
+	    			m.put(key, f.get(c));
+	    		}
+	    		tempList.add(m);
+	    	}
+	    	list = tempList;
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+    	
+    	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
+    	Map<String, Object> temp = new HashMap<String, Object>();
+    	temp.put("gsName", "杨高");temp.put("fgsName", "杨高分");temp.put("key", "05_5");
+    	resList.add(temp);keyMap.put("05_5", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "杨高");temp.put("fgsName", "金桥分");temp.put("key", "05_2");
+    	resList.add(temp);keyMap.put("05_2", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "杨高");temp.put("fgsName", "川沙分");temp.put("key", "05_1");
+    	resList.add(temp);keyMap.put("05_1", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "杨高");temp.put("fgsName", "周浦分");temp.put("key", "05_6");
+    	resList.add(temp);keyMap.put("05_6", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "杨高");temp.put("fgsName", "小计");temp.put("key", "05_sum");
+    	resList.add(temp);keyMap.put("05_sum", temp);
+    	
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "上南");temp.put("fgsName", "一分");temp.put("key", "55_4");
+    	resList.add(temp);keyMap.put("55_4", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "上南");temp.put("fgsName", "二分");temp.put("key", "55_1");
+    	resList.add(temp);keyMap.put("55_1", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "上南");temp.put("fgsName", "三分");temp.put("key", "55_2");
+    	resList.add(temp);keyMap.put("55_2", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "上南");temp.put("fgsName", "六分");temp.put("key", "55_3");
+    	resList.add(temp);keyMap.put("55_3", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "上南");temp.put("fgsName", "小计");temp.put("key", "55_sum");
+    	resList.add(temp);keyMap.put("55_sum", temp);
+    	
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "金高");temp.put("fgsName", "一分");temp.put("key", "22_5");
+    	resList.add(temp);keyMap.put("22_5", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "金高");temp.put("fgsName", "二分");temp.put("key", "22_2");
+    	resList.add(temp);keyMap.put("22_2", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "金高");temp.put("fgsName", "三分");temp.put("key", "22_3");
+    	resList.add(temp);keyMap.put("22_3", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "金高");temp.put("fgsName", "四分");temp.put("key", "22_1");
+    	resList.add(temp);keyMap.put("22_1", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "金高");temp.put("fgsName", "小计");temp.put("key", "22_sum");
+    	resList.add(temp);keyMap.put("22_sum", temp);
+    	
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "南汇");temp.put("fgsName", "一分");temp.put("key", "26_1");
+    	resList.add(temp);keyMap.put("26_1", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "南汇");temp.put("fgsName", "二分");temp.put("key", "26_2");
+    	resList.add(temp);keyMap.put("26_2", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "南汇");temp.put("fgsName", "三分");temp.put("key", "26_3");
+    	resList.add(temp);keyMap.put("26_3", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "南汇");temp.put("fgsName", "六分");temp.put("key", "26_6");
+    	resList.add(temp);keyMap.put("26_6", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "南汇");temp.put("fgsName", "小计");temp.put("key", "26_sum");
+    	resList.add(temp);keyMap.put("26_sum", temp);
+    	
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "浦交");temp.put("fgsName", " ");temp.put("key", "88");
+    	resList.add(temp);keyMap.put("88", temp);
+    	
+    	for(Map<String, Object> m : list){
+    		m.put("gsBm", m.get("gsdm"));
+    		m.put("fgsBm", m.get("fgsdm"));
+    		if(m.get("gsBm") != null && m.get("fgsBm") != null
+    				&& m.get("gsBm").toString().trim().length() > 0
+    				&& m.get("fgsBm").toString().trim().length() > 0){
+    			String gsBm = m.get("gsBm").toString().trim();
+    			String fgsBm = m.get("fgsBm").toString().trim();
+    			String key = gsBm + "_" + fgsBm;
+    			if(keyMap.containsKey(key)){
+    				Map<String, Object> t = keyMap.get(key);
+    				for(String s : m.keySet()){
+    					if("gsName,fgsName,key".contains(s)){
+    						continue;
+    					}
+    					try {
+    						if(t.containsKey(s)){
+    							t.put(s, new BigDecimal(t.get(s).toString()).add(new BigDecimal(m.get(s).toString())));
+    						} else {
+    							t.put(s, m.get(s).toString());
+    						}
+						} catch (Exception e) {
+							// TODO: handle exception
+							continue;
+						}
+    				}
+    			}
+    		}
+    	}
+    	
+    	for(Map<String, Object> m : resList){
+    		String key = m.get("key").toString();
+    		if(key.contains("_sum") || key.equals("88")){
+    			continue;
+    		}
+			
+			Map<String, Object> t = keyMap.get(key.split("_")[0] + "_sum");
+			for(String s : m.keySet()){
+				if("gsName,fgsName,key".contains(s)){
+					continue;
+				}
+				try {
+					if(t.containsKey(s)){
+						t.put(s, new BigDecimal(t.get(s).toString()).add(new BigDecimal(m.get(s).toString())));
+					} else {
+						t.put(s, m.get(s).toString());
+					}
+				} catch (Exception e) {
+					// TODO: handle exception
+					continue;
+				}
+			}
+			
+    		t = keyMap.get("88");
+			for(String s : m.keySet()){
+				if("gsName,fgsName,key".contains(s)){
+					continue;
+				}
+				try {
+					if(t.containsKey(s)){
+						t.put(s, new BigDecimal(t.get(s).toString()).add(new BigDecimal(m.get(s).toString())));
+					} else {
+						t.put(s, m.get(s).toString());
+					}
+				} catch (Exception e) {
+					// TODO: handle exception
+					continue;
+				}
+			}
+    	}
+    	
+    	for(Map<String, Object> m : resList){
+    		try {
+    			m.put("jhzlc", m.get("jhzlc"));
+    			m.put("jhlc", m.get("jhyylc"));
+    			m.put("jcclc", m.get("jhkslc"));
+    			m.put("sjzgl", m.get("sjzlc"));
+    			m.put("sjgl", m.get("sjyylc"));
+    			m.put("sjksgl", m.get("sjkslc"));
+    			m.put("ssbc", m.get("ssbc"));
+    			m.put("ssgl", m.get("sslc"));
+    			m.put("ssgl_lz", m.get("lzlc"));
+    			m.put("ssgl_dm", m.get("dmlc"));
+    			m.put("ssgl_gz", m.get("gzlc"));
+    			m.put("ssgl_jf", m.get("jflc"));
+    			m.put("ssgl_zs", m.get("zslc"));
+    			m.put("ssgl_qr", m.get("qrlc"));
+    			m.put("ssgl_qc", m.get("qclc"));
+    			m.put("ssgl_kx", m.get("kxlc"));
+    			m.put("ssgl_qh", m.get("qhlc"));
+    			m.put("ssgl_yw", m.get("ywlc"));
+    			m.put("ssgl_other", m.get("qtlc"));
+    			m.put("ljgl", m.get("ljlc"));
+    			m.put("ljks", m.get("ljkslc"));
+    			m.put("jhbc", m.get("jhbcq"));
+    			m.put("jhbc_m", m.get("jhbcz"));
+    			m.put("jhbc_a", m.get("jhbcw"));
+    			m.put("sjbc", m.get("sjbcq"));
+    			m.put("sjbc_m", m.get("sjbcz"));
+    			m.put("sjbc_a", m.get("sjbcw"));
+    			m.put("ljbc", m.get("ljbcq"));
+    			m.put("ljbc_m", m.get("ljbcz"));
+    			m.put("ljbc_a", m.get("ljbcw"));
+    			m.put("fzbc", m.get("fzbcq"));
+    			m.put("fzbc_m", m.get("fzbcz"));
+    			m.put("fzbc_a", m.get("fzbcw"));
+    			m.put("dtbc", m.get("dtbcq"));
+    			m.put("dtbc_m", m.get("dtbcz"));
+    			m.put("dtbc_a", m.get("dtbcw"));
+    			m.put("djg", m.get("djgq"));
+    			m.put("djg_m", m.get("djgz"));
+    			m.put("djg_a", m.get("djgw"));
+    			m.put("djg_time", m.get("djgsj"));
+    			m.put("ljzgl", new BigDecimal(m.get("ljgl").toString()).add(new BigDecimal(m.get("ljks").toString())));
+    		} catch (Exception e) {
+				// TODO: handle exception
+    			m.put("ljzgl", "");
+				continue;
+			}
+    	}
+    	
+    	if (type != null && type.length() != 0 && type.equals("export")) {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            m.put("date", date);
+            ReportUtils ee = new ReportUtils();
+            try {
+                String dateTime = "";
+                if (date.equals(date2)) {
+                    dateTime = sdfSimple.format(sdfMonth.parse(date));
+                } else {
+                    dateTime = sdfSimple.format(sdfMonth.parse(date))
+                            + "-" + sdfSimple.format(sdfMonth.parse(date2));
+                }
+                listI.add(resList.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/dispatchDailySum.xls",
+                        path + "export/" + dateTime + "-调度日报汇总表.xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                //e.printStackTrace();
+                logger.info("", e);
+            }
+        }
+    	
+    	return resList;
+    }
     @Override
     public List<Map<String, Object>> statisticsDailyTj(String gsdm, String fgsdm, String line, String date, String date2,
@@ -2957,7 +3211,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
         List<Object[]> listInterval=new ArrayList<Object[]>();
         line = line.trim();
-        if (line.equals("")) {
+        if(gsdm.equals("") && fgsdm.equals("") && line.equals("")){
+        	//查询所有公司
+        	listAll = scheduleRealInfoRepository.scheduleByDateAndLineTj3(date, date2);
+        	listInterval = calcIntervalRepository.countByDate(date, date2);
+        } else if (line.equals("")) {
             //查询所有线路
         	listAll = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date, date2, gsdm, fgsdm);
         	listInterval = calcIntervalRepository.countByDateAndLine(gsdm, fgsdm, date, date2);
@@ -3012,7 +3270,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         for (int i = 0; i < list.size(); i++) {
             if (i < list.size() - 1) {
-                if ((list.get(i+1).getFgsBm()+list.get(i + 1).getXlBm()).equals(list.get(i).getFgsBm()+list.get(i).getXlBm())) {
+                if ((list.get(i+1).getGsBm()+"/"+list.get(i+1).getFgsBm()+"/"+list.get(i+1).getXlBm()).equals(
+                		list.get(i).getGsBm()+"/"+list.get(i).getFgsBm()+"/"+list.get(i).getXlBm())) {
                     lists.add(list.get(i));
                 } else {
                     lists.add(list.get(i));
@@ -3025,7 +3284,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     lists = new ArrayList<ScheduleRealInfo>();
                 }
             } else {
-                if ((list.get(i).getFgsBm()+list.get(i).getXlBm()).equals(list.get(i - 1).getFgsBm()+list.get(i - 1).getXlBm())) {
+                if ((list.get(i).getGsBm()+"/"+list.get(i).getFgsBm()+"/"+list.get(i).getXlBm()).equals(
+                		list.get(i-1).getGsBm()+"/"+list.get(i-1).getFgsBm()+"/"+list.get(i-1).getXlBm())) {
                     lists.add(list.get(i));
                     Map<String, Object> mm=new HashMap<String,Object>();
                     if(mapInterval.get(lists.get(0).getGsBm()+"-"+lists.get(0).getFgsBm()+"-"+lists.get(0).getXlBm())!=null){
@@ -3045,15 +3305,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
-        /*if(!line.equals("")){
-        	List<Line> l=lineRepository.findLineByCode(line);
-        	if(l.size()>0)
-        	lMap.get(0).put("fgsName", BasicData.businessFgsCodeNameMap.get(l.get(0).getBrancheCompany()+"_"+l.get(0).getCompany()));
-        }*/
+        
         Collections.sort(lMap, new AccountXlbm());
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("xlName", "合计");
         map.put("fgsName", "");
+        map.put("gsName", "");
         double jhyygl = culateService.culateJhgl(list);//计划营运公里
         double jhjcclc = culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
         map.put("jhlc", jhyygl);
@@ -3145,6 +3402,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             map.put("djg_time", "0");
         }
         lMap.add(map);
+        
         if (type != null && type.length() != 0 && type.equals("export")) {
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
                     sdfSimple = new SimpleDateFormat("yyyyMMdd");
@@ -3170,8 +3428,71 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 logger.info("", e);
             }
         }
-
-        return lMap;
+        
+		if (type != null && type.length() != 0 && type.equals("exportAll")) {
+			List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+			Map<String, Map<String, Object>> tempMap = new HashMap<String, Map<String, Object>>();
+			List<Map<String, Object>> removeList = new ArrayList<Map<String, Object>>();
+			for(Map<String, Object> m : lMap){
+				if(m.get("gsName") != null && m.get("gsName").toString().trim().length() > 0
+						&& m.get("gsName").toString().trim().contains("临港")){
+					removeList.add(m);
+				}
+			}
+			for(Map<String, Object> m : removeList){
+				lMap.remove(m);
+			}
+			for(Map<String, Object> m : lMap){
+				if(m.get("gsName") != null && m.get("gsName").toString().trim().length() > 0){
+					String gsName = m.get("gsName").toString().trim();
+					Map<String, Object> temp = new HashMap<String, Object>();
+					if(tempMap.get(gsName) != null){
+						temp = tempMap.get(gsName);
+					} else {
+						temp.put("gsName", gsName);
+						temp.put("fgsName", "小计");
+						temp.put("xlName", "");
+						tempList.add(temp);
+						tempMap.put(gsName, temp);
+					}
+					for(String key : m.keySet()){
+						try {
+							temp.put(key, new BigDecimal(m.get(key).toString()).add(
+									new BigDecimal(temp.get(key)!=null?temp.get(key).toString():"0")));
+						} catch (Exception e) {
+							// TODO: handle exception
+						}
+					}
+				}
+			}
+			lMap.addAll(lMap.size()>0?lMap.size()-1:0, tempList);
+			
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            m.put("date", date + "至" + date2);
+            ReportUtils ee = new ReportUtils();
+            try {
+                String dateTime = "";
+                if (date.equals(date2)) {
+                    dateTime = sdfSimple.format(sdfMonth.parse(date));
+                } else {
+                    dateTime = sdfSimple.format(sdfMonth.parse(date))
+                            + "-" + sdfSimple.format(sdfMonth.parse(date2));
+                }
+                listI.add(lMap.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_4.xls",
+                        path + "export/" + dateTime + "-全部公司-统计日报.xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                //e.printStackTrace();
+                logger.info("", e);
+            }
+		}
+		
+		return lMap;
     }
     @Override
@@ -49,6 +49,8 @@ public interface ReportService {
 	 List<Map<String, String>> userList(Map<String, Object> map);
+	 List<Map<String, Object>> countMileageSum(Map<String, Object> map);
+	 
 	 List<Map<String, Object>> countByList(Map<String, Object> map);
 	 List<Map<String, Object>> countByList2(Map<String, Object> map);
@@ -124,6 +124,33 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 				}
 			}
 		}
+		
+		CalcSheet temp = new CalcSheet();
+		temp.setGsname("");
+		temp.setFgsname("");
+		temp.setXlName("合计");
+		for(CalcSheet s : list){
+			temp.setJhszfcs(Long.valueOf(s.getJhszfcs()!=null?s.getJhszfcs():"0")
+					+ Long.valueOf(temp.getJhszfcs()!=null?temp.getJhszfcs():"0") + "");
+			temp.setSjszfczds(Long.valueOf(s.getSjszfczds()!=null?s.getSjszfczds():"0")
+					+ Long.valueOf(temp.getSjszfczds()!=null?temp.getSjszfczds():"0") + "");
+			temp.setSjszddzds(Long.valueOf(s.getSjszddzds()!=null?s.getSjszddzds():"0")
+					+ Long.valueOf(temp.getSjszddzds()!=null?temp.getSjszddzds():"0") + "");
+		}
+		Long jhfc = Long.valueOf(temp.getJhszfcs()!=null?temp.getJhszfcs():"0");
+		Long zdfc = Long.valueOf(temp.getSjszfczds()!=null?temp.getSjszfczds():"0");
+		Long zddd = Long.valueOf(temp.getSjszddzds()!=null?temp.getSjszddzds():"0");
+		if(jhfc > 0l){
+			 double zdl = (zdfc*1.0)/(jhfc*1.0)*100;
+			 temp.setSzfczdl(df.format(zdl)+"%");
+			 zdl = (zddd*1.0)/(jhfc*1.0)*100;
+			 temp.setSzddzdl(df.format(zdl)+"%");
+		 }else{
+			 temp.setSzfczdl("0.0%");
+			 temp.setSzddzdl("0.0%");
+		 }
+		list.add(temp);
+		
 		if(map.get("type").equals("export")){
 			String lineName="";
 			if(!line.equals("")){
@@ -137,9 +164,9 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 			for (int i = 0; i < list.size(); i++) {
 				CalcSheet c=list.get(i);
 				Map<String, Object> m=new HashMap<String,Object>();
-				m.put("gs", c.getGsname());
-				m.put("fgs", c.getFgsname());
-				m.put("line", c.getXlName());
+				m.put("gs", c.getGsname()!=null?c.getGsname():"");
+				m.put("fgs", c.getFgsname()!=null?c.getFgsname():"");
+				m.put("line", c.getXlName()!=null?c.getXlName():"");
 				m.put("bcs", c.getJhszfcs());
 				m.put("zdbcs", c.getSjszfczds());
 				m.put("zdlv", c.getSzfczdl());
@@ -1021,21 +1048,30 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		String type=map.get("type").toString();
 		final String dates=date;
 		String sql_="";
-		if(line.equals("")){
-			sql_= " and gsdm ='"+gs+"' and fgsdm like '%"+fgs+"%'";
+		List<String> objList = new ArrayList<String>();
+		objList.add(startDate);
+		objList.add(endDate);
+		if("".equals(gs.trim()) && "".equals(fgs.trim()) && "".equals(line.trim())){
+			
+		} else if(line.equals("")){
+			sql_= " and gsdm = ? and fgsdm like CONCAT('%',?,'%') ";
+			objList.add(gs);
+			objList.add(fgs);
 		}else{
-			sql_=" and xl='"+line+"'";
+			sql_=" and xl = ? ";
+			objList.add(line);
 		}
 		String sql="select t.*,y.warrant_car as qzpcs from ("
 				+ " select gsdm,fgsdm,xl,xl_name,sum(jhcc) as jhcc,sum(sjcc) as sjcc,"
 				+ " sum(sjcczgf) as sjcczgf,sum(jhbcs) as jhbcs,sum(sjbcs) as sjbcs "
-				+ " from bsth_c_calc_sheet where date >='"+startDate+"' and date <='"+endDate+"'"
+				+ " from bsth_c_calc_sheet where date >= ? and date <= ? "
 				+ sql_
 				+ " group by gsdm,fgsdm,xl,xl_name ) "
 				+ " t LEFT JOIN bsth_c_line y "
-				+ " on t.xl=y.line_code order by fgsdm,xl_name";
-		List<Map<String, Object>> lists=jdbcTemplate.query(sql, 
-				 new RowMapper<Map<String, Object>>(){
+				+ " on t.xl=y.line_code order by gsdm,fgsdm,xl_name";
+		List<Map<String, Object>> lists=jdbcTemplate.query(sql,
+				objList.toArray(),
+				new RowMapper<Map<String, Object>>(){
 			 @Override 
 			 public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException { 
 				 Map<String, Object> s=new HashMap<String,Object>();
@@ -1124,7 +1160,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		Map<String, Object> tempMap=new HashMap<String,Object>();
 		tempMap.put("rq", "分类汇总");
 		tempMap.put("line_", "共" + list.size() + "条线路");
-		tempMap.put("xlName", "共" +count + "条线路");
+		tempMap.put("xlName", "共" + count + "条线路");
 		tempMap.put("jhcc", jhcc);
 		tempMap.put("sjcc", sjcc);
 		tempMap.put("sjcczgf", sjcczgf);
@@ -1144,6 +1180,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		}else{
 			tempMap.put("zxl", "0.00%");
 		}
+		
 		if (type.equals("export")) {
 			String lineName=map.get("lineName").toString();
 			ReportUtils ee = new ReportUtils();
@@ -1152,6 +1189,82 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 			ee.excelReplace(listI, new Object[] { tempMap }, path + "mould/calcTurnoutrate.xls", path + "export/"
 					+ dates + "-" + lineName + "-营运线路出车率统计表.xls");
 		}
+		
+		if (type.equals("exportAll")) {
+			List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+			Map<String, Map<String, Object>> tempKeyMap = new HashMap<String, Map<String, Object>>();
+			List<Map<String, Object>> removeList = new ArrayList<Map<String, Object>>();
+			for(Map<String, Object> m : list){
+				if(m.get("gsName") != null && m.get("gsName").toString().trim().length() > 0
+						&& m.get("gsName").toString().trim().contains("临港")){
+					removeList.add(m);
+				}
+			}
+			for(Map<String, Object> m : removeList){
+				list.remove(m);
+			}
+			for(Map<String, Object> m : list){
+				if(m.get("gsName")!=null && m.get("gsName").toString().trim().length() > 0){
+					Map<String, Object> temp = new HashMap<String, Object>();
+					String gsName = m.get("gsName").toString().trim();
+					if(tempKeyMap.containsKey(gsName)){
+						temp = tempKeyMap.get(gsName);
+						temp.put("count", Long.valueOf(temp.get("count").toString()) + 1);
+						temp.put("jhcc", Long.valueOf(m.get("jhcc")!=null?m.get("jhcc").toString():"0")
+								+ Long.valueOf(temp.get("jhcc")!=null?temp.get("jhcc").toString():"0"));
+						temp.put("sjcc", Long.valueOf(m.get("sjcc")!=null?m.get("sjcc").toString():"0")
+								+ Long.valueOf(temp.get("sjcc")!=null?temp.get("sjcc").toString():"0"));
+						temp.put("sjcczgf", Long.valueOf(m.get("sjcczgf")!=null?m.get("sjcczgf").toString():"0")
+								+ Long.valueOf(temp.get("sjcczgf")!=null?temp.get("sjcczgf").toString():"0"));
+						temp.put("jhbc", Long.valueOf(m.get("jhbc")!=null?m.get("jhbc").toString():"0")
+								+ Long.valueOf(temp.get("jhbc")!=null?temp.get("jhbc").toString():"0"));
+						temp.put("sjbc", Long.valueOf(m.get("sjbc")!=null?m.get("sjbc").toString():"0")
+								+ Long.valueOf(temp.get("sjbc")!=null?temp.get("sjbc").toString():"0"));
+						temp.put("qzpcs", Long.valueOf(m.get("qzpcs")!=null?m.get("qzpcs").toString():"0")
+								+ Long.valueOf(temp.get("qzpcs")!=null?temp.get("qzpcs").toString():"0"));
+					} else {
+						temp.put("rq", "");
+						temp.put("gsName", gsName);
+						temp.put("fgsName", "小计");
+						temp.put("count", 1);
+						temp.put("jhcc", m.get("jhcc")!=null?m.get("jhcc").toString()+"":"0");
+						temp.put("sjcc", m.get("sjcc")!=null?m.get("sjcc").toString()+"":"0");
+						temp.put("sjcczgf", m.get("sjcczgf")!=null?m.get("sjcczgf").toString()+"":"0");
+						temp.put("jhbc", m.get("jhbc")!=null?m.get("jhbc").toString()+"":"0");
+						temp.put("sjbc", m.get("sjbc")!=null?m.get("sjbc").toString()+"":"0");
+						temp.put("qzpcs", m.get("qzpcs")!=null?m.get("qzpcs").toString()+"":"0");
+						temp.put("sm", "");
+						tempList.add(temp);
+						tempKeyMap.put(gsName, temp);
+					}
+				}
+			}
+			
+			for(Map<String, Object> m : tempList){
+				m.put("line_", "共" + m.get("count").toString() + "条线路");
+				m.put("xlName", "共" + m.get("count").toString() + "条线路");
+				if(m.get("jhcc")!=null && Long.valueOf(m.get("jhcc").toString()) > 0l){
+					m.put("ccl", df.format((Float.valueOf(m.get("sjcc").toString()) / Long.valueOf(m.get("jhcc").toString()))*100)+"%");
+					m.put("cclzgf", df.format((Float.valueOf(m.get("sjcczgf").toString()) / Long.valueOf(m.get("jhcc").toString()))*100)+"%");
+				}else{
+					m.put("ccl", "0.00%");
+					m.put("cclzgf", "0.00%");
+				}
+				if(m.get("jhbc")!=null && Long.valueOf(m.get("jhbc").toString()) > 0l){
+					m.put("zxl", df.format((Float.valueOf(m.get("sjbc").toString()) / Long.valueOf(m.get("jhbc").toString()))*100)+"%");
+				}else{
+					m.put("zxl", "0.00%");
+				}
+				list.add(m);
+			}
+			
+			ReportUtils ee = new ReportUtils();
+			listI.add(list.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { tempMap }, path + "mould/calcTurnoutrate.xls", path + "export/"
+					+ dates + "-全部公司-营运线路出车率统计表.xls");
+		}
+		
 		list.add(tempMap);
 		return list;
 	}
 package com.bsth.service.report.impl;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
-import com.bsth.entity.CarDevice;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
+import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.excep.ArrivalInfo;
-import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
@@ -17,6 +16,7 @@ import com.bsth.entity.sys.Interval;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.LineService;
 import com.bsth.service.calc.CalcWaybillService;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.report.ReportService;
@@ -26,10 +26,8 @@ import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableJob;
 import com.bsth.util.ReportUtils;
 import com.bsth.util.db.DBUtils_MS;
-import com.google.protobuf.StringValue;
 import org.apache.commons.lang.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +35,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
-import java.io.FileOutputStream;
+import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -47,8 +45,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import javax.persistence.criteria.CriteriaBuilder.In;
-
 @Service
 public class ReportServiceImpl implements ReportService{
@@ -72,6 +68,8 @@ public class ReportServiceImpl implements ReportService{
 	@Autowired
 	CulateMileageService culateService;
 	@Autowired
+	LineService lineService;
+	@Autowired
 	LineRepository lineRepository;
 	@Autowired
 	StationRouteRepository stationRouteRepository;
@@ -2509,6 +2507,222 @@ public class ReportServiceImpl implements ReportService{
 		List<StationRoute> listStation= stationRouteRepository.findByLine(line,zd);
 		return listStation;
 	}
+	
+	@Override
+	public List<Map<String, Object>> countMileageSum(Map<String, Object> map) {
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		
+		String date="", date2="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+//		Map<String, Object> param = new HashMap<String, Object>();
+//		param.put("date", date);
+//		param.put("date2", date2);
+//		param.put("nature", nature);
+//		param.put("type", "query");
+//		List<Map<String, Object>> list = countByList(param);
+		List<Map<String, Object>> listAll = calcWaybillService.getLineMileage("", "", "", date, date2, "", "", "", "query");
+		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+		Map<String, Boolean> lineMap=lineService.lineNature();
+		if(nature.equals("0")){
+			list=listAll;
+		}else{
+			for (Map<String, Object> m : listAll) {
+				if(m.get("xl") != null && m.get("xl").toString().trim().length() > 0){
+					if(nature.equals("1")){
+						if(lineMap.get(m.get("xl").toString())){
+							list.add(m);
+						}
+					}else{
+						if(!lineMap.get(m.get("xl").toString())){
+							list.add(m);
+						}
+					}
+				}
+			}
+		}
+    	
+    	Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
+    	Map<String, Object> temp = new HashMap<String, Object>();
+    	temp.put("gsName", "杨高");temp.put("fgsName", "杨高分");temp.put("key", "05_5");
+    	resList.add(temp);keyMap.put("05_5", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "杨高");temp.put("fgsName", "金桥分");temp.put("key", "05_2");
+    	resList.add(temp);keyMap.put("05_2", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "杨高");temp.put("fgsName", "川沙分");temp.put("key", "05_1");
+    	resList.add(temp);keyMap.put("05_1", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "杨高");temp.put("fgsName", "周浦分");temp.put("key", "05_6");
+    	resList.add(temp);keyMap.put("05_6", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "杨高");temp.put("fgsName", "小计");temp.put("key", "05_sum");
+    	resList.add(temp);keyMap.put("05_sum", temp);
+    	
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "上南");temp.put("fgsName", "一分");temp.put("key", "55_4");
+    	resList.add(temp);keyMap.put("55_4", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "上南");temp.put("fgsName", "二分");temp.put("key", "55_1");
+    	resList.add(temp);keyMap.put("55_1", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "上南");temp.put("fgsName", "三分");temp.put("key", "55_2");
+    	resList.add(temp);keyMap.put("55_2", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "上南");temp.put("fgsName", "六分");temp.put("key", "55_3");
+    	resList.add(temp);keyMap.put("55_3", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "上南");temp.put("fgsName", "小计");temp.put("key", "55_sum");
+    	resList.add(temp);keyMap.put("55_sum", temp);
+    	
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "金高");temp.put("fgsName", "一分");temp.put("key", "22_5");
+    	resList.add(temp);keyMap.put("22_5", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "金高");temp.put("fgsName", "二分");temp.put("key", "22_2");
+    	resList.add(temp);keyMap.put("22_2", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "金高");temp.put("fgsName", "三分");temp.put("key", "22_3");
+    	resList.add(temp);keyMap.put("22_3", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "金高");temp.put("fgsName", "四分");temp.put("key", "22_1");
+    	resList.add(temp);keyMap.put("22_1", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "金高");temp.put("fgsName", "小计");temp.put("key", "22_sum");
+    	resList.add(temp);keyMap.put("22_sum", temp);
+    	
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "南汇");temp.put("fgsName", "一分");temp.put("key", "26_1");
+    	resList.add(temp);keyMap.put("26_1", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "南汇");temp.put("fgsName", "二分");temp.put("key", "26_2");
+    	resList.add(temp);keyMap.put("26_2", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "南汇");temp.put("fgsName", "三分");temp.put("key", "26_3");
+    	resList.add(temp);keyMap.put("26_3", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "南汇");temp.put("fgsName", "六分");temp.put("key", "26_6");
+    	resList.add(temp);keyMap.put("26_6", temp);
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "南汇");temp.put("fgsName", "小计");temp.put("key", "26_sum");
+    	resList.add(temp);keyMap.put("26_sum", temp);
+    	
+    	temp = new HashMap<String, Object>();
+    	temp.put("gsName", "浦交");temp.put("fgsName", " ");temp.put("key", "88");
+    	resList.add(temp);keyMap.put("88", temp);
+    	
+    	for(Map<String, Object> m : list){
+    		m.put("gsBm", m.get("gsdm"));
+    		m.put("fgsBm", m.get("fgsdm"));
+    		if(m.get("gsBm") != null && m.get("fgsBm") != null
+    				&& m.get("gsBm").toString().trim().length() > 0
+    				&& m.get("fgsBm").toString().trim().length() > 0){
+    			String gsBm = m.get("gsBm").toString().trim();
+    			String fgsBm = m.get("fgsBm").toString().trim();
+    			String key = gsBm + "_" + fgsBm;
+    			if(keyMap.containsKey(key)){
+    				Map<String, Object> t = keyMap.get(key);
+    				for(String s : m.keySet()){
+    					if("gsName,fgsName,key".contains(s)){
+    						continue;
+    					}
+    					try {
+    						if(t.containsKey(s)){
+    							t.put(s, new BigDecimal(t.get(s).toString()).add(new BigDecimal(m.get(s).toString())));
+    						} else {
+    							t.put(s, m.get(s).toString());
+    						}
+						} catch (Exception e) {
+							// TODO: handle exception
+							continue;
+						}
+    				}
+    			}
+    		}
+    	}
+    	
+    	for(Map<String, Object> m : resList){
+    		String key = m.get("key").toString();
+    		if(key.contains("_sum") || key.equals("88")){
+    			continue;
+    		}
+			
+			Map<String, Object> t = keyMap.get(key.split("_")[0] + "_sum");
+			for(String s : m.keySet()){
+				if("gsName,fgsName,key".contains(s)){
+					continue;
+				}
+				try {
+					if(t.containsKey(s)){
+						t.put(s, new BigDecimal(t.get(s).toString()).add(new BigDecimal(m.get(s).toString())));
+					} else {
+						t.put(s, m.get(s).toString());
+					}
+				} catch (Exception e) {
+					// TODO: handle exception
+					continue;
+				}
+			}
+			
+    		t = keyMap.get("88");
+			for(String s : m.keySet()){
+				if("gsName,fgsName,key".contains(s)){
+					continue;
+				}
+				try {
+					if(t.containsKey(s)){
+						t.put(s, new BigDecimal(t.get(s).toString()).add(new BigDecimal(m.get(s).toString())));
+					} else {
+						t.put(s, m.get(s).toString());
+					}
+				} catch (Exception e) {
+					// TODO: handle exception
+					continue;
+				}
+			}
+    	}
+    	
+    	if(type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			String xls="countMileageSum.xls";
+			ReportUtils ee = new ReportUtils();
+			try {
+				String dateTime = "";
+				if(date.equals(date2)){
+					dateTime = sdfSimple.format(sdfMonth.parse(date));
+				} else {
+					dateTime = sdfSimple.format(sdfMonth.parse(date))
+							+"-"+sdfSimple.format(sdfMonth.parse(date2));
+				}
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
+						path + "export/"+dateTime+"-审计公里汇总表.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+    	
+		return resList;
+	}
+	
 	@Override
 	public List<Map<String, Object>> countByList(Map<String, Object> map) {
 		// TODO Auto-generated method stub
@@ -2538,6 +2752,10 @@ public class ReportServiceImpl implements ReportService{
 		if(map.get("xlName")!=null){
 			xlName=map.get("xlName").toString();
 		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
 		String type="";
 		if(map.get("type")!=null){
 			type=map.get("type").toString();
@@ -2545,7 +2763,9 @@ public class ReportServiceImpl implements ReportService{
 		//所有班次信息
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		line =line.trim();
-		if(line.equals("")){
+		if(gsdm.equals("") && fgsdm.equals("") && line.equals("")){
+			list = scheduleRealInfoRepository.scheduleByDateAndLineTj3(date, date2);
+		} else if(line.equals("")){
 			//查询所有线路
 			list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2,gsdm,fgsdm);
 		}else{
@@ -2553,20 +2773,28 @@ public class ReportServiceImpl implements ReportService{
 			list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
 		}
+    	Map<String, Boolean> lineMap = lineService.lineNature();
+
+		List<String> objList = new ArrayList<String>();
 		String sql="select r.xl_bm"
 				+ " from bsth_c_s_sp_info_real r where"
-				+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
-
-
-		if(line.equals("")){
-			sql +="and r.gs_bm='"+gsdm+"' "
-					+ " and r.fgs_bm='"+fgsdm+"'";
+				+ " r.schedule_date_str BETWEEN ? and ?";
+		objList.add(date);
+		objList.add(date2);
+		if("".equals(gsdm.trim()) && "".equals(fgsdm.trim()) && "".equals(line.trim())){
+			
+		} else if(line.equals("")){
+			sql +=" and r.gs_bm=?"
+				+ " and r.fgs_bm like CONCAT('%',?,'%')";
+			objList.add(gsdm);
+			objList.add(fgsdm);
 		}else{
-			sql += " and r.xl_bm = '"+line+"'";
+			sql += " and r.xl_bm = ?";
+			objList.add(line);
 		}
 		sql += " group  by  r.xl_bm";
-		List<String> listLine=jdbcTemplate.query(sql, new RowMapper<String>() {
+		List<String> listLine=jdbcTemplate.query(sql, objList.toArray(), new RowMapper<String>() {
 			@Override
 			public String mapRow(ResultSet arg0, int arg1) throws SQLException {
 				String ve = arg0.getString("xl_bm");
@@ -2576,6 +2804,18 @@ public class ReportServiceImpl implements ReportService{
 		for (int i = 0; i < listLine.size(); i++) {
 			List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
 			String lineStr=listLine.get(i);
+			if("0".equals(nature)){  // 全部
+				
+			} else if("1".equals(nature)){  // 营运
+				if(!(lineMap.containsKey(lineStr) && lineMap.get(lineStr))){
+					continue;
+				}
+			} else {  // 非营运
+				if(lineMap.containsKey(lineStr) && lineMap.get(lineStr)){
+					continue;
+				}
+			}
+			
 			for (int j = 0; j < list.size(); j++) {
 				ScheduleRealInfo s=list.get(j);
 				if(s.getXlBm().equals(lineStr)){
@@ -2756,6 +2996,8 @@ public class ReportServiceImpl implements ReportService{
 				map.put("fgs", "");
 			}else{
 				map.put("xlName", list.get(0).getXlName());
+				map.put("gsBm", list.get(0).getGsBm());
+				map.put("fgsBm", list.get(0).getFgsBm());
 				map.put("gs", list.get(0).getGsName());
 				map.put("fgs", list.get(0).getFgsName());
 				map.put("jGh", list.get(0).getjGh());
@@ -30,8 +30,8 @@ public interface EmployeeConfigInfoService extends BService&lt;EmployeeConfigInfo, 
     void validate_jsy_destroy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
     // 验证售票员是否停用
     void validate_spy_destroy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
-    // 获取线路人员配置停用信息描述
-    List<String> validate_get_destroy_info(List<CompanyAuthority> companyAuthorityList);
+    // 获取人员停用信息（使用排班信息辅助判定）
+    List<String> validate_get_destory_info();
     void toggleCancel(Long id) throws ScheduleException;
     Long getMaxDbbm(Integer xlId);
@@ -34,6 +34,36 @@ public interface TTInfoDetailService extends BService&lt;TTInfoDetail, Long&gt; {
     DataToolsFile exportDynamicTTinfo(TTinfoDetailDynamicData.DTInfos dtInfos, DataToolsFileType type) throws ScheduleException;
     /**
+     * 导出时刻表预览视图信息。
+     * @param ttInfoId 时刻表Id
+     * @return
+     * @throws ScheduleException
+     */
+    DataToolsFile exportPvInfo(Long ttInfoId) throws ScheduleException;
+
+    /**
+     * 添加路牌（默认添加一个班次）。
+     * @param ttInfoId 时刻表Id
+     * @param lpId 路牌Id
+     */
+    void addLp(Long ttInfoId, Long lpId);
+
+    /**
+     * 删除指定路牌的所有班次。
+     * @param ttInfoId 时刻表Id
+     * @param lpId 路牌Id
+     */
+    void removeBcByLp(Long ttInfoId, Long lpId);
+
+    /**
+     * 将路牌A的班次和路牌B的班次调换。
+     * @param ttInfoId 时刻表Id
+     * @param lpAId 路牌AId
+     * @param lpBId 路牌BId
+     */
+    void switchBcByLp(Long ttInfoId, Long lpAId, Long lpBId);
+
+    /**
      * 获取时刻表最大发车顺序号
      * @param xlid 线路id
      * @param ttinfoid 时刻表id
@@ -4,6 +4,7 @@ import com.bsth.entity.Personnel;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.Module;
 import com.bsth.repository.PersonnelRepository;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
 import com.bsth.service.schedule.EmployeeService;
@@ -11,11 +12,15 @@ import com.bsth.service.schedule.ScheduleRule1FlatService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsService;
+import com.bsth.service.sys.ModuleService;
+import com.bsth.util.DateUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.ResultSetExtractor;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -277,51 +282,67 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
         }
     }
+    @Autowired
+    private ModuleService moduleService;
     @Transactional
     @Override
-    public List<String> validate_get_destroy_info(List<CompanyAuthority> companyAuthorityList) {
-        // 获取公司分公司权限代码
-        List<String> gs_fgs_dms = new ArrayList<>();
-        for (CompanyAuthority companyAuthority : companyAuthorityList) {
-            gs_fgs_dms.add(companyAuthority.getCompanyCode() + "_" + companyAuthority.getSubCompanyCode());
-        }
-
-        // 查询所有人员配置，不用in操作符，n+1查询慢，程序过滤
-        Map<String, Object> params = new HashMap<>();
-        List<EmployeeConfigInfo> employeeConfigInfoList_all = (List<EmployeeConfigInfo>) this.list(params);
-        List<EmployeeConfigInfo> employeeConfigInfoList = new ArrayList<>();
-        for (EmployeeConfigInfo employeeConfigInfo : employeeConfigInfoList_all) {
-            if (gs_fgs_dms.contains(employeeConfigInfo.getXl().getCgsbm())) {
-                employeeConfigInfoList.add(employeeConfigInfo);
+    public List<String> validate_get_destory_info() {
+        // 1、查找当前用户是否有运营计划管理，没有的话不分析是否有停用人鱼信息
+        List<Module> moduleList = this.moduleService.findByCurrentUser();
+        boolean hasPlanModule = false;
+        for (Module module : moduleList) {
+            if ("运营计划管理".equals(module.getName())) {
+                hasPlanModule = true;
+                break;
             }
         }
+        if (!hasPlanModule) {
+            return null;
+        }
-        // 停用信息
-        List<String> destroy_infos = new ArrayList<>();
-        String info_format = "线路[%s]中人员配置有停用人员，请处理！";
-        String info = "";
-        Integer xlId = null;
-        for (EmployeeConfigInfo employeeConfigInfo : employeeConfigInfoList) {
-            if (employeeConfigInfo.getJsy() != null &&
-                employeeConfigInfo.getJsy().getDestroy() != null &&
-                employeeConfigInfo.getJsy().getDestroy() == 1) { // 驾驶员判定是否停用
-                info = String.format(info_format, employeeConfigInfo.getXl().getName());
-                if (!destroy_infos.contains(info)) {
-                    destroy_infos.add(info);
-                }
-            }
-
-            if (employeeConfigInfo.getSpy() != null &&
-                employeeConfigInfo.getSpy().getDestroy() != null &&
-                employeeConfigInfo.getSpy().getDestroy() == 1) {
-                info = String.format(info_format, employeeConfigInfo.getXl().getName());
-                if (!destroy_infos.contains(info)) {
-                    destroy_infos.add(info);
-                }
+        // 2、计算从当前时间开始的排班计划中是否有停用人员
+        String sql =
+                "select distinct " +
+                "plan.xl_name xlName " +
+                ", plan.schedule_date scheduleDate " +
+                "from bsth_c_s_sp_info plan " +
+                "left join bsth_c_personnel jsy on jsy.id = plan.j " +
+                "left join bsth_c_personnel spy on spy.id = plan.s " +
+                "where plan.schedule_date >= ? " +
+                "and (jsy.destroy = 1 || spy.destroy = 1) " +
+                "group by plan.xl_name, plan.schedule_date " +
+                "order by plan.xl_name, plan.schedule_date ";
+
+//        String sql =
+//                "select distinct " +
+//                "pinfo.xl_name xlName " +
+//                ", pinfo.schedule_date scheduleDate " +
+//                "from " +
+//                "(" +
+//                "select plan.xl_name, plan.schedule_date " +
+//                "from bsth_c_s_sp_info plan " +
+//                "left join bsth_c_personnel jsy on plan.j = jsy.id " +
+//                "left join bsth_c_personnel spy on plan.s = spy.id " +
+//                "where schedule_date >= ? " +
+//                "and (jsy.destroy = 1 || spy.destroy = 1) " +
+//                "order by plan.xl_name asc, plan.schedule_date asc " +
+//                ") pinfo " +
+//                "group by pinfo.xl_name, pinfo.schedule_date ";
+
+
+        Date currentDate = new Date(DateUtils.getTimestamp());
+        System.out.println(currentDate);
+        String info_format = "线路[%s][%s]排班中有人员已经停用，请及时处理！";
+        List<String> infoList = this.jdbcTemplate.query(sql, new Object[] {currentDate}, new RowMapper<String>() {
+            @Override
+            public String mapRow(ResultSet resultSet, int i) throws SQLException {
+                String xlName = resultSet.getString("xlName");
+                Date scheduleDate = new Date(resultSet.getDate("scheduleDate").getTime());
+                return String.format(info_format, xlName, DateFormatUtils.format(scheduleDate, "yyyy年MM月dd日"));
             }
-        }
+        });
-        return destroy_infos;
+        return infoList;
     }
     @Transactional
@@ -1518,18 +1518,18 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		String sfyy = "", company = "", subCompany = "";
+		String sfyy = "", company = "", subCompany = "", line = "";
 		if(map.get("sfyy")!=null)
-			sfyy = map.get("sfyy").toString();
+			sfyy = map.get("sfyy").toString().trim();
 		if(map.get("company")!=null)
-			company = map.get("company").toString();
+			company = map.get("company").toString().trim();
 		if(map.get("subCompany")!=null)
-			subCompany = map.get("subCompany").toString();
-		String line = map.get("line").toString();
-//		String date = map.get("date").toString();
-		String startDate = map.get("startDate").toString();
-		String endDate = map.get("endDate").toString();
-		String type = map.get("type").toString();
+			subCompany = map.get("subCompany").toString().trim();
+		if(map.get("line")!=null)
+			line = map.get("line").toString().trim();
+		String startDate = map.get("startDate").toString().trim();
+		String endDate = map.get("endDate").toString().trim();
+		String type = map.get("type").toString().trim();
 		if(startDate.length() == 0)
 			startDate = sdf.format(new Date());
@@ -1547,20 +1547,31 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					+split2[0]+"年"+split2[1]+"月"+split2[2]+"日";
 		}
+		List<String> objList = new ArrayList<String>();
+		objList.add(startDate);
+		objList.add(endDate);
+		
 		try {
-			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_bm, 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,"
-					+ " a.fgs_bm, a.cc_service, a.remarks, a.adjust_exps, (select start_opt from bsth_c_line_config where id = "
-					+ " (select max(id) from bsth_c_line_config where line = (select id from bsth_c_line where line_code = a.xl_bm))) start_opt"
-					+ " from bsth_c_s_sp_info_real a where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"
+			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_bm, 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, a.gs_bm, a.fgs_bm, a.cc_service, a.remarks, a.adjust_exps, (select start_opt from bsth_c_line_config where id = "
+					+ " (select max(id) from bsth_c_line_config where line = (select id from bsth_c_line where line_code = a.xl_bm))) start_opt "
+					+ " from bsth_c_s_sp_info_real a where schedule_date_str >= ? and schedule_date_str <= ? "
 					+ " 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)
-				sql += " and gs_bm = '"+company+"'";
-			if(subCompany.length() != 0)
-				sql += " and fgs_bm = '"+subCompany+"'";
+			if(line.length() != 0){
+				sql += " and xl_bm = ? ";
+				objList.add(line);
+			}
+			if(company.length() != 0){
+				sql += " and gs_bm = ? ";
+				objList.add(company);
+			}
+			if(subCompany.length() != 0){
+				sql += " and fgs_bm = ? ";
+				objList.add(subCompany);
+			}
 			list = jdbcTemplate.query(sql,
+					objList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -1579,6 +1590,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
+					schedule.setGsBm(rs.getString("gs_bm"));
 					schedule.setFgsBm(rs.getString("fgs_bm"));
 					schedule.setCcService(rs.getBoolean("cc_service"));
 					schedule.setRemarks(rs.getString("remarks")!=null?rs.getString("remarks"):"");
@@ -1646,7 +1658,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				continue;
 			}
-			String key = s.getXlName() + "/" + s.getXlBm() + "/" + s.getFgsBm();
+			String key = s.getXlName() + "/" + s.getXlBm() + "/" + s.getFgsBm() + "/" + s.getGsBm();
 			String date = s.getScheduleDateStr();
 			if(!keyMap.containsKey(key)){
 				keyMap.put(key, new HashMap<String, List<ScheduleRealInfo>>());
@@ -1664,7 +1676,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		Map<Long, String> longMap = new HashMap<Long, String>();
 		for(String key : keyMap.keySet()){
 			String[] keys = key.split("/");
-			Long l = Long.valueOf(keys[2]) * 10000000000l + Long.valueOf(keys[1]);
+			Long l = Long.valueOf(keys[3] + keys[2]) * 10000000000l + Long.valueOf(keys[1]);
 			longMap.put(l, key);
 			longList.add(l);
 		}
@@ -1890,11 +1902,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("zdl", (jhbc<1?"0":nf.format((float) sjbc / jhbc * 100)) + "%");
 			for(Map<String, Object> m : mapList){
 				m.put("no", ++i);
-//				m.put("company", companyName);
-//				m.put("subCompany", subCompanyName);
 			}
+			tempMap.put("company", "");
+			tempMap.put("subCompany", "");
+			tempMap.put("line", "");
 			tempMap.put("map", mapList);
-			if(!type.equals("export"))
+			if(!type.contains("export"))
 				resList.add(tempMap);
 		}
@@ -1957,190 +1970,59 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				// TODO: handle exception
 				e.printStackTrace();
 			}
-		}
-		
-		return resList;
-	}
-	/*@Override
-	public List<Map<String, Object>> commandState(Map<String, Object> map) {
-		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-		Map<String, List<Map<String, Object>>> keyMap = new HashMap<String, List<Map<String, Object>>>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-		String company = map.get("company").toString();
-		String subCompany = map.get("subCompany").toString();
-		String line = map.get("line").toString();
-		String date = map.get("date").toString();
-		String code = map.get("code").toString();
-		String type = map.get("type").toString();
-		
-		if(date.length() == 0)
-			date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-		
-		try {
-			
-			String sql = 
-					"select r.id, r.schedule_date_str, r.xl_name, r.cl_zbh, r.j_gh, r.j_name, r.fcsj, d.timestamp, d.reply46, d.reply47, d.reply46time, d.reply47time, r.gs_name, r.fgs_name " +
-					"FROM bsth_c_s_sp_info_real as r left join bsth_v_directive_60 as d on r.id = d.sch and d.is_dispatch = 1 where schedule_date_str = '"+date+"'";
-			if(line.length() != 0){
-				sql += " and xl_bm = '"+line+"'";
-			}
-			if(code.length() != 0){
-				sql += " and cl_zbh = '"+code+"'";
-			}
-			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"'";
-			}
-			if(subCompany.length() != 0){
-				sql += " and fgs_bm = '"+subCompany+"'";
-			}
-			sql += " union " +
-					"select r.id, r.schedule_date_str, r.xl_name, r.cl_zbh, r.j_gh, r.j_name, r.fcsj, d.timestamp, d.reply46, d.reply47, d.reply46time, d.reply47time, r.gs_name, r.fgs_name " +
-					"FROM bsth_c_s_sp_info_real as r right join bsth_v_directive_60 as d on r.id = d.sch where d.is_dispatch = 1 and schedule_date_str = '"+date+"'";
-			if(line.length() != 0){
-				sql += " and xl_bm = '"+line+"'";
-			}
-			if(code.length() != 0){
-				sql += " and cl_zbh = '"+code+"'";
-			}
-			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"'";
+		} else if(type.equals("exportAll")){
+			List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+			Map<String, Map<String, Object>> tempKeyMap = new HashMap<String, Map<String, Object>>();
+			List<Map<String, Object>> removeList = new ArrayList<Map<String, Object>>();
+			for(Map<String, Object> m : resList){
+				if(m.get("gsName") != null && m.get("gsName").toString().trim().length() > 0
+						&& m.get("gsName").toString().trim().contains("临港")){
+					removeList.add(m);
+				}
 			}
-			if(subCompany.length() != 0){
-				sql += " and fgs_bm = '"+subCompany+"'";
+			for(Map<String, Object> m : removeList){
+				resList.remove(m);
 			}
-			sql += " order by xl_name, fcsj";
-
-			list = jdbcTemplate.query(sql,
-					new RowMapper<Map<String, Object>>(){
-				@Override
-				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
-					Map<String, Object> map = new HashMap<String, Object>();
-					map.put("id", rs.getString("id"));
-					map.put("date", rs.getString("schedule_date_str"));
-					map.put("line", rs.getString("xl_name"));
-					map.put("clZbh", rs.getString("cl_zbh"));
-					map.put("jGh", rs.getString("j_gh"));
-					map.put("jName", rs.getString("j_name"));
-					map.put("fcsj", rs.getString("fcsj"));
-					map.put("timestamp", rs.getString("timestamp"));
-					map.put("reply46", rs.getString("reply46"));
-					map.put("reply47", rs.getString("reply47"));
-					map.put("reply46time", rs.getString("reply46time"));
-					map.put("reply47time", rs.getString("reply47time"));
-					map.put("company", rs.getObject("gs_name"));
-					map.put("subCompany", rs.getObject("fgs_name"));
-					return map;
+			for(Map<String, Object> m : resList){
+				if(m.get("company")!=null && m.get("company").toString().trim().length() > 0){
+					Map<String, Object> temp = new HashMap<String, Object>();
+					String gsName = m.get("company").toString().trim();
+					if(tempKeyMap.containsKey(gsName)){
+						temp = tempKeyMap.get(gsName);
+						temp.put("jhbc", Long.valueOf(m.get("jhbc")!=null?m.get("jhbc").toString():"0")
+								+ Long.valueOf(temp.get("jhbc")!=null?temp.get("jhbc").toString():"0"));
+						temp.put("sjbc", Long.valueOf(m.get("sjbc")!=null?m.get("sjbc").toString():"0")
+								+ Long.valueOf(temp.get("sjbc")!=null?temp.get("sjbc").toString():"0"));
+					} else {
+						temp.put("date", "");
+						temp.put("company", gsName);
+						temp.put("subCompany", "小计");
+						temp.put("line", "");
+						temp.put("jhbc", m.get("jhbc")!=null?m.get("jhbc").toString()+"":"0");
+						temp.put("sjbc", m.get("sjbc")!=null?m.get("sjbc").toString()+"":"0");
+						tempList.add(temp);
+						tempKeyMap.put(gsName, temp);
+					}
 				}
-			});
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
-		List<String> keyList = new ArrayList<String>();
-		for(Map<String, Object> m : list){
-			String key = m.get("line") + "/" + m.get("clZbh") + "/" + m.get("jGh") + "/" + m.get("jName");
-			if(!keyList.contains(m.get("line").toString())){
-				keyList.add(m.get("line").toString());
-			}
-			if(!keyMap.containsKey(key))
-				keyMap.put(key, new ArrayList<Map<String, Object>>());
-			keyMap.get(key).add(m);
-		}
-		String companyName = "", subCompanyName = "";
-		for(String key : keyMap.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			Set<String> tempSet = new HashSet<String>();
-			int sjf = 0;
-			int wqr = 0;
-			for(Map<String, Object> m : keyMap.get(key)){
-				if(m.containsKey("company") && m.get("company")!=null && m.get("company").toString().length()!=0 && companyName.length()==0)
-					companyName = m.get("company").toString();
-				if(m.containsKey("subCompany") && m.get("subCompany")!=null && m.get("subCompany").toString().length()!=0 && subCompanyName.length()==0)
-					subCompanyName = m.get("subCompany").toString();
-				tempSet.add(m.get("id").toString());
-				if(m.get("timestamp") != null){
-					sjf++;
-					if(m.get("reply47").toString().equals("-1"))
-						wqr++;
-					m.put("time", sdf.format(new Date(Long.valueOf(m.get("timestamp").toString()))));
-				} else 
-					m.put("time", "/");
-				
-				if(m.get("reply46time") != null)
-					m.put("time46", sdf.format(new Date(Long.valueOf(m.get("reply46time").toString()))));
-				else 
-					m.put("time46", "/");
-				
-				if(m.get("reply47time") != null)
-					m.put("time47", sdf.format(new Date(Long.valueOf(m.get("reply47time").toString()))));
-				else 
-					m.put("time47", "/");
-				
 			}
-			tempMap.put("company", companyName);
-			tempMap.put("subCompany", subCompanyName);
-			String[] split = key.split("/");
-			tempMap.put("date", date);
-			tempMap.put("line", split[0]);
-			tempMap.put("clZbh", split[1]);
-			tempMap.put("jsy", split[2] + "/" + split[3]);
-			tempMap.put("jhf", tempSet.size());
-			tempMap.put("sjf", sjf);
-			tempMap.put("wqr", wqr);
-			tempMap.put("workList", keyMap.get(key));
-			tempList.add(tempMap);
-		}
-		
-		for(String key : keyList){
+			
 			for(Map<String, Object> m : tempList){
-				if(key.equals(m.get("line").toString())){
-					resList.add(m);
+				if(m.get("jhbc")!=null && Long.valueOf(m.get("jhbc").toString()) > 0l){
+					m.put("zdl", nf.format((float) Long.valueOf(m.get("sjbc").toString()) / Long.valueOf(m.get("jhbc").toString()) * 100) + "%");
+				}else{
+					m.put("zdl", "0.00%");
 				}
+				resList.add(m);
 			}
-		}
-		
-		if(type.equals("export")){
-			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String,Object> m = new HashMap<String, Object>();
 			ReportUtils ee = new ReportUtils();
 			try {
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState.xls",
-						path+"export/指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
-			} catch (Exception e) {
-				// TODO: handle exception
-				e.printStackTrace();
-			}
-		}
-		
-		if(type.equals("export1")){
-			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-					sdfSimple = new SimpleDateFormat("yyyyMMdd");
-			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-			Map<String,Object> m = new HashMap<String, Object>();
-			ReportUtils ee = new ReportUtils();
-			String jsy = map.get("jsy").toString();
-			try {
-				for(Map<String, Object> map1 : resList){
-					if(jsy.equals(map1.get("jsy").toString())){
-						List<Map<String, Object>> temp = (List<Map<String, Object>>)map1.get("workList");
-						listI.add(temp.iterator());
-						m.put("detail", "日期：" + map1.get("date") + "  公司：" + map1.get("company")
-								+ "  分公司：" + map1.get("subCompany") + "  线路：" + map1.get("line")
-								+ "  车辆：" + map1.get("clZbh") + "  人员：" + map1.get("jsy"));
-					}
-				}
-				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState1.xls",
-						path+"export/指令状态明细" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_sum.xls",
+						path+"export/" + dateTime + "-全部公司-线路首末班准点率.xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -2149,7 +2031,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return resList;
 	}
-*/
 	@Override
 	public List<Map<String, Object>> commandState(Map<String, Object> map) {
@@ -3,8 +3,11 @@ package com.bsth.service.schedule.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
-import com.bsth.entity.*;
+import com.bsth.entity.CarPark;
+import com.bsth.entity.Line;
+import com.bsth.entity.LineInformation;
 import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.LineRepository;
@@ -13,28 +16,30 @@ import com.bsth.repository.schedule.GuideboardInfoRepository;
 import com.bsth.repository.schedule.TTInfoDetailRepository;
 import com.bsth.repository.schedule.TTInfoRepository;
 import com.bsth.repository.sys.SysUserRepository;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.CarParkService;
 import com.bsth.service.LineInformationService;
 import com.bsth.service.LineService;
 import com.bsth.service.StationRouteService;
 import com.bsth.service.schedule.GuideboardInfoService;
 import com.bsth.service.schedule.TTInfoDetailService;
+import com.bsth.service.schedule.datatools.Excel2007PoiOperator;
+import com.bsth.service.schedule.datatools.ExcelPoiOperator;
 import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.datatools.TTinfoDetailDynamicData;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.timetable.ExcelData;
 import com.bsth.service.schedule.timetable.ExcelFormatType;
-import com.bsth.service.schedule.utils.DataToolsFile;
-import com.bsth.service.schedule.utils.DataToolsFileType;
-import com.bsth.service.schedule.utils.DataToolsService;
-import com.bsth.service.schedule.utils.PoiUtils;
+import com.bsth.service.schedule.utils.*;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -42,13 +47,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import java.awt.Color;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.*;
 import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 /**
  * Created by xu on 17/1/3.
@@ -149,6 +151,248 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
         return tTinfoDetailDynamicData.exportDynamicTTinfo(dtInfos, type);
     }
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
+    @Transactional
+    @Override
+    public DataToolsFile exportPvInfo(Long ttInfoId) throws ScheduleException {
+        // 1、获取时刻表，时刻表明细数据
+        TTInfo ttInfo = this.infoRepository.findOneExtend(ttInfoId);
+        List<TTInfoDetail> ttInfoDetailList = this.ttInfoDetailRepository.findByTtinfoId(ttInfoId);
+        LOGGER.info("----------------- 开始导出时刻表[{}]预览视图信息---------------", ttInfo.getName());
+
+        // 2、构造导出信息
+        try {
+            // 使用excel2007格式（xlsx）
+            ExcelPoiOperator excelPoiOperator = new Excel2007PoiOperator();
+            Workbook wb = excelPoiOperator.createWorkBook(); // 创建workbook
+            Sheet sheet = excelPoiOperator.createWorkBookSheet(wb, "预览信息"); // 创建sheet
+
+            // 创建表头（从第2行开始，第1行需要合并单元格显示站点名字）
+            int[] headColNums = new int[] {0, 1, 2, 3, 4, 7, 8, 9, 10, 11};
+            String[] headColLabels = new String[] {"序号", "路牌", "发车时间", "到达时间", "备注", "序号", "路牌", "发车时间", "到达时间", "备注"};
+            int[] headColWidth = new int[] {10, 10, 20, 20, 35, 10, 10, 20, 20, 35};
+
+            Row headRow = excelPoiOperator.createSheetRow(sheet, 1);
+            headRow.setHeight((short) (35 * 20)); // 单位：1/20个点
+            for (int i = 0; i < headColNums.length; i ++) {
+                excelPoiOperator.createCell(
+                        wb, headRow, (short) headColNums[i],
+                        headColLabels[i], XSSFCell.CELL_TYPE_STRING,
+                        HorizontalAlignment.CENTER, VerticalAlignment.CENTER,
+                        BorderStyle.THIN, new java.awt.Color(0x000000),
+                        (short) 14, new java.awt.Color(0xffffff), "宋体",
+                        new Color(0x857F7F), FillPatternType.SOLID_FOREGROUND);
+                sheet.setColumnWidth(headColNums[i], headColWidth[i] * 256); // 单位：1/256个字符宽度
+            }
+
+            // 获取上行线路并按照时间排序
+            List<TTInfoDetail> upBcList = sortedByBcsjAsc(ttInfoDetailList, true);
+            List<TTInfoDetail> downBcList = sortedByBcsjAsc(ttInfoDetailList, false);
+            int rowDiff = upBcList.size() - downBcList.size();
+            int rowSize;
+            if (rowDiff >= 0) { // 上行班次多
+                rowSize = downBcList.size();
+            } else { // 下行班次多
+                rowSize = upBcList.size();
+            }
+            for (int i = 0; i < rowSize; i++) {
+                Row bcRow = excelPoiOperator.createSheetRow(sheet, i + 2);
+                // 上行班次
+                excelPoiOperator.createIntegerCell(wb, bcRow, (short) 0, i + 1);
+                String lpName = upBcList.get(i).getLp().getLpName();
+                if (StringUtils.isNumeric(lpName)) {
+                    excelPoiOperator.createIntegerCell(wb, bcRow, (short) 1, Integer.valueOf(lpName));
+                } else {
+                    excelPoiOperator.createStringCell(wb, bcRow, (short) 1, lpName);
+                }
+                excelPoiOperator.createStringCell(wb, bcRow, (short) 2, upBcList.get(i).getFcsj());
+                Date ddsj_up = MyDateUtils.hhssTimePlusMinunits(upBcList.get(i).getFcsj(), upBcList.get(i).getBcsj(), 0);
+                excelPoiOperator.createStringCell(wb, bcRow, (short) 3, DateFormatUtils.format(ddsj_up, "HH:mm"));
+                excelPoiOperator.createStringCell(wb, bcRow, (short) 4, StringUtils.trimToEmpty(upBcList.get(i).getRemark()));
+
+                // 下行班次
+                excelPoiOperator.createIntegerCell(wb, bcRow, (short) 7, i + 1);
+                lpName = downBcList.get(i).getLp().getLpName();
+                if (StringUtils.isNumeric(lpName)) {
+                    excelPoiOperator.createIntegerCell(wb, bcRow, (short) 8, Integer.valueOf(lpName));
+                } else {
+                    excelPoiOperator.createStringCell(wb, bcRow, (short) 8, lpName);
+                }
+                excelPoiOperator.createStringCell(wb, bcRow, (short) 9, downBcList.get(i).getFcsj());
+                Date ddsj_down = MyDateUtils.hhssTimePlusMinunits(downBcList.get(i).getFcsj(), downBcList.get(i).getBcsj(), 0);
+                excelPoiOperator.createStringCell(wb, bcRow, (short) 10, DateFormatUtils.format(ddsj_down, "HH:mm"));
+                excelPoiOperator.createStringCell(wb, bcRow, (short) 11, StringUtils.trimToEmpty(downBcList.get(i).getRemark()));
+            }
+
+            List<TTInfoDetail> rowDiffBcList; // 剩下的班次
+            int rowDiffColIndexStart;
+            if (rowDiff >= 0) { // 上行班次多
+                rowDiffBcList = upBcList;
+                rowDiffColIndexStart = 0;
+            } else { // 下行班次多
+                rowDiffBcList = downBcList;
+                rowDiffColIndexStart = 7;
+            }
+            for (int i = rowSize; i < rowSize + Math.abs(rowDiff); i++) {
+                Row bcRow = excelPoiOperator.createSheetRow(sheet, i + 2);
+                excelPoiOperator.createIntegerCell(wb, bcRow, (short) (rowDiffColIndexStart + 0), i + 1);
+                String lpName = rowDiffBcList.get(i).getLp().getLpName();
+                if (StringUtils.isNumeric(lpName)) {
+                    excelPoiOperator.createIntegerCell(wb, bcRow, (short) (rowDiffColIndexStart + 1), Integer.valueOf(lpName));
+                } else {
+                    excelPoiOperator.createStringCell(wb, bcRow, (short) (rowDiffColIndexStart + 1), lpName);
+                }
+                excelPoiOperator.createStringCell(wb, bcRow, (short) (rowDiffColIndexStart + 2), rowDiffBcList.get(i).getFcsj());
+                Date ddsj = MyDateUtils.hhssTimePlusMinunits(rowDiffBcList.get(i).getFcsj(), rowDiffBcList.get(i).getBcsj(), 0);
+                excelPoiOperator.createStringCell(wb, bcRow, (short) (rowDiffColIndexStart + 3), DateFormatUtils.format(ddsj, "HH:mm"));
+                excelPoiOperator.createStringCell(wb, bcRow, (short) (rowDiffColIndexStart + 4), StringUtils.trimToEmpty(rowDiffBcList.get(i).getRemark()));
+
+            }
+
+            // 创建第一行，合并列
+            sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 4));
+            sheet.addMergedRegion(new CellRangeAddress(0, 0, 7, 11));
+            Row firstRow = excelPoiOperator.createSheetRow(sheet, 0);
+            firstRow.setHeight((short) (50 * 20)); // 单位：1/20个点
+            if (upBcList.size() > 0 && downBcList.size() > 0) {
+                String upBcLabel = "";
+                for (TTInfoDetail ttInfoDetail : upBcList) {
+                    if ("normal".equals(ttInfoDetail.getBcType())) {
+                        upBcLabel = "上行站点：" + ttInfoDetail.getQdzName() + " >> " + ttInfoDetail.getZdzName();
+                        break;
+                    }
+                }
+                String downBcLabel = "";
+                for (TTInfoDetail ttInfoDetail : downBcList) {
+                    if ("normal".equals(ttInfoDetail.getBcType())) {
+                        downBcLabel = "下行站点：" + ttInfoDetail.getQdzName() + " >> " + ttInfoDetail.getZdzName();
+                        break;
+                    }
+                }
+
+                excelPoiOperator.createCell(
+                        wb, firstRow, (short) 0,
+                        upBcLabel, XSSFCell.CELL_TYPE_STRING,
+                        HorizontalAlignment.CENTER, VerticalAlignment.CENTER,
+                        BorderStyle.NONE, new java.awt.Color(0x000000),
+                        (short) 20, new java.awt.Color(0xffffff), "宋体",
+                        new Color(0x857F7F), FillPatternType.SOLID_FOREGROUND);
+
+                excelPoiOperator.createCell(
+                        wb, firstRow, (short) 7,
+                        downBcLabel, XSSFCell.CELL_TYPE_STRING,
+                        HorizontalAlignment.CENTER, VerticalAlignment.CENTER,
+                        BorderStyle.NONE, new java.awt.Color(0x000000),
+                        (short) 20, new java.awt.Color(0xffffff), "宋体",
+                        new Color(0x857F7F), FillPatternType.SOLID_FOREGROUND);
+            }
+
+            // 锁定第1第2行
+            sheet.createFreezePane(0, 2);
+
+            // wb内存写入文件
+            String filepath = dataToolsProperties.getFileoutputDir() +
+                    File.separator +
+                    ttInfo.getName() + "预览信息-" +
+                    new DateTime().toString("yyyyMMddHHmmss") + ".xlsx";
+            File file = new File(filepath);
+            excelPoiOperator.writeExcel(file, wb);
+
+            DataToolsFile dataToolsFile = new DataToolsFile();
+            dataToolsFile.setFileType(DataToolsFileType.XLSX);
+            dataToolsFile.setFile(file);
+
+            return dataToolsFile;
+
+        } catch (Exception exp) {
+            LOGGER.error("----------------- 导出时刻表[{}]预览视图信息失败---------------", ttInfo.getName());
+            throw new ScheduleException(exp);
+        }
+    }
+    private List<TTInfoDetail> sortedByBcsjAsc(List<TTInfoDetail> bcList, boolean isUp) {
+        List<TTInfoDetail> sortedList = new ArrayList<>();
+        for (TTInfoDetail ttInfoDetail : bcList) {
+            if (isUp) {
+                if ("0".equals(ttInfoDetail.getXlDir())) {
+                    sortedList.add(ttInfoDetail);
+                }
+            } else {
+                if ("1".equals(ttInfoDetail.getXlDir())) {
+                    sortedList.add(ttInfoDetail);
+                }
+            }
+        }
+        Collections.sort(sortedList, new Comparator<TTInfoDetail>() {
+            @Override
+            public int compare(TTInfoDetail o1, TTInfoDetail o2) {
+                Date d1 = MyDateUtils.hhssTimePlusMinunits(o1.getFcsj(), 0, 0);
+                Date d2 = MyDateUtils.hhssTimePlusMinunits(o2.getFcsj(), 0, 0);
+
+                return d1.compareTo(d2);
+            }
+        });
+
+        return sortedList;
+    }
+
+    @Transactional
+    @Override
+    public void addLp(Long ttInfoId, Long lpId) {
+        List<TTInfoDetail> bcList = this.ttInfoDetailRepository.findBcdetails(ttInfoId, lpId);
+        if (!CollectionUtils.isEmpty(bcList)) {
+            throw new RuntimeException("路牌已经存在！");
+        }
+        List<TTInfoDetail> allBcList = this.ttInfoDetailRepository.findByTtinfoId(ttInfoId);
+        if (CollectionUtils.isEmpty(allBcList)) {
+            throw new RuntimeException("时刻表没有班次（添加路牌至少需要一个班次）！");
+        }
+
+        Integer maxBcs = this.ttInfoDetailRepository.findMaxBcs(ttInfoId).intValue();
+        GuideboardInfo lpInfo = this.guideboardInfoRepository.findById(lpId).get();
+        // 将当前时刻表的第一个班次作为新增路牌的第一个班次，然后设置发车时间为00:00
+        TTInfoDetail firstBc = allBcList.get(0);
+        TTInfoDetail newBc = new TTInfoDetail();
+        BeanUtils.copyProperties(firstBc, newBc);
+        newBc.setId(null);
+        newBc.setLp(lpInfo);
+        newBc.setFcno(1);
+        newBc.setBcs(maxBcs + 1);
+        newBc.setFcsj("00:00");
+        newBc.setCreateDate(new Date());
+        newBc.setUpdateDate(new Date());
+        newBc.setCreateBy(SecurityUtils.getCurrentUser());
+        newBc.setUpdateBy(SecurityUtils.getCurrentUser());
+
+        this.ttInfoDetailRepository.save(newBc);
+    }
+
+    @Transactional
+    @Override
+    public void removeBcByLp(Long ttInfoId, Long lpId) {
+        this.ttInfoDetailRepository.deleteByTtinfoIdAndLpidWithModify(ttInfoId, lpId);
+    }
+
+    @Transactional
+    @Override
+    public void switchBcByLp(Long ttInfoId, Long lpAId, Long lpBId) {
+        List<TTInfoDetail> lpABcList = this.ttInfoDetailRepository.findBcdetails(ttInfoId, lpAId);
+        List<TTInfoDetail> lpBBcList = this.ttInfoDetailRepository.findBcdetails(ttInfoId, lpBId);
+
+        if (!CollectionUtils.isEmpty(lpABcList) && !CollectionUtils.isEmpty(lpBBcList)) {
+            GuideboardInfo lpA = lpABcList.get(0).getLp();
+            GuideboardInfo lpB = lpBBcList.get(0).getLp();
+
+            for (TTInfoDetail lpABc : lpABcList) {
+                lpABc.setLp(lpB);
+            }
+            for (TTInfoDetail lpBBc : lpBBcList) {
+                lpBBc.setLp(lpA);
+            }
+        }
+    }
+
     @Override
     public TTInfoDetailForEdit.EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException {
         return ttInfoDetailForEdit.getEditInfo(xlid, ttid, maxfcno);
@@ -225,11 +469,11 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     /**
      * @description (TODO) 时刻表明细模型数据保存.
-     * 
+     *
      * @param  map
-     * 
+     *
      * @return : 返回保存操作后的状态.
-     * 
+     *
      * @exception 处理所有抛出来的异常.
      * */
     @Transactional
@@ -241,7 +485,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
    			//boolean b = map.get("istidc") ==null ? false : Boolean.parseBoolean(map.get("istidc").toString());
    			Long ttinfoid = map.get("skb") ==null ? null : Long.parseLong(map.get("skb").toString());
    			Integer xlid = map.get("xl") ==null ? null : Integer.parseInt(map.get("xl").toString());
-   			if(xlid !=null && ttinfoid !=null)  
+   			if(xlid !=null && ttinfoid !=null)
    	    		ttInfoDetailRepository.deltidc(xlid,ttinfoid);
    	    	if(d!=null)
    	    		ttInfoDetailRepository.saveAll(jsonArrayToListEntity(d));// 2、保存.
@@ -252,14 +496,14 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
    		rs_m.put("status", ResponseCode.SUCCESS);
    		return rs_m;
    	}
-   	
+
     /**
      * @description : (TODO) json班次数据转list班次.
-     * 
+     *
      * @param  jsonStr 班次json字符串]
-     * 
+     *
      * @return 返回一个list分装的班次数据.
-     * 
+     *
      * @status OK.
      * */
    	public List<TTInfoDetail> jsonArrayToListEntity(String jsonStr) throws Exception {
@@ -274,14 +518,14 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
    		}
    		return listTd;
    	}
-   	
+
    	/**
    	 * @description : (TODO) 班次map对象转实体对象.
-   	 * 
+   	 *
    	 * @param obj 班次map对象.
-   	 * 
+   	 *
    	 * @return 返回一个班次实体对象.
-   	 * 
+   	 *
    	 * @exception 异常暂先抛出去.
    	 * */
    	public TTInfoDetail objToEntity(JSONObject obj) throws Exception {
@@ -332,12 +576,12 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
    		// 22、返回实体对象.
    		return td;
    	}
-   	
+
    	/**
    	 * @description : (TODO) int转boolean类型.
-   	 * 
+   	 *
    	 * @param value--int类型的数值]
-   	 * 
+   	 *
    	 * @return : 返回一个布尔类型值.
    	 * */
    	public Boolean intToBit(int value) {
@@ -347,13 +591,13 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
    		else if(value ==1)
    			tag = true;
    		return tag;
-   	} 
-   	
+   	}
+
    	/**
    	 * @description (TODO) 获取路牌.
-   	 * 
+   	 *
    	 * @param xl --线路,name--路牌名称,code--路牌编码,lpType--路牌类型]
-   	 * 
+   	 *
    	 * @return 返回路牌.
    	 * */
    	public GuideboardInfo getLp(Line xl,String name, int code, String lpType) throws Exception {
@@ -380,18 +624,18 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
    			entity.setUpdateBy(null);
    			// 8、保存路牌.
    			guideboardInfoRepository.save(entity);
-   		} 
+   		}
    		// 9、返回路牌.
    		return entity;
    	}
-   	
+
    	/**
    	 * @description : (TODO) 线路方向转代码.
-   	 * 
+   	 *
    	 * @param str--方向字符串]
-   	 * 
+   	 *
    	 * @return 返回方向代码.
-   	 * 
+   	 *
    	 * @exception 异常暂先抛出.
    	 * */
    	public String dirToCod(String str) throws Exception {
@@ -326,6 +326,8 @@ public class DroolsSchedulePlan {
         schedulePlan.setScheduleToTime(this.to);
         schedulePlan.setCreateBy(this.schedulePlan.getCreateBy());
         schedulePlan.setUpdateBy(this.schedulePlan.getUpdateBy());
+        schedulePlan.setCreateDate(this.schedulePlan.getCreateDate());
+        schedulePlan.setUpdateDate(this.schedulePlan.getUpdateDate());
         // 1-1、构造drools规则输入数据，输出数据
         PlanCalcuParam_input planCalcuParam_input = new PlanCalcuParam_input(
+package com.bsth.service.schedule.utils;
+
+import org.apache.commons.lang3.time.DateUtils;
+import org.joda.time.DateTime;
+
+import java.util.Date;
+
+/**
+ * 日期处理工具类。
+ */
+public class MyDateUtils {
+
+    /**
+     * 将HH:mm格式的时间格式加上指定分钟后，生成新的日期返回。
+     * @param hhssDate
+     * @param minutes
+     * @param day 是否跨天
+     */
+    public static Date hhssTimePlusMinunits(String hhssDate, Integer minutes, Integer day) {
+        try {
+            DateTime newDate = new DateTime(DateUtils.parseDate("1980-01-01 " + hhssDate, "yyyy-MM-dd HH:mm"));
+            return newDate.plusDays(day).plusMinutes(minutes).toDate();
+        } catch (Exception exp) {
+            throw new RuntimeException(exp);
+        }
+    }
+}
+package com.bsth.service.schedule.utils;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+
+/**
+ * 相关Http层的util工具类。
+ */
+public class MyHttpUtils {
+    // 流输出文件
+    public static void responseStreamFile(HttpServletResponse response, File file) throws IOException {
+        // 流输出导出文件
+        response.setHeader("content-type", "application/octet-stream");
+        String fileName = file.getName();
+        if (MyStringUtils.isContainChinese(fileName)) {
+            response.setHeader("Content-Disposition", "attachment; filename*=" + URLEncoder.encode(fileName, "UTF-8"));
+        } else {
+            response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+        }
+        response.setContentType("application/octet-stream");
+
+        try (
+                OutputStream os = response.getOutputStream();
+                BufferedOutputStream bos = new BufferedOutputStream(os);
+                InputStream is = new FileInputStream(file);
+                BufferedInputStream bis = new BufferedInputStream(is)
+        ) {
+            int length;
+            byte[] temp = new byte[1024 * 10];
+            while ((length = bis.read(temp)) != -1) {
+                bos.write(temp, 0, length);
+            }
+            bos.flush();
+        }
+    }
+}
-server.port=9088
-
-# dubbo服务化使用开关flag
-dubbo.use=false
-
-#JPA
-spring.jpa.hibernate.ddl-auto= update
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
-spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
-spring.jpa.database= MYSQL
-spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= true
-
-#DATABASE
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password=
-#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#spring.datasource.username= root
-#spring.datasource.password= root
-spring.datasource.type= com.zaxxer.hikari.HikariDataSource
-
-#DATASOURCE SETTING
-spring.datasource.hikari.minimum-idle= 8
-spring.datasource.hikari.maximum-pool-size= 100
-#spring.datasource.hikari.auto-commit= true
-spring.datasource.hikari.idle-timeout= 60000
-#spring.datasource.hikari.pool-name= HikariPool
-spring.datasource.hikari.max-lifetime= 1800000
-spring.datasource.hikari.connection-timeout= 3000
-spring.datasource.hikari.connection-test-query= SELECT 1
-spring.datasource.hikari.validation-timeout= 3000
-spring.datasource.hikari.register-mbeans=true
-
-## gps client data
-http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
-## gateway real data
-http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
-## gateway send directive
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
-## rfid data
-http.rfid.url= http://114.80.178.12:29000/rfid
+server.port=9088
+
+# dubbo服务化使用开关flag
+dubbo.use=false
+
+#JPA
+spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
+spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
+spring.jpa.database= MYSQL
+spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
+spring.jpa.show-sql= true
+
+#DATABASE
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+#spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+##spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.username= root
+#spring.datasource.password=
+spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= root
+#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.username= root
+#spring.datasource.password= root
+spring.datasource.type= com.zaxxer.hikari.HikariDataSource
+
+#DATASOURCE SETTING
+spring.datasource.hikari.minimum-idle= 8
+spring.datasource.hikari.maximum-pool-size= 100
+#spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 60000
+#spring.datasource.hikari.pool-name= HikariPool
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 3000
+spring.datasource.hikari.connection-test-query= SELECT 1
+spring.datasource.hikari.validation-timeout= 3000
+spring.datasource.hikari.register-mbeans=true
+
+## gps client data
+http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
+## gateway real data
+http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
+## gateway send directive
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
+## rfid data
+http.rfid.url= http://114.80.178.12:29000/rfid
+## first last generate
+ms.fl.generate=true
 \ No newline at end of file
@@ -47,3 +47,5 @@ http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
 http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
 http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
 http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
+## first last generate
+ms.fl.generate=true
 \ No newline at end of file
@@ -38,3 +38,5 @@ http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
 #http.send.directive = http://10.10.200.79:8080/transport_server/message/
 ## rfid data
 http.rfid.url= http://10.10.200.82:9000/rfid
+## first last generate
+ms.fl.generate=false
 \ No newline at end of file
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform == 'win32';
 var sp = platform == 'win32' ? '\\' : '/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute']
     , ep = new EventProxy()
     , pName = 'bsth_control'
     , path = process.cwd()
@@ -280,7 +280,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $("#checkDl").on('click', function () {
             if ($("#rq").val() != "") {
             	var params=getParamsList();
-            	$get('/ylb/checkDate',params,function(status){
+            	var par={};
+            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+            	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
@@ -301,7 +304,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             console.log("进场油量等于出场油量");
             if ($("#rq").val() != "") {
             	var params=getParamsList();
-            	$get('/ylb/checkDate',params,function(status){
+            	var par={};
+            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+            	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
@@ -321,7 +327,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         //保存
         $("#saveButton").on('click',function(){
         	var params_=getParamsList();
-        	$get('/ylb/checkDate',params_,function(status){
+        	var par={};
+        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+        	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
@@ -433,7 +442,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $("#obtain").on('click', function () {
             if ($("#rq").val() != "") {
             	var params=getParamsList();
-            	$get('/ylb/checkDate',params,function(status){
+            	var par={};
+            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+            	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
@@ -598,7 +610,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         function jsyUpdate(){
         	var params=getParamsList();
 			var id = $(this).data('id');
-        	$get('/ylb/checkDate',params,function(status){
+        	var par={};
+        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+        	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
@@ -742,7 +757,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
       //删除
         $('#removeButton').on('click', function () {
         	var params_=getParamsList();
-        	$get('/ylb/checkDate',params_,function(status){
+        	var par={};
+        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+        	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
-<style type="text/css">
-    .table-bordered {
-        border: 1px solid; }
-    .table-bordered > thead > tr > th,
-    .table-bordered > thead > tr > td,
-    .table-bordered > tbody > tr > th,
-    .table-bordered > tbody > tr > td,
-    .table-bordered > tfoot > tr > th,
-    .table-bordered > tfoot > tr > td {
-        border: 1px solid;
-        text-align: center; }
-    .table-bordered > thead > tr > th,
-    .table-bordered > thead > tr > td {
-        border-bottom-width: 2px; }
-
-    .table > tbody + tbody {
-        border-top: 1px solid; }
-
-
-    #analy_body   tr> td >span{
-        word-break: keep-all;white-space:nowrap;
-    }
-
-    #analy_body td{
-        min-width: 100px;
-        max-width: 100px;
-        width: 100px;
-    }
-
-    #analy_body{
-        margin-top: 20px;
-        height: 620px;
-        width: 100%
-    }
-
-
-    .table_head::-webkit-scrollbar {
-        display:none
-    }
-
-    .table_head{
-        min-width: 906px;
-        width: 100%;
-        overflow: hidden;
-    }
-
-    .table_body{
-        width:101%;
-        height:580px;
-        overflow: auto;
-        margin-top: -20px;
-    }
-</style>
-<div class="page-head">
-    <div class="page-title">
-        <h1>路单线路明细月报表</h1>
-    </div>
-</div>
-
-<!--<div class="row">-->
-<div class=" row col-md-12 portlet light  bordered" style="height:calc(100% - 38px)">
-    <div class="">
-        <form class="form-inline" >
-            <!--<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_daily">
-                <span class="item-label" style="width: 80px;">&#12288;&#12288;公司: </span>
-                <select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
-            </div>-->
-            <div style="display: inline-block; margin-left: 33px;" id="fgsdmDiv_daily">
-                <span class="item-label" style="width: 80px;">&#12288;分公司: </span>
-                <select class="form-control" name="fgsdm" id="fgsdm" style="width: 180px;"></select>
-            </div>
-            <!--<div style="display: inline-block;margin-left: 33px;">
-                <span class="item-label" style="width: 80px;">&#12288;&#12288;线路: </span>
-                <select class="form-control" name="line" id="line" style="width: 180px;"></select>
-            </div>-->
-            <div style="display: inline-block; margin-left: 33px;">
-                <span class="item-label" style="width: 80px;">线路性质: </span>
-                <select class="form-control" name="destroy" id="destroy" style="width: 180px;">
-                    <option value="0,1">全部线路</option>
-                    <option value="0">营运线路</option>
-                    <option value="1">非营运线路</option>
-                </select>
-            </div>
-            <div style="display: inline-block;margin-left: 33px;" class="date-picker">
-                <span class="item-label" style="width: 80px;">&#12288;&#12288;时间: </span>
-                <input class="form-control" type="text" id="startDate" style="width: 180px;" /> -
-                <input class="form-control" type="text" id="endDate" style="width: 180px;" />
-                <!--<input class="form-control" type="text" id="startDate" style="width: 180px;" value="2020-10-01"/> - -->
-                <!--<input class="form-control" type="text" id="endDate" style="width: 180px;" value="2020-10-10"/>-->
-            </div>
-            <div style="margin-top: 2px"></div>
-
-            <div style="display: inline-block;margin-left: 33px;">
-                <span class="item-label" style="width: 80px;">统计对象: </span>
-                <select class="form-control" name="statisticalObj" id="statisticalObj" style="width: 180px;">
-                    <option value="cl">车辆</option>
-                    <option value="jsy">驾驶员</option>
-                    <option value="cwy">乘务员</option>
-                    <option value="xl">线路</option>
-                </select>
-            </div>
-
-            <div style="display: inline-block; margin-left: 33px;" >
-                <span class="item-label" style="width: 80px;">统计项目: </span>
-                <select class="form-control" name="statisticalItem" id="statisticalItem" style="width: 180px;">
-                    <option value="yh">油耗</option>
-                    <option value="dh">电耗</option>
-                    <option value="gl">公里</option>
-                    <option value="bc">班次</option>
-                </select>
-            </div>
-            <div style="display: inline-block; margin-left: 33px;" >
-                <span class="item-label" style="width: 80px;">项目明细: </span>
-                <select class="form-control" name="itemDetails" id="itemDetails" style="width: 180px;"></select>
-            </div>
-            <div class="form-group" style="display: inline-block;margin-left: 62px;">
-                <input class="btn btn-default" type="button" id="query" value="筛选"/>
-                <input class="btn btn-default" type="button" id="export" value="导出"/>
-            </div>
-        </form>
-    </div>
-
-    <div id="analy_body">
-        <div class="table_head" id="table_head">
-            <table class="table table-bordered table-hover table-checkable " id="forms_head">
-                <thead>
-                </thead>
-            </table>
-        </div>
-        <div class="table_body" id="table_body">
-            <table class="table table-bordered table-hover table-checkable" id="forms_body">
-                <tbody>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-<script >
-    $(function(){
-        $('#export').attr('disabled', "true");
-        // 关闭左侧栏
-        if (!$('body').hasClass('page-sidebar-closed'))
-            $('.menu-toggler.sidebar-toggler').click();
-
-        var table_body1 = document.getElementById("table_body");
-        table_body1.onscroll = function(){
-            var table_body1_left = this.scrollLeft;
-            document.getElementById("table_head").scrollLeft = table_body1_left;
-        };
-
-        var d = new Date();
-        d.setTime(d.getTime() - 4*1000*60*60*24);//只能查4天以前的数据
-        var year = d.getFullYear();
-        var month = d.getMonth() + 1;
-        var day = d.getDate();
-        if(month < 10)
-            month = "0" + month;
-        if(day < 10)
-            day = "0" + day;
-        //时间
-        var dateTime=year + "-" + month + "-" + day;
-        $("#startDate").val(dateTime);
-        $("#endDate").val(dateTime);
-
-        $("#endDate").datetimepicker({
-            format : 'YYYY-MM-DD',
-            locale : 'zh-cn',
-            maxDate : dateTime
-        });
-        $("#startDate").datetimepicker({
-            format : 'YYYY-MM-DD',
-            locale : 'zh-cn',
-            maxDate : dateTime
-        });
-
-        var lineAll="";
-        var datas = {}; //查询条件
-
-        /**用户分配的线路*/
-        $.get('/realControAuthority/findByCurrentUser', function (userAuthor) {
-            lineAll = userAuthor.lineCodeStr.substring(0,userAuthor.lineCodeStr.length-1);
-        });
-
-        var tempData = {};
-
-        $.get('/user/companyData', function(obj) {
-            var option = '';
-            var allC = "";
-            for (var i = 0; i < obj.length; i++) {
-                if (obj[i].companyCode == "26") {
-                    var children = obj[i].children;
-                    for (var j = 0; j < children.length; j++) {
-                        allC += children[j].code+",";
-                        option += '<option value="' + children[j].code + '">' + children[j].name + '</option>';
-                    }
-                }
-            }
-
-            var options = '<option value="'+allC.substring(0,allC.length-1)+'">所有分公司</option>'+option;
-            $('#fgsdm').html(options);
-        });
-
-        // 项目明细选项列
-        // 触发默认选项
-        updateItem();
-        $("#statisticalItem").on("change",updateItem);
-        function updateItem() {
-            var item = $('#statisticalItem').val();
-            var options = '';
-            if(item == "yh"){
-                options += '<option value="jzlAll">加注量[全部]</option>' +
-                    '<option value="jzl0">加注量[0#]</option>'+
-                    '<option value="jzl-10">加注量[-10#]</option>'+
-                    '<option value="yhl">油耗量</option>'+
-                    '<option value="cccy">出场存油</option>'+
-                    '<option value="jccy">进场存油</option>'+
-                    '<option value="bglyh">百公里油耗</option>';
-            } else if(item == "gl"){
-                options += '<option value="zgl">总公里</option>' +
-                    '<option value="jhgl">计划公里</option>';
-                /*'<option value="jclm">进场路码</option>'+
-                '<option value="cclm">出场路码</option>'*/
-            } else if(item == "bc"){
-                options += '<option value="sjbc">实际班次</option>' +
-                    '<option value="jhbc">计划班次</option>';
-            } else if(item == "dh"){
-                options += '<option value="dh">耗电量</option>';
-                options += '<option value="cdl">充电量</option>';
-                options += '<option value="cccd">出场存电</option>';
-                options += '<option value="jccd">进场存电</option>';
-                options += '<option value="bgldh">百公里电耗</option>';
-            }
-            $('#itemDetails').html(options);
-        }
-
-        //线路名称
-        var lineName = '';
-        $("#query").on("click",function(){
-            var gsdm = "26";
-            var fgsdm = $("#fgsdm").val();
-            var startDate = $("#startDate").val();
-            var endDate = $("#endDate").val();
-            var statisticalObj = $("#statisticalObj").val();
-            //开始和结束时间
-            var startTime = Date.parse(new Date(startDate));
-            var endTime = Date.parse(new Date(endDate));
-
-            datas = {}; // 清空之前数据
-            datas.gsdm = gsdm;
-            datas.fgsdm = fgsdm;
-            datas.lineCode = lineAll;
-            datas.timeType = "m";
-            datas.startDate = startDate;
-            datas.endDate = endDate;
-            datas.destroy = $("#destroy").val();
-            datas.statisticalObj = $("#statisticalObj").val();
-            datas.itemDetails = $("#itemDetails").val();
-            var itemDetails = datas.itemDetails,
-                type = "加注量[全部]";
-            if(itemDetails=="jzl0"){
-                type = "加注量[0#]"
-            } else if(itemDetails=="jzl-10"){
-                type = "加注量[-10#]"
-            } else if(itemDetails=="yhl"){
-                type = "油耗量"
-            } else if(itemDetails=="cccy"){
-                type = "出场存油"
-            } else if(itemDetails=="jccy"){
-                type = "进场存油"
-            } else if(itemDetails=="bglyh"){
-                type = "百公里油耗"
-            } else if(itemDetails=="zgl"){
-                type = "总公里"
-            } else if(itemDetails=="jhgl"){
-                type = "计划公里"
-            } else if(itemDetails=="jclm"){
-                type = "进场路码"
-            } else if(itemDetails=="cclm"){
-                type = "出场路码"
-            } else if(itemDetails=="sjbc"){
-                type = "实际班次"
-            } else if(itemDetails=="jhbc"){
-                type = "计划班次"
-            } else if(itemDetails=="dh"){
-                type = "耗电量"
-            } else if(itemDetails=="cdl"){
-                type = "充电量"
-            } else if(itemDetails=="cccd"){
-                type = "出场存电"
-            } else if(itemDetails=="jccd"){
-                type = "进场存电"
-            } else if(itemDetails=="bgldh"){
-                type = "百公里电耗"
-            }
-            datas.name = datas.startDate+"-"+datas.endDate+"-路单线路明细月报表("+type+")";
-            if(startDate==null || startDate =="" ||endDate==null || endDate ==""){
-                layer.msg('请选择时间段！');
-            }else if(endTime<startTime){
-                layer.msg('结束日期不能小于开始日期！');
-            }else {
-                if (endDate.substring(0, 7) != startDate.substring(0, 7)) {
-                    layer.msg("请查询同月份数据！");
-                    return;
-                } else {
-                    var lodingI = layer.load(2);
-                    $get('/calcWaybill/calcDetailMonthly', datas, function (rs) {
-                        if (rs.length <=0) {
-                            layer.close(lodingI);
-                            layer.open({
-                                title: '提示'
-                                , content: '没有您要查询的数据，请重新选择参数！'
-                            });
-                            $("#export").attr('disabled',"true");
-                            return;
-                        }else
-                            $("#export").removeAttr("disabled");
-                        var htmlHead = "<tr><td colspan='"+rs[0].length+"'>"+datas.name+"</td></tr>", htmlBody = "";
-                        var rsLength = rs.length;
-                        rs.forEach(function (o, i) {
-                            var html = "<tr>"
-                            o.forEach(function (td, j) {
-                                var colspan;
-                                if (i == rsLength - 1 && j == 0) {
-                                    colspan = (statisticalObj == "xl" ?  "colspan='3'" : "colspan='5'");
-                                    if(statisticalObj == "cl")
-                                        colspan = "colspan='6'";
-                                }
-                                html += "<td " + colspan + ">" + td + "</td>"
-                            });
-                            html += "</tr>"
-                            if (i == 0) {
-                                htmlHead += html;
-                            } else
-                                htmlBody += html;
-                        });
-                        $('#forms_head thead').html(htmlHead);
-                        $('#forms_body tbody').html(htmlBody);
-                        layer.close(lodingI);
-                    });
-                }
-            }
-        });
-
-        $("#export").on("click",function(){
-            $post("/report/calcDetailMonthlyE",datas,function(result){
-                window.open("/downloadFile/download?fileName="+datas.name);
-            });
-        });
-    });
-</script>
-<!--<script type="application/javascript" src="/pages/forms/calc/calcDetailMonthly.js"></script>-->
+<style type="text/css">
+    .table-bordered {
+        border: 1px solid; }
+    .table-bordered > thead > tr > th,
+    .table-bordered > thead > tr > td,
+    .table-bordered > tbody > tr > th,
+    .table-bordered > tbody > tr > td,
+    .table-bordered > tfoot > tr > th,
+    .table-bordered > tfoot > tr > td {
+        border: 1px solid;
+        text-align: center; }
+    .table-bordered > thead > tr > th,
+    .table-bordered > thead > tr > td {
+        border-bottom-width: 2px; }
+
+    .table > tbody + tbody {
+        border-top: 1px solid; }
+
+
+    #analy_body   tr> td >span{
+        word-break: keep-all;white-space:nowrap;
+    }
+
+    #analy_body td{
+        min-width: 100px;
+        max-width: 100px;
+        width: 100px;
+    }
+
+    #analy_body{
+        margin-top: 20px;
+        height: 620px;
+        width: 100%
+    }
+
+
+    .table_head::-webkit-scrollbar {
+        display:none
+    }
+
+    .table_head{
+        min-width: 906px;
+        width: 100%;
+        overflow: hidden;
+    }
+
+    .table_body{
+        width:101%;
+        height:580px;
+        overflow: auto;
+        margin-top: -20px;
+    }
+</style>
+<div class="page-head">
+    <div class="page-title">
+        <h1>路单线路明细月报表</h1>
+    </div>
+</div>
+
+<!--<div class="row">-->
+<div class=" row col-md-12 portlet light  bordered" style="height:calc(100% - 38px)">
+    <div class="">
+        <form class="form-inline" >
+            <div style="display: inline-block; margin-left: 13px;" id="gsdmDiv_daily">
+                <span class="item-label" style="width: 80px;">&#12288;&#12288;公司: </span>
+                <select class="form-control" name="company" id="gsdm" style="width: 150px;"></select>
+            </div>
+            <div style="display: inline-block; margin-left: 13px;" id="fgsdmDiv_daily">
+                <span class="item-label" style="width: 80px;">&#12288;分公司: </span>
+                <select class="form-control" name="fgsdm" id="fgsdm" style="width: 150px;"></select>
+            </div>
+            <!--<div style="display: inline-block;margin-left: 33px;">
+                <span class="item-label" style="width: 80px;">&#12288;&#12288;线路: </span>
+                <select class="form-control" name="line" id="line" style="width: 180px;"></select>
+            </div>-->
+            <div style="display: inline-block;margin-left: 13px;" class="date-picker">
+                <span class="item-label" style="width: 80px;">&#12288;&#12288;时间: </span>
+                <input class="form-control" type="text" id="startDate" style="width: 150px;" /> -
+                <input class="form-control" type="text" id="endDate" style="width: 150px;" />
+                <!--<input class="form-control" type="text" id="startDate" style="width: 180px;" value="2020-10-01"/> - -->
+                <!--<input class="form-control" type="text" id="endDate" style="width: 180px;" value="2020-10-10"/>-->
+            </div>
+            
+            <div style="margin-top: 2px"></div>
+            
+            <div style="display: inline-block; margin-left: 13px;">
+                <span class="item-label" style="width: 80px;">线路性质: </span>
+                <select class="form-control" name="destroy" id="destroy" style="width: 150px;">
+                    <option value="0,1">全部线路</option>
+                    <option value="0">营运线路</option>
+                    <option value="1">非营运线路</option>
+                </select>
+            </div>
+            <div style="display: inline-block;margin-left: 13px;">
+                <span class="item-label" style="width: 80px;">统计对象: </span>
+                <select class="form-control" name="statisticalObj" id="statisticalObj" style="width: 150px;">
+                    <option value="cl">车辆</option>
+                    <option value="jsy">驾驶员</option>
+                    <option value="cwy">乘务员</option>
+                    <option value="xl">线路</option>
+                </select>
+            </div>
+
+            <div style="display: inline-block; margin-left: 13px;" >
+                <span class="item-label" style="width: 80px;">统计项目: </span>
+                <select class="form-control" name="statisticalItem" id="statisticalItem" style="width: 150px;">
+                    <option value="yh">油耗</option>
+                    <option value="dh">电耗</option>
+                    <option value="gl">公里</option>
+                    <option value="bc">班次</option>
+                </select>
+            </div>
+            <div style="display: inline-block; margin-left: 13px;" >
+                <span class="item-label" style="width: 80px;">项目明细: </span>
+                <select class="form-control" name="itemDetails" id="itemDetails" style="width: 150px;"></select>
+            </div>
+            <div class="form-group" style="display: inline-block;margin-left: 22px;">
+                <input class="btn btn-default" type="button" id="query" value="筛选"/>
+                <input class="btn btn-default" type="button" id="export" value="导出"/>
+            </div>
+        </form>
+    </div>
+
+    <div id="analy_body">
+        <div class="table_head" id="table_head">
+            <table class="table table-bordered table-hover table-checkable " id="forms_head">
+                <thead>
+                </thead>
+            </table>
+        </div>
+        <div class="table_body" id="table_body">
+            <table class="table table-bordered table-hover table-checkable" id="forms_body" style="background-color: white;">
+                <tbody>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+<script >
+    $(function(){
+        $('#export').attr('disabled', "true");
+        // 关闭左侧栏
+        if (!$('body').hasClass('page-sidebar-closed'))
+            $('.menu-toggler.sidebar-toggler').click();
+
+        var table_body1 = document.getElementById("table_body");
+        table_body1.onscroll = function(){
+            var table_body1_left = this.scrollLeft;
+            document.getElementById("table_head").scrollLeft = table_body1_left;
+        };
+
+        var d = new Date();
+        d.setTime(d.getTime() - 4*1000*60*60*24);//只能查4天以前的数据
+        var year = d.getFullYear();
+        var month = d.getMonth() + 1;
+        var day = d.getDate();
+        if(month < 10)
+            month = "0" + month;
+        if(day < 10)
+            day = "0" + day;
+        //时间
+        var dateTime=year + "-" + month + "-" + day;
+        $("#startDate").val(dateTime);
+        $("#endDate").val(dateTime);
+
+        $("#endDate").datetimepicker({
+            format : 'YYYY-MM-DD',
+            locale : 'zh-cn',
+            maxDate : dateTime
+        });
+        $("#startDate").datetimepicker({
+            format : 'YYYY-MM-DD',
+            locale : 'zh-cn',
+            maxDate : dateTime
+        });
+
+        var lineAll="";
+        var datas = {}; //查询条件
+
+        /**用户分配的线路*/
+        $.get('/realControAuthority/findByCurrentUser', function (userAuthor) {
+            lineAll = userAuthor.lineCodeStr.substring(0,userAuthor.lineCodeStr.length-1);
+        });
+
+        var tempData = {};
+
+        $.get('/user/companyData', function(result){
+			var obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			
+			if(obj.length ==0){
+				 $("#gsdmDiv_daily").css('display','none');
+			}else if(obj.length ==1){
+				 $("#gsdmDiv_daily").css('display','none');
+				if(obj[0].children.length == 1  || obj[0].children.length == 0){
+					fage=false;
+					$('#gsdmDiv_daily').css('display','none');
+				}
+			}
+			$('#gsdm').html(options);
+			updateCompany();
+		});
+		$("#gsdm").on("change",updateCompany);
+		
+		function updateCompany(){
+			var company = $('#gsdm').val();
+	        $.get('/user/companyData', function(obj) {
+	            var option = '';
+	            var allC = "";
+	            for (var i = 0; i < obj.length; i++) {
+	                if (obj[i].companyCode == company) {
+	                    var children = obj[i].children;
+	                    for (var j = 0; j < children.length; j++) {
+	                        allC += children[j].code+",";
+	                        option += '<option value="' + children[j].code + '">' + children[j].name + '</option>';
+	                    }
+	                }
+	            }
+	
+	            var options = '<option value="'+allC.substring(0,allC.length-1)+'">所有分公司</option>'+option;
+	            $('#fgsdm').html(options);
+	        });
+		}
+
+        // 项目明细选项列
+        // 触发默认选项
+        updateItem();
+        $("#statisticalItem").on("change",updateItem);
+        function updateItem() {
+            var item = $('#statisticalItem').val();
+            var options = '';
+            if(item == "yh"){
+                options += '<option value="jzlAll">加注量[全部]</option>' +
+                    '<option value="jzl0">加注量[0#]</option>'+
+                    '<option value="jzl-10">加注量[-10#]</option>'+
+                    '<option value="yhl">油耗量</option>'+
+                    '<option value="cccy">出场存油</option>'+
+                    '<option value="jccy">进场存油</option>'+
+                    '<option value="bglyh">百公里油耗</option>';
+            } else if(item == "gl"){
+                options += '<option value="zgl">总公里</option>' +
+                    '<option value="jhgl">计划公里</option>';
+                /*'<option value="jclm">进场路码</option>'+
+                '<option value="cclm">出场路码</option>'*/
+            } else if(item == "bc"){
+                options += '<option value="sjbc">实际班次</option>' +
+                    '<option value="jhbc">计划班次</option>';
+            } else if(item == "dh"){
+                options += '<option value="dh">耗电量</option>';
+                options += '<option value="cdl">充电量</option>';
+                options += '<option value="cccd">出场存电</option>';
+                options += '<option value="jccd">进场存电</option>';
+                options += '<option value="bgldh">百公里电耗</option>';
+            }
+            $('#itemDetails').html(options);
+        }
+
+        //线路名称
+        var lineName = '';
+        $("#query").on("click",function(){
+            var gsdm = $("#gsdm").val();
+            var fgsdm = $("#fgsdm").val();
+            var startDate = $("#startDate").val();
+            var endDate = $("#endDate").val();
+            var statisticalObj = $("#statisticalObj").val();
+            //开始和结束时间
+            var startTime = Date.parse(new Date(startDate));
+            var endTime = Date.parse(new Date(endDate));
+
+            datas = {}; // 清空之前数据
+            datas.gsdm = gsdm;
+            datas.fgsdm = fgsdm;
+            datas.lineCode = lineAll;
+            datas.timeType = "m";
+            datas.startDate = startDate;
+            datas.endDate = endDate;
+            datas.destroy = $("#destroy").val();
+            datas.statisticalObj = $("#statisticalObj").val();
+            datas.itemDetails = $("#itemDetails").val();
+            var itemDetails = datas.itemDetails,
+                type = "加注量[全部]";
+            if(itemDetails=="jzl0"){
+                type = "加注量[0#]"
+            } else if(itemDetails=="jzl-10"){
+                type = "加注量[-10#]"
+            } else if(itemDetails=="yhl"){
+                type = "油耗量"
+            } else if(itemDetails=="cccy"){
+                type = "出场存油"
+            } else if(itemDetails=="jccy"){
+                type = "进场存油"
+            } else if(itemDetails=="bglyh"){
+                type = "百公里油耗"
+            } else if(itemDetails=="zgl"){
+                type = "总公里"
+            } else if(itemDetails=="jhgl"){
+                type = "计划公里"
+            } else if(itemDetails=="jclm"){
+                type = "进场路码"
+            } else if(itemDetails=="cclm"){
+                type = "出场路码"
+            } else if(itemDetails=="sjbc"){
+                type = "实际班次"
+            } else if(itemDetails=="jhbc"){
+                type = "计划班次"
+            } else if(itemDetails=="dh"){
+                type = "耗电量"
+            } else if(itemDetails=="cdl"){
+                type = "充电量"
+            } else if(itemDetails=="cccd"){
+                type = "出场存电"
+            } else if(itemDetails=="jccd"){
+                type = "进场存电"
+            } else if(itemDetails=="bgldh"){
+                type = "百公里电耗"
+            }
+            datas.name = datas.startDate+"-"+datas.endDate+"-路单线路明细月报表("+type+")";
+            if(startDate==null || startDate =="" ||endDate==null || endDate ==""){
+                layer.msg('请选择时间段！');
+            }else if(endTime<startTime){
+                layer.msg('结束日期不能小于开始日期！');
+            }else {
+                if (endDate.substring(0, 7) != startDate.substring(0, 7)) {
+                    layer.msg("请查询同月份数据！");
+                    return;
+                } else {
+                    var lodingI = layer.load(2);
+                    $get('/calcWaybill/calcDetailMonthly', datas, function (rs) {
+                        if (rs.length <=0) {
+                            layer.close(lodingI);
+                            layer.open({
+                                title: '提示'
+                                , content: '没有您要查询的数据，请重新选择参数！'
+                            });
+                            $("#export").attr('disabled',"true");
+                            return;
+                        }else
+                            $("#export").removeAttr("disabled");
+                        var htmlHead = "<tr><td colspan='"+rs[0].length+"'>"+datas.name+"</td></tr>", htmlBody = "";
+                        var rsLength = rs.length;
+                        rs.forEach(function (o, i) {
+                            var html = "<tr>"
+                            o.forEach(function (td, j) {
+                                var colspan;
+                                if (i == rsLength - 1 && j == 0) {
+                                    colspan = (statisticalObj == "xl" ?  "colspan='3'" : "colspan='5'");
+                                    if(statisticalObj == "cl")
+                                        colspan = "colspan='6'";
+                                }
+                                html += "<td " + colspan + ">" + td + "</td>"
+                            });
+                            html += "</tr>"
+                            if (i == 0) {
+                                htmlHead += html;
+                            } else
+                                htmlBody += html;
+                        });
+                        $('#forms_head thead').html(htmlHead);
+                        $('#forms_body tbody').html(htmlBody);
+                        layer.close(lodingI);
+                    });
+                }
+            }
+        });
+
+        $("#export").on("click",function(){
+            $post("/report/calcDetailMonthlyE",datas,function(result){
+                window.open("/downloadFile/download?fileName="+datas.name);
+            });
+        });
+    });
+</script>
+<!--<script type="application/javascript" src="/pages/forms/calc/calcDetailMonthly.js"></script>-->
-<style type="text/css">
-    .table-bordered {
-        border: 1px solid; }
-    .table-bordered > thead > tr > th,
-    .table-bordered > thead > tr > td,
-    .table-bordered > tbody > tr > th,
-    .table-bordered > tbody > tr > td,
-    .table-bordered > tfoot > tr > th,
-    .table-bordered > tfoot > tr > td {
-        border: 1px solid;
-        text-align: center; }
-    .table-bordered > thead > tr > th,
-    .table-bordered > thead > tr > td {
-        border-bottom-width: 2px; }
-
-    .table > tbody + tbody {
-        border-top: 1px solid; }
-
-
-    #analy_body   tr> td >span{
-        word-break: keep-all;white-space:nowrap;
-    }
-
-    #analy_body td{
-        min-width: 100px;
-        max-width: 100px;
-        width: 100px;
-    }
-
-    #analy_body{
-        margin-top: 20px;
-        height: 620px;
-        width: 100%
-    }
-
-
-    .table_head::-webkit-scrollbar {
-        display:none
-    }
-
-    .table_head{
-        min-width: 906px;
-        width: 100%;
-        overflow: hidden;
-    }
-
-    .table_body{
-        width:101%;
-        height:580px;
-        overflow: auto;
-        margin-top: -20px;
-    }
-</style>
-<div class="page-head">
-    <div class="page-title">
-        <h1>路单线路明细年报表</h1>
-    </div>
-</div>
-
-<!--<div class="row">-->
-<div class=" row col-md-12 portlet light  bordered" style="height:calc(100% - 38px)">
-    <div class="">
-        <form class="form-inline" >
-            <!--<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_daily">
-                <span class="item-label" style="width: 80px;">&#12288;&#12288;公司: </span>
-                <select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
-            </div>-->
-            <div style="display: inline-block; margin-left: 33px;" id="fgsdmDiv_daily">
-                <span class="item-label" style="width: 80px;">&#12288;分公司: </span>
-                <select class="form-control" name="fgsdm" id="fgsdm" style="width: 180px;"></select>
-            </div>
-            <!--<div style="display: inline-block;margin-left: 33px;">
-                <span class="item-label" style="width: 80px;">&#12288;&#12288;线路: </span>
-                <select class="form-control" name="line" id="line" style="width: 180px;"></select>
-            </div>-->
-            <div style="display: inline-block; margin-left: 33px;">
-                <span class="item-label" style="width: 80px;">线路性质: </span>
-                <select class="form-control" name="destroy" id="destroy" style="width: 180px;">
-                    <option value="0,1">全部线路</option>
-                    <option value="0">营运线路</option>
-                    <option value="1">非营运线路</option>
-                </select>
-            </div>
-            <div style="display: inline-block;margin-left: 33px;" class="date-picker">
-                <span class="item-label" style="width: 80px;">&#12288;&#12288;时间: </span>
-                <input class="form-control" type="text" id="startDate" style="width: 180px;" /> -
-                <input class="form-control" type="text" id="endDate" style="width: 180px;" />
-                <!--<input class="form-control" type="text" id="startDate" style="width: 180px;" value="2020-10"/> - -->
-                <!--<input class="form-control" type="text" id="endDate" style="width: 180px;" value="2020-10"/>-->
-            </div>
-
-            <div style="margin-top: 2px"></div>
-
-            <div style="display: inline-block;margin-left: 33px;">
-                <span class="item-label" style="width: 80px;">统计对象: </span>
-                <select class="form-control" name="statisticalObj" id="statisticalObj" style="width: 180px;">
-                    <option value="cl">车辆</option>
-                    <option value="jsy">驾驶员</option>
-                    <option value="cwy">乘务员</option>
-                    <option value="xl">线路</option>
-                </select>
-            </div>
-
-            <div style="display: inline-block; margin-left: 33px;" >
-                <span class="item-label" style="width: 80px;">统计项目: </span>
-                <select class="form-control" name="statisticalItem" id="statisticalItem" style="width: 180px;">
-                    <option value="yh">油耗</option>
-                    <option value="dh">电耗</option>
-                    <option value="gl">公里</option>
-                    <option value="bc">班次</option>
-                </select>
-            </div>
-            <div style="display: inline-block; margin-left: 33px;" >
-                <span class="item-label" style="width: 80px;">项目明细: </span>
-                <select class="form-control" name="itemDetails" id="itemDetails" style="width: 180px;"></select>
-            </div>
-            <div class="form-group" style="display: inline-block;margin-left: 62px;">
-                <input class="btn btn-default" type="button" id="query" value="筛选"/>
-                <input class="btn btn-default" type="button" id="export" value="导出"/>
-            </div>
-        </form>
-    </div>
-
-    <div id="analy_body">
-        <div class="table_head" id="table_head">
-            <table class="table table-bordered table-hover table-checkable " id="forms_head">
-                <thead>
-                </thead>
-            </table>
-        </div>
-        <div class="table_body" id="table_body">
-            <table class="table table-bordered table-hover table-checkable" id="forms_body">
-                <tbody>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-<script >
-    $(function(){
-        $('#export').attr('disabled', "true");
-        // 关闭左侧栏
-        if (!$('body').hasClass('page-sidebar-closed'))
-            $('.menu-toggler.sidebar-toggler').click();
-
-        var table_body1 = document.getElementById("table_body");
-        table_body1.onscroll = function(){
-            var table_body1_left = this.scrollLeft;
-            document.getElementById("table_head").scrollLeft = table_body1_left;
-        };
-
-        var d = new Date();
-        var year = d.getFullYear();
-        var month = d.getMonth() + 1;
-        if(month < 10)
-            month = "0" + month;
-        //时间
-        var dateTime=year + "-" + month;
-        $("#startDate").val(dateTime);
-        $("#endDate").val(dateTime);
-
-        $("#endDate").datetimepicker({
-            format : 'YYYY-MM',
-            locale : 'zh-cn',
-            maxDate : dateTime
-        });
-        $("#startDate").datetimepicker({
-            format : 'YYYY-MM',
-            locale : 'zh-cn',
-            maxDate : dateTime
-        });
-
-
-        var lineAll="",lineNoD="",lineD="";
-        var datas = {}; //查询条件
-
-
-        /**用户分配的线路*/
-        $.get('/realControAuthority/findByCurrentUser', function (userAuthor) {
-            lineAll = userAuthor.lineCodeStr.substring(0,userAuthor.lineCodeStr.length-1);
-           /* $.get('/line/all', function (lines) {
-                $.each(lines,function () {
-
-                });
-
-            });*/
-        });
-
-        var tempData = {};
-
-        $.get('/user/companyData', function(obj) {
-            var option = '';
-            var allC = "";
-            for (var i = 0; i < obj.length; i++) {
-                if (obj[i].companyCode == "26") {
-                    var children = obj[i].children;
-                    for (var j = 0; j < children.length; j++) {
-                        allC += children[j].code+",";
-                        option += '<option value="' + children[j].code + '">' + children[j].name + '</option>';
-                    }
-                }
-            }
-
-            var options = '<option value="'+allC.substring(0,allC.length-1)+'">所有分公司</option>'+option;
-            $('#fgsdm').html(options);
-        });
-
-        // 项目明细选项列
-        // 触发默认选项
-        updateItem();
-        $("#statisticalItem").on("change",updateItem);
-        var item ="";
-        function updateItem() {
-            item = $('#statisticalItem').val();
-            var options = '';
-            if(item == "yh"){
-                options += '<option value="jzlAll">加注量[全部]</option>' +
-                    '<option value="jzl0">加注量[0#]</option>'+
-                    '<option value="jzl-10">加注量[-10#]</option>'+
-                    '<option value="yhl">油耗量</option>'+
-                    '<option value="cccy">出场存油</option>'+
-                    '<option value="jccy">进场存油</option>'+
-                    '<option value="bglyh">百公里油耗</option>';
-            } else if(item == "gl"){
-                options += '<option value="zgl">总公里</option>' +
-                    '<option value="jhgl">计划公里</option>';
-                    /*'<option value="jclm">进场路码</option>'+
-                    '<option value="cclm">出场路码</option>'*/
-            } else if(item == "bc"){
-                options += '<option value="sjbc">实际班次</option>' +
-                    '<option value="jhbc">计划班次</option>';
-            } else if(item == "dh"){
-                options += '<option value="dh">耗电量</option>';
-                options += '<option value="cdl">充电量</option>';
-                options += '<option value="cccd">出场存电</option>';
-                options += '<option value="jccd">进场存电</option>';
-                options += '<option value="bgldh">百公里电耗</option>';
-            }
-            $('#itemDetails').html(options);
-        }
-
-        //线路名称
-        var lineName = '';
-        $("#query").on("click",function(){
-            var gsdm = "26";
-            var fgsdm = $("#fgsdm").val();
-            var startDate = $("#startDate").val();
-            var endDate = $("#endDate").val();
-            var statisticalObj = $("#statisticalObj").val();
-            //开始和结束时间
-            var startTime = Date.parse(new Date(startDate));
-            var endTime = Date.parse(new Date(endDate));
-
-            datas = {}; // 清空之前数据
-            datas.timeType = "y";
-            datas.gsdm = gsdm;
-            datas.fgsdm = fgsdm;
-            datas.lineCode = lineAll;
-            datas.startDate = startDate;
-            datas.endDate = endDate;
-            datas.destroy = $("#destroy").val();
-            datas.statisticalObj = $("#statisticalObj").val();
-            datas.itemDetails = $("#itemDetails").val();
-            datas.item = item;
-
-            var itemDetails = datas.itemDetails,
-                type = "加注量[全部]";
-            if(itemDetails=="jzl0"){
-                type = "加注量[0#]"
-            } else if(itemDetails=="jzl-10"){
-                type = "加注量[-10#]"
-            } else if(itemDetails=="yhl"){
-                type = "油耗量"
-            } else if(itemDetails=="cccy"){
-                type = "出场存油"
-            } else if(itemDetails=="jccy"){
-                type = "进场存油"
-            } else if(itemDetails=="bglyh"){
-                type = "百公里油耗"
-            } else if(itemDetails=="zgl"){
-                type = "总公里"
-            } else if(itemDetails=="jhgl"){
-                type = "计划公里"
-            } else if(itemDetails=="jclm"){
-                type = "进场路码"
-            } else if(itemDetails=="cclm"){
-                type = "出场路码"
-            } else if(itemDetails=="sjbc"){
-                type = "实际班次"
-            } else if(itemDetails=="jhbc"){
-                type = "计划班次"
-            } else if(itemDetails=="dh"){
-                type = "耗电量"
-            } else if(itemDetails=="cdl"){
-                type = "充电量"
-            } else if(itemDetails=="cccd"){
-                type = "出场存电"
-            } else if(itemDetails=="jccd"){
-                type = "进场存电"
-            } else if(itemDetails=="bgldh"){
-                type = "百公里电耗"
-            }
-            datas.name = datas.startDate+"-"+datas.endDate+"-路单线路明细年报表("+type+")";
-            if(startDate==null || startDate =="" ||endDate==null || endDate ==""){
-                layer.msg('请选择时间段！');
-            }else if(endTime<startTime){
-                layer.msg('结束日期不能小于开始日期！');
-            }else {
-                if (endDate.substring(0, 4) != startDate.substring(0, 4)) {
-                    layer.msg("请查询同年份数据！");
-                    return;
-                } else {
-                    var lodingI = layer.load(2);
-                    $get('/calcWaybill/calcDetailMonthly', datas, function (rs) {
-                        if (rs.length <=0) {
-                            layer.close(lodingI);
-                            layer.open({
-                                title: '提示'
-                                , content: '没有您要查询的数据，请重新选择参数！'
-                            });
-                            $("#export").attr('disabled',"true");
-                            return;
-                        }else
-                            $("#export").removeAttr("disabled");
-                        var htmlHead = "<tr><td colspan='"+rs[0].length+"'>"+datas.name+"</td></tr>", htmlBody = "";
-                        var rsLength = rs.length;
-                        rs.forEach(function (o, i) {
-                            var html = "<tr>"
-                            o.forEach(function (td, j) {
-                                var colspan;
-                                if (i == rsLength - 1 && j == 0) {
-                                    colspan = (statisticalObj == "xl" ?  "colspan='3'" : "colspan='5'");
-                                    if(statisticalObj == "cl")
-                                        colspan = "colspan='6'";
-                                }
-                                html += "<td " + colspan + ">" + td + "</td>"
-                            });
-                            html += "</tr>"
-                            if (i == 0) {
-                                htmlHead += html;
-                            } else
-                                htmlBody += html;
-                        });
-                        $('#forms_head thead').html(htmlHead);
-                        $('#forms_body tbody').html(htmlBody);
-                        layer.close(lodingI);
-                    });
-                }
-            }
-        });
-
-        $("#export").on("click",function(){
-            $post("/report/calcDetailMonthlyE",datas,function(result){
-                window.open("/downloadFile/download?fileName="+datas.name);
-            });
-        });
-    });
-</script>
-<!--<script type="application/javascript" src="/pages/forms/calc/calcDetailMonthly.js"></script>-->
+<style type="text/css">
+    .table-bordered {
+        border: 1px solid; }
+    .table-bordered > thead > tr > th,
+    .table-bordered > thead > tr > td,
+    .table-bordered > tbody > tr > th,
+    .table-bordered > tbody > tr > td,
+    .table-bordered > tfoot > tr > th,
+    .table-bordered > tfoot > tr > td {
+        border: 1px solid;
+        text-align: center; }
+    .table-bordered > thead > tr > th,
+    .table-bordered > thead > tr > td {
+        border-bottom-width: 2px; }
+
+    .table > tbody + tbody {
+        border-top: 1px solid; }
+
+
+    #analy_body   tr> td >span{
+        word-break: keep-all;white-space:nowrap;
+    }
+
+    #analy_body td{
+        min-width: 100px;
+        max-width: 100px;
+        width: 100px;
+    }
+
+    #analy_body{
+        margin-top: 20px;
+        height: 620px;
+        width: 100%
+    }
+
+
+    .table_head::-webkit-scrollbar {
+        display:none
+    }
+
+    .table_head{
+        min-width: 906px;
+        width: 100%;
+        overflow: hidden;
+    }
+
+    .table_body{
+        width:101%;
+        height:580px;
+        overflow: auto;
+        margin-top: -20px;
+    }
+</style>
+<div class="page-head">
+    <div class="page-title">
+        <h1>路单线路明细年报表</h1>
+    </div>
+</div>
+
+<!--<div class="row">-->
+<div class=" row col-md-12 portlet light  bordered" style="height:calc(100% - 38px)">
+    <div class="">
+        <form class="form-inline" >
+            <div style="display: inline-block; margin-left: 13px;" id="gsdmDiv_daily">
+                <span class="item-label" style="width: 80px;">&#12288;&#12288;公司: </span>
+                <select class="form-control" name="company" id="gsdm" style="width: 150px;"></select>
+            </div>
+            <div style="display: inline-block; margin-left: 13px;" id="fgsdmDiv_daily">
+                <span class="item-label" style="width: 80px;">&#12288;分公司: </span>
+                <select class="form-control" name="fgsdm" id="fgsdm" style="width: 150px;"></select>
+            </div>
+            <!--<div style="display: inline-block;margin-left: 33px;">
+                <span class="item-label" style="width: 80px;">&#12288;&#12288;线路: </span>
+                <select class="form-control" name="line" id="line" style="width: 180px;"></select>
+            </div>-->
+            <div style="display: inline-block;margin-left: 13px;" class="date-picker">
+                <span class="item-label" style="width: 80px;">&#12288;&#12288;时间: </span>
+                <input class="form-control" type="text" id="startDate" style="width: 150px;" /> -
+                <input class="form-control" type="text" id="endDate" style="width: 150px;" />
+                <!--<input class="form-control" type="text" id="startDate" style="width: 180px;" value="2020-10-01"/> - -->
+                <!--<input class="form-control" type="text" id="endDate" style="width: 180px;" value="2020-10-10"/>-->
+            </div>
+            
+            <div style="margin-top: 2px"></div>
+            
+            <div style="display: inline-block; margin-left: 13px;">
+                <span class="item-label" style="width: 80px;">线路性质: </span>
+                <select class="form-control" name="destroy" id="destroy" style="width: 150px;">
+                    <option value="0,1">全部线路</option>
+                    <option value="0">营运线路</option>
+                    <option value="1">非营运线路</option>
+                </select>
+            </div>
+            <div style="display: inline-block;margin-left: 13px;">
+                <span class="item-label" style="width: 80px;">统计对象: </span>
+                <select class="form-control" name="statisticalObj" id="statisticalObj" style="width: 150px;">
+                    <option value="cl">车辆</option>
+                    <option value="jsy">驾驶员</option>
+                    <option value="cwy">乘务员</option>
+                    <option value="xl">线路</option>
+                </select>
+            </div>
+
+            <div style="display: inline-block; margin-left: 13px;" >
+                <span class="item-label" style="width: 80px;">统计项目: </span>
+                <select class="form-control" name="statisticalItem" id="statisticalItem" style="width: 150px;">
+                    <option value="yh">油耗</option>
+                    <option value="dh">电耗</option>
+                    <option value="gl">公里</option>
+                    <option value="bc">班次</option>
+                </select>
+            </div>
+            <div style="display: inline-block; margin-left: 13px;" >
+                <span class="item-label" style="width: 80px;">项目明细: </span>
+                <select class="form-control" name="itemDetails" id="itemDetails" style="width: 150px;"></select>
+            </div>
+            <div class="form-group" style="display: inline-block;margin-left: 22px;">
+                <input class="btn btn-default" type="button" id="query" value="筛选"/>
+                <input class="btn btn-default" type="button" id="export" value="导出"/>
+            </div>
+        </form>
+    </div>
+
+    <div id="analy_body">
+        <div class="table_head" id="table_head">
+            <table class="table table-bordered table-hover table-checkable " id="forms_head">
+                <thead>
+                </thead>
+            </table>
+        </div>
+        <div class="table_body" id="table_body">
+            <table class="table table-bordered table-hover table-checkable" id="forms_body" style="background-color: white;">
+                <tbody>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+<script >
+    $(function(){
+        $('#export').attr('disabled', "true");
+        // 关闭左侧栏
+        if (!$('body').hasClass('page-sidebar-closed'))
+            $('.menu-toggler.sidebar-toggler').click();
+
+        var table_body1 = document.getElementById("table_body");
+        table_body1.onscroll = function(){
+            var table_body1_left = this.scrollLeft;
+            document.getElementById("table_head").scrollLeft = table_body1_left;
+        };
+
+        var d = new Date();
+        var year = d.getFullYear();
+        var month = d.getMonth() + 1;
+        if(month < 10)
+            month = "0" + month;
+        //时间
+        var dateTime=year + "-" + month;
+        $("#startDate").val(dateTime);
+        $("#endDate").val(dateTime);
+
+        $("#endDate").datetimepicker({
+            format : 'YYYY-MM',
+            locale : 'zh-cn',
+            maxDate : dateTime
+        });
+        $("#startDate").datetimepicker({
+            format : 'YYYY-MM',
+            locale : 'zh-cn',
+            maxDate : dateTime
+        });
+
+
+        var lineAll="",lineNoD="",lineD="";
+        var datas = {}; //查询条件
+
+
+        /**用户分配的线路*/
+        $.get('/realControAuthority/findByCurrentUser', function (userAuthor) {
+            lineAll = userAuthor.lineCodeStr.substring(0,userAuthor.lineCodeStr.length-1);
+           /* $.get('/line/all', function (lines) {
+                $.each(lines,function () {
+
+                });
+
+            });*/
+        });
+
+        var tempData = {};
+
+        $.get('/user/companyData', function(result){
+			var obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			
+			if(obj.length ==0){
+				 $("#gsdmDiv_daily").css('display','none');
+			}else if(obj.length ==1){
+				 $("#gsdmDiv_daily").css('display','none');
+				if(obj[0].children.length == 1  || obj[0].children.length == 0){
+					fage=false;
+					$('#gsdmDiv_daily').css('display','none');
+				}
+			}
+			$('#gsdm').html(options);
+			updateCompany();
+		});
+		$("#gsdm").on("change",updateCompany);
+		
+		function updateCompany(){
+			var company = $('#gsdm').val();
+	        $.get('/user/companyData', function(obj) {
+	            var option = '';
+	            var allC = "";
+	            for (var i = 0; i < obj.length; i++) {
+	                if (obj[i].companyCode == company) {
+	                    var children = obj[i].children;
+	                    for (var j = 0; j < children.length; j++) {
+	                        allC += children[j].code+",";
+	                        option += '<option value="' + children[j].code + '">' + children[j].name + '</option>';
+	                    }
+	                }
+	            }
+	
+	            var options = '<option value="'+allC.substring(0,allC.length-1)+'">所有分公司</option>'+option;
+	            $('#fgsdm').html(options);
+	        });
+		}
+
+        // 项目明细选项列
+        // 触发默认选项
+        updateItem();
+        $("#statisticalItem").on("change",updateItem);
+        var item ="";
+        function updateItem() {
+            item = $('#statisticalItem').val();
+            var options = '';
+            if(item == "yh"){
+                options += '<option value="jzlAll">加注量[全部]</option>' +
+                    '<option value="jzl0">加注量[0#]</option>'+
+                    '<option value="jzl-10">加注量[-10#]</option>'+
+                    '<option value="yhl">油耗量</option>'+
+                    '<option value="cccy">出场存油</option>'+
+                    '<option value="jccy">进场存油</option>'+
+                    '<option value="bglyh">百公里油耗</option>';
+            } else if(item == "gl"){
+                options += '<option value="zgl">总公里</option>' +
+                    '<option value="jhgl">计划公里</option>';
+                    /*'<option value="jclm">进场路码</option>'+
+                    '<option value="cclm">出场路码</option>'*/
+            } else if(item == "bc"){
+                options += '<option value="sjbc">实际班次</option>' +
+                    '<option value="jhbc">计划班次</option>';
+            } else if(item == "dh"){
+                options += '<option value="dh">耗电量</option>';
+                options += '<option value="cdl">充电量</option>';
+                options += '<option value="cccd">出场存电</option>';
+                options += '<option value="jccd">进场存电</option>';
+                options += '<option value="bgldh">百公里电耗</option>';
+            }
+            $('#itemDetails').html(options);
+        }
+
+        //线路名称
+        var lineName = '';
+        $("#query").on("click",function(){
+            var gsdm = $("#gsdm").val();
+            var fgsdm = $("#fgsdm").val();
+            var startDate = $("#startDate").val();
+            var endDate = $("#endDate").val();
+            var statisticalObj = $("#statisticalObj").val();
+            //开始和结束时间
+            var startTime = Date.parse(new Date(startDate));
+            var endTime = Date.parse(new Date(endDate));
+
+            datas = {}; // 清空之前数据
+            datas.timeType = "y";
+            datas.gsdm = gsdm;
+            datas.fgsdm = fgsdm;
+            datas.lineCode = lineAll;
+            datas.startDate = startDate;
+            datas.endDate = endDate;
+            datas.destroy = $("#destroy").val();
+            datas.statisticalObj = $("#statisticalObj").val();
+            datas.itemDetails = $("#itemDetails").val();
+            datas.item = item;
+
+            var itemDetails = datas.itemDetails,
+                type = "加注量[全部]";
+            if(itemDetails=="jzl0"){
+                type = "加注量[0#]"
+            } else if(itemDetails=="jzl-10"){
+                type = "加注量[-10#]"
+            } else if(itemDetails=="yhl"){
+                type = "油耗量"
+            } else if(itemDetails=="cccy"){
+                type = "出场存油"
+            } else if(itemDetails=="jccy"){
+                type = "进场存油"
+            } else if(itemDetails=="bglyh"){
+                type = "百公里油耗"
+            } else if(itemDetails=="zgl"){
+                type = "总公里"
+            } else if(itemDetails=="jhgl"){
+                type = "计划公里"
+            } else if(itemDetails=="jclm"){
+                type = "进场路码"
+            } else if(itemDetails=="cclm"){
+                type = "出场路码"
+            } else if(itemDetails=="sjbc"){
+                type = "实际班次"
+            } else if(itemDetails=="jhbc"){
+                type = "计划班次"
+            } else if(itemDetails=="dh"){
+                type = "耗电量"
+            } else if(itemDetails=="cdl"){
+                type = "充电量"
+            } else if(itemDetails=="cccd"){
+                type = "出场存电"
+            } else if(itemDetails=="jccd"){
+                type = "进场存电"
+            } else if(itemDetails=="bgldh"){
+                type = "百公里电耗"
+            }
+            datas.name = datas.startDate+"-"+datas.endDate+"-路单线路明细年报表("+type+")";
+            if(startDate==null || startDate =="" ||endDate==null || endDate ==""){
+                layer.msg('请选择时间段！');
+            }else if(endTime<startTime){
+                layer.msg('结束日期不能小于开始日期！');
+            }else {
+                if (endDate.substring(0, 4) != startDate.substring(0, 4)) {
+                    layer.msg("请查询同年份数据！");
+                    return;
+                } else {
+                    var lodingI = layer.load(2);
+                    $get('/calcWaybill/calcDetailMonthly', datas, function (rs) {
+                        if (rs.length <=0) {
+                            layer.close(lodingI);
+                            layer.open({
+                                title: '提示'
+                                , content: '没有您要查询的数据，请重新选择参数！'
+                            });
+                            $("#export").attr('disabled',"true");
+                            return;
+                        }else
+                            $("#export").removeAttr("disabled");
+                        var htmlHead = "<tr><td colspan='"+rs[0].length+"'>"+datas.name+"</td></tr>", htmlBody = "";
+                        var rsLength = rs.length;
+                        rs.forEach(function (o, i) {
+                            var html = "<tr>"
+                            o.forEach(function (td, j) {
+                                var colspan;
+                                if (i == rsLength - 1 && j == 0) {
+                                    colspan = (statisticalObj == "xl" ?  "colspan='3'" : "colspan='5'");
+                                    if(statisticalObj == "cl")
+                                        colspan = "colspan='6'";
+                                }
+                                html += "<td " + colspan + ">" + td + "</td>"
+                            });
+                            html += "</tr>"
+                            if (i == 0) {
+                                htmlHead += html;
+                            } else
+                                htmlBody += html;
+                        });
+                        $('#forms_head thead').html(htmlHead);
+                        $('#forms_body tbody').html(htmlBody);
+                        layer.close(lodingI);
+                    });
+                }
+            }
+        });
+
+        $("#export").on("click",function(){
+            $post("/report/calcDetailMonthlyE",datas,function(result){
+                window.open("/downloadFile/download?fileName="+datas.name);
+            });
+        });
+    });
+</script>
+<!--<script type="application/javascript" src="/pages/forms/calc/calcDetailMonthly.js"></script>-->
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+	   
+	   #forms > thead > tr> td >span{
+	    width: 5px; 
+		word-wrap: break-word; 
+		letter-spacing: 20px; 
+	  }
+	  
+	  #forms   > thead > tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>调度日报汇总表</h1>
+	</div>
+</div>
+
+<!-- <div class="row"> -->
+	<div  class="col-md-12 portlet light porttlet-fit bordered" style="height:calc(100% - 56px)">
+<!-- 		<div> -->
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+                    <div style="display: inline-block;">
+						<span class="item-label" style="width: 80px;">线路性质: </span>
+						 <select
+							class="form-control" name="nature" id="nature"
+							style="width: 180px;">
+							<option value="0">全部线路</option>
+							<option value="1" selected="selected">营运线路</option>
+							<option value="2">非营运线路</option>
+						</select>
+					</div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">开始日期: </span>
+                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">结束日期: </span>
+                        <input class="form-control" type="text" id="date2" style="width: 180px;"/>
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="查询"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+				</form>
+			</div>
+			<div class="portlet-body" id="tjrbBody" style="overflow:auto;height: calc(100% - 80px)">
+				<div class="table-container"   style="margin-top: 10px;min-width: 906px">
+					<label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th colspan="45"><label id="tjrq"></label> 调度日报汇总表</th>
+							</tr>
+							<tr>
+								<td rowspan="3"><span >公司</span></td>
+								<td rowspan="3"><span >分公司</span></td>
+								<td colspan="21">全日营运里程（公里）</td>
+								<td colspan="15">全日营运班次</td>
+								<td colspan="9">大间隔情况</td>
+							</tr>
+							<tr>
+								<td rowspan="2"><label>计划总<br/>公里</label></td>
+								<td rowspan="2"><label>计划营</label><label>运公里</label></td>
+								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
+								<td rowspan="2"><label>实际</label><label>总公里</label></td>
+								<td rowspan="2"><label>实际营</label><label>运公里</label></td>
+								<td rowspan="2"><label>实际空</label><label>驶公里</label></td>
+								<td rowspan="2"><span>少驶班次</span></td>
+								<td rowspan="2"><span>少驶公里</span></td>
+								<td colspan="11">少驶原因（公里）</td>
+								<td colspan="2">临加公里</td>
+								<td colspan="3">计划班次</td>
+								<td colspan="3">实际班次</td>
+								<td colspan="3">临加班次</td>
+								<td colspan="3">放站班次</td>
+								<td colspan="3">调头班次</td>
+								<td colspan="3">发生次数</td>
+								<td rowspan="2">最大间隔时间（分）</td>
+								<td rowspan="2">原因</td>
+							</tr>
+							<tr>
+								<td><span>路阻</span></td>
+								<td><span>吊慢</span></td>
+								<td><span>故障</span></td>
+								<td><span>纠纷</span></td>
+								<td><span>肇事</span></td>
+								<td><span>缺人</span></td>
+								<td><span>缺车</span></td>
+								<td><span>客稀</span></td>
+								<td><span>气候</span></td>
+								<td><span>援外</span></td>
+								<td><span>其他</span></td>
+								<td><span>营运</span></td>
+								<td><span>空驶</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+							</tr>
+						</thead>
+						<tbody class="dispatch_daily_sum">
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+
+<script>
+	$(function(){
+// 		$('#export').attr('disabled', "true");
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		
+		var dateTime=year + "-" + month + "-" + day;
+		$("#date").val(dateTime);
+		$("#date2").val(dateTime);
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#date2").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		
+		var date = "";
+		var date2 = "";
+		var nature="";
+		var time1="";
+		var time2="";
+		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}
+			if($("#date2").val() == null || $("#date2").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}
+			date = $("#date").val();
+			date2 = $("#date2").val();
+			nature=$("#nature").val();
+// 			time1 = Date.parse(new Date(date));
+// 			time2 = Date.parse(new Date(date2));
+// 			if(date==null || date =="" ||date2==null || date2 ==""){
+// 				 layer.msg('请选择时间段.');
+// 			}else if(time2<time1){
+// 				layer.msg('结束日期不能小于开始日期.');
+// 			}else{
+// 				if((time2-time1)>2678400000){
+// 					layer.msg('查询超过一个月请点击【统计查询】.');
+// 				}else{
+					$("#tjrq").html(date);
+					$("#rqxs").html(date);
+					var params = {};
+					params['date'] = date;
+					params['date2'] = date2;
+					params['nature'] = nature;
+					params['type'] = "query";
+					var i = layer.load(2);
+					$get('/realSchedule/dispatchDailySum',params,function(result){
+						// 把数据填充到模版中
+						var tbodyHtml = template('dispatch_daily_sum',{list:result});
+						// 把渲染好的模版html文本追加到表格中
+						$('#forms .dispatch_daily_sum').html(tbodyHtml);
+						layer.close(i);
+						
+						if(result.length == 0){
+							$("#export").attr('disabled',"true");
+						}else{
+							$("#export").removeAttr("disabled");
+						}
+					});
+// 				}
+// 			}
+		});
+		
+// 		$("#tjrbBody").height($(window).height()-100);
+		$("#export").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
+			date = $("#date").val();
+			date2 = $("#date2").val();
+			nature=$("#nature").val();
+			var params = {};
+			params['date'] = date;
+			params['date2'] = date2;
+			params['nature'] = nature;
+			params['type'] = "export";
+// 			if((time2-time1)>2678400000){
+// 					layer.msg('查询超过一个月请点击【统计查询】.');
+// 			}else{
+				var i = layer.load(2);
+				$get('/realSchedule/dispatchDailySum',params,function(result){
+					var dateTime = "";
+					if(date == date2){
+						dateTime = moment(date).format("YYYYMMDD");
+					} else {
+						dateTime = moment(date).format("YYYYMMDD")
+								+"-"+moment(date2).format("YYYYMMDD");
+					}
+					window.open("/downloadFile/download?fileName="
+							+dateTime+"-调度日报汇总表");
+					layer.close(i);
+				});
+// 			}
+		});
+		
+
+	});
+</script>
+<script type="text/html" id="dispatch_daily_sum">
+	{{each list as obj i}}
+		<tr style='{{if obj.zt==1}}color: red;{{/if}}
+					{{if obj.fgsName=='小计' || obj.gsName=='浦交'}}background-color: #b9d6fb;{{/if}}'>
+			<td>{{obj.gsName}}</td>
+			<td>{{obj.fgsName}}</td>
+			<td>{{obj.jhzlc}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.jcclc}}</td>
+			<td>{{obj.sjzgl}}</td>
+			<td>{{obj.sjgl}}</td>
+			<td>{{obj.sjksgl}}</td>
+			<td>{{obj.ssbc}}</td>
+			<td>{{obj.ssgl}}</td>
+			<td>{{obj.ssgl_lz}}</td>
+			<td>{{obj.ssgl_dm}}</td>
+			<td>{{obj.ssgl_gz}}</td>
+			<td>{{obj.ssgl_jf}}</td>
+			<td>{{obj.ssgl_zs}}</td>
+			<td>{{obj.ssgl_qr}}</td>
+			<td>{{obj.ssgl_qc}}</td>
+			<td>{{obj.ssgl_kx}}</td>
+			<td>{{obj.ssgl_qh}}</td>
+			<td>{{obj.ssgl_yw}}</td>
+			<td>{{obj.ssgl_other}}</td>
+			<td>{{obj.ljgl}}</td>
+			<td>{{obj.ljks}}</td>
+			<td>{{obj.jhbc}}</td>
+			<td>{{obj.jhbc_m}}</td>
+			<td>{{obj.jhbc_a}}</td>
+			<td>{{obj.sjbc}}</td>
+			<td>{{obj.sjbc_m}}</td>
+			<td>{{obj.sjbc_a}}</td>
+			<td>{{obj.ljbc}}</td>
+			<td>{{obj.ljbc_m}}</td>
+			<td>{{obj.ljbc_a}}</td>
+			<td>{{obj.fzbc}}</td>
+			<td>{{obj.fzbc_m}}</td>
+			<td>{{obj.fzbc_a}}</td>
+			<td>{{obj.dtbc}}</td>
+			<td>{{obj.dtbc_m}}</td>
+			<td>{{obj.dtbc_a}}</td>
+			<td>{{obj.djg}}</td>
+			<td>{{obj.djg_m}}</td>
+			<td>{{obj.djg_a}}</td>
+			<td>{{obj.djg_time}}</td>
+			<td>&nbsp;</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 \ No newline at end of file
@@ -60,6 +60,7 @@
 					<div class="form-group" style="margin-left: 10px;">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
+                        <input class="btn btn-default" type="button" id="exportAll" value="导出全部公司" style="display: none;"/>
 					</div>
 				</form>
 			</div>
@@ -418,6 +419,40 @@
 		});
+		$.get('/user/getCurrentUser', function(result){
+			var roleName = "";
+			$(result.roles).each(function(i, e){
+				roleName += e.roleName + "、";
+			});
+			if(roleName.indexOf("浦交") > -1 || roleName.indexOf("拓华") > -1){
+				$("#exportAll").show();
+			}
+		});
+		$("#exportAll").on("click",function(){
+			var params = {};
+			sfyy = $("#sfyy").val();
+			startDate = $("#startDate").val();
+			endDate = $("#endDate").val();
+			params['sfyy'] = sfyy;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
+			params['type'] = "exportAll";
+			var i = layer.load(2);
+			$get('/pcpc/firstAndLastBus_sum', params, function(result){
+				var dateTime = "";
+				if(startDate == endDate){
+					dateTime = moment(startDate).format("YYYYMMDD");
+				} else {
+					dateTime = moment(startDate).format("YYYYMMDD")
+							+"-"+moment(endDate).format("YYYYMMDD");
+				}
+				window.open("/downloadFile/download?fileName="
+						+dateTime+"-全部公司-线路首末班准点率");
+				layer.close(i);
+			});
+		});
+		
+		
 	});
 </script>
-<style type="text/css">
-	.table-bordered {
-	  border: 1px solid; }
-	  .table-bordered > thead > tr > th,
-	  .table-bordered > thead > tr > td,
-	  .table-bordered > tbody > tr > th,
-	  .table-bordered > tbody > tr > td,
-	  .table-bordered > tfoot > tr > th,
-	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
-	  .table-bordered > thead > tr > th,
-	  .table-bordered > thead > tr > td {
-	    border-bottom-width: 2px; }
-	 
-	 .table > tbody + tbody {
-	   border-top: 1px solid; }
-	   
-	   #forms > thead > tr> td >span{
-	    width: 5px; 
-		word-wrap: break-word; 
-		letter-spacing: 20px; 
-	  }
-	  
-	  #forms   > thead > tr> td >label{
-	     word-break: keep-all;white-space:nowrap; 
-	   }
-</style>
-
-<div class="page-head">
-	<div class="page-title">
-		<h1>统计日报(按年、月、季度查询请点击<a href="statisticsDailyCalc2.html" target="_blank">【统计查询】</a>)</h1>
-	</div>
-</div>
-
-<!-- <div class="row"> -->
-	<div  class="col-md-12 portlet light porttlet-fit bordered" style="height:calc(100% - 56px)">
-<!-- 		<div> -->
-			<div class="portlet-title">
-				<form class="form-inline" action="">
-				<div style="display: inline-block;margin-left: 29px; " id="gsdmDiv">
-						<span class="item-label" style="width: 80px;">公司: </span>
-						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
-					</div> 
-					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
-						<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: 42px;">
-                        <span class="item-label" style="width: 80px;">线路: </span>
-                        <select class="form-control" name="line" id="line" style="width: 180px;"></select>
-                    </div>
-                    <div style="margin-top: 3px"></div>
-                    <div style="display: inline-block;">
-						<span class="item-label" style="width: 80px;">线路性质: </span>
-						 <select
-							class="form-control" name="nature" id="nature"
-							style="width: 180px;">
-							<option value="0">全部线路</option>
-							<option value="1" selected="selected">营运线路</option>
-							<option value="2">非营运线路</option>
-						</select>
-					</div>
-                    <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">开始时间: </span>
-                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
-                    </div>
-                    <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">结束时间: </span>
-                        <input class="form-control" type="text" id="date2" style="width: 180px;"/>
-                    </div>
-                    <div class="form-group">
-                        <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
-                    </div>
-				</form>
-			</div>
-			<div class="portlet-body" id="tjrbBody" style="overflow:auto;height: calc(100% - 80px)">
-				<div class="table-container"   style="margin-top: 10px;min-width: 906px">
-					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
-					<table class="table table-bordered table-hover table-checkable" id="forms">
-						<thead>
-							<tr>
-								<th colspan="45"><label id="tjrq"></label> 线路统计日报</th>
-							</tr>
-							<tr>
-								<td rowspan="3"><span >分公司</span></td>
-								<td rowspan="3"><span >路线名</span></td>
-								<td colspan="21">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
-								<td colspan="15">全日营运班次</td>
-								<td colspan="9">大间隔情况</td>
-							</tr>
-							<tr>
-								<td rowspan="2"><label>计划总</label>
-													<label>公里&nbsp;&nbsp;&nbsp;</label></td>
-								<td rowspan="2"><label>计划营</label><label>运公里</label></td>
-								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
-								<td rowspan="2"><label>实际</label><label>总公里</label></td>
-								<td rowspan="2"><label>实际营</label><label>运公里</label></td>
-								<td rowspan="2"><label>实际空</label><label>驶公里</label></td>
-								<td rowspan="2"><span>少驶公里</span></td>
-								<td rowspan="2"><span>少驶班次</span></td>
-								<td colspan="11">少驶原因（公里）</td>
-								<td colspan="2">临加公里</td>
-								<td colspan="3">计划班次</td>
-								<td colspan="3">实际班次</td>
-								<td colspan="3">临加班次</td>
-								<td colspan="3">放站班次</td>
-								<td colspan="3">调头班次</td>
-								<td colspan="3">发生次数</td>
-								<td rowspan="2">最大间隔时间（分）</td>
-								<td rowspan="2">原因</td>
-							</tr>
-							<tr>
-								<td><span >路阻</span></td>
-								<td><span>吊慢</span></td>
-								<td><span >故障</span></td>
-								<td><span >纠纷</span></td>
-								<td><span >肇事</span></td>
-								<td><span>缺人</span></td>
-								<td><span>缺车</span></td>
-								<td><span >客稀</span></td>
-								<td><span>气候</span></td>
-								<td><span>援外</span></td>
-								<td><span>其他</span></td>
-								<td><span>营运</span></td>
-								<td><span>空驶</span></td>
-								<td><span>全日</span></td>
-								<td><span>早高峰</span></td>
-								<td><span>晚高峰</span></td>
-								<td><span>全日</span></td>
-								<td><span>早高峰</span></td>
-								<td><span>晚高峰</span></td>
-								<td><span>全日</span></td>
-								<td><span>早高峰</span></td>
-								<td><span>晚高峰</span></td>
-								<td><span>全日</span></td>
-								<td><span>早高峰</span></td>
-								<td><span>晚高峰</span></td>
-								<td><span>全日</span></td>
-								<td><span>早高峰</span></td>
-								<td><span>晚高峰</span></td>
-								<td><span>全日</span></td>
-								<td><span>早高峰</span></td>
-								<td><span>晚高峰</span></td>
-							</tr>
-						</thead>
-						<tbody class="statisticsDaily">
-							
-						</tbody>
-					</table>
-				</div>
-			</div>
-		</div>
-
-<script>
-	$(function(){
-		$('#export').attr('disabled', "true");
-		
-		// 关闭左侧栏
-		if (!$('body').hasClass('page-sidebar-closed'))
-			$('.menu-toggler.sidebar-toggler').click();
-		var d = new Date();
-		var year = d.getFullYear();
-		var month = d.getMonth() + 1;
-		var day = d.getDate();
-		if(month < 10)
-			month = "0" + month;
-		if(day < 10)
-			day = "0" + day;
-		
-		var dateTime=year + "-" + month + "-" + day;
-		$("#date").val(dateTime);
-		$("#date2").val(dateTime);
-		$("#date").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn',
-			maxDate : dateTime
-		});
-		
-		$("#date2").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn',
-			maxDate : dateTime
-		});
-		
-		
-		var fage=true;
-		var obj = [];
-		var xlList;
-		$.get('/report/lineList',function(result){
-			xlList=result;
-			$.get('/user/companyData', function(result){
-				obj = result;
-				var options = '';
-				for(var i = 0; i < obj.length; i++){
-					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-				}
-				
-				if(obj.length ==0){
-					 $("#gsdmDiv").css('display','none');
-				}else if(obj.length ==1){
-					 $("#gsdmDiv").css('display','none');
-					if(obj[0].children.length == 1  || obj[0].children.length ==0){
-						fage=false;
-						$('#fgsdmDiv').css('display','none');
-					}
-				}
-				$('#gsdm').html(options);
-				updateCompany();
-			});
-		})
-		$("#gsdm").on("change",updateCompany);
-		function updateCompany(){
-			var company = $('#gsdm').val();
-			var options = '';
-			if(fage){
-				options =  '<option value="">请选择</option>';
-			}
-			for(var i = 0; i < obj.length; i++){
-				if(obj[i].companyCode == company){
-					var children = obj[i].children;
-					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
-					}
-				}
-			}
-			$('#fgsdm').html(options);
-// 			initXl();
-		}
-		
-		var tempData = {};
-		$.get('/report/lineList',function(xlList){
-			var data = [];
-			data.push({id: " ", text: "全部线路"});
-			$.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,'');
-				
-			});
-		});
-		
-		$("#line").on("change", function(){
-			if($("#line").val() == " "){
-				$("#gsdm").attr("disabled", false);
-				$("#fgsdm").attr("disabled", false);
-			} else {
-				var temp = (tempData[$("#line").val()] ? tempData[$("#line").val()] : " : ").split(":");
-				$("#gsdm").val(temp[0]);
-				updateCompany();
-				$("#nature").val(0);
-				$("#fgsdm").val(temp[1]);
-				$("#gsdm").attr("disabled", true);
-				$("#fgsdm").attr("disabled", true);
-			}
-		});
-		
-
-		var line ="";
-		var xlName ="";
-		var date = "";
-		var date2 ="";
-		var gsdm="";
-		var fgsdm="";
-		var nature="";
-		var time1="";
-		var time2="";
-		$("#query").on("click",function(){
-			if($("#date").val() == null || $("#date").val().trim().length == 0){
-				layer.msg("请选择时间范围！");
-				return;
-			}
-			if($("#date2").val() == null || $("#date2").val().trim().length == 0){
-				layer.msg("请选择时间范围！");
-				return;
-			}
-// 			$("#tjrbBody").height($(window).height()-100);
-			line = $("#line").val();
-			date = $("#date").val();
-			date2 =$("#date2").val();
-			gsdm =$("#gsdm").val();
-			fgsdm=$("#fgsdm").val();
-			nature=$("#nature").val();
-			xlName = $("#select2-line-container").html();
-			if(xlName == "全部线路")
-				xlName = $('#fgsdm option:selected').text();
-			if(xlName == "请选择")
-				xlName = $('#gsdm option:selected').text();
-			if(line=="请选择"){
-				line="";
-			}
-			time1 = Date.parse(new Date(date));
-			 time2 = Date.parse(new Date(date2));
-			if(date==null || date =="" ||date2==null || date2 ==""){
-				 layer.msg('请选择时间段.');
-			}else if(time2<time1){
-				layer.msg('结束日期不能小于开始日期.');
-			}else{
-				if((time2-time1)>2678400000){
-					layer.msg('查询超过一个月请点击【统计查询】.');
-				}else{
-					$("#tjrq").html(date+"至"+date2);
-					 var params = {};
-					 params['gsdm'] = gsdm;
-					 params['fgsdm'] =fgsdm ;
-					 params['line'] = line;
-					 params['date'] = date;
-					 params['date2'] = date2;
-					 params['xlName'] = xlName;
-					 params['nature'] = nature;
-					 params['type'] = "query";
-					var i = layer.load(2);
-					$get('/realSchedule/statisticsDailyTj',params,function(result){
-						// 把数据填充到模版中
-						var tbodyHtml = template('statisticsDaily',{list:result});
-						// 把渲染好的模版html文本追加到表格中
-						$('#forms .statisticsDaily').html(tbodyHtml);
-						layer.close(i);
-						
-						if(result.length == 0)
-							$("#export").attr('disabled',"true");
-						else
-							$("#export").removeAttr("disabled");
-					});
-				}
-				
-			}
-			
-		});
-// 		$("#tjrbBody").height($(window).height()-100);
-		$("#export").on("click",function(){
-			 var params = {};
-			 params['gsdm'] = gsdm;
-			 params['fgsdm'] =fgsdm;
-			 params['line'] = line;
-			 date = $("#date").val();
-			 date2 =$("#date2").val();	
-			 params['date'] = date;
-			 params['date2'] = date2;
-			 params['xlName'] = xlName;
-			 params['nature'] = nature;
-			 params['type'] = "export";
-			 if((time2-time1)>2678400000){
-					layer.msg('查询超过一个月请点击【统计查询】.');
-			}else{
-				var i = layer.load(2);
-				$get('/realSchedule/statisticsDailyTj',params,function(result){
-					var dateTime = "";
-					if(date == date2){
-						dateTime = moment(date).format("YYYYMMDD");
-					} else {
-						dateTime = moment(date).format("YYYYMMDD")
-								+"-"+moment(date2).format("YYYYMMDD");
-					}
-					window.open("/downloadFile/download?fileName="
-							+dateTime+"-"+xlName+"-统计日报");
-					layer.close(i);
-				});
-				}
-		});
-
-	});
-</script>
-<script type="text/html" id="statisticsDaily">
-	{{each list as obj i}}
-		<tr {{if obj.zt==1}}style='color: red'{{/if}}>
-			<td>{{obj.fgsName}}</td>
-			<td>{{obj.xlName}}</td>
-			<td>{{obj.jhzlc}}</td>
-			<td>{{obj.jhlc}}</td>
-			<td>{{obj.jcclc}}</td>
-			<td>{{obj.sjzgl}}</td>
-			<td>{{obj.sjgl}}</td>
-			<td>{{obj.sjksgl}}</td>
-			<td>{{obj.ssgl}}</td>
-			<td>{{obj.ssbc}}</td>
-			<td>{{obj.ssgl_lz}}</td>
-			<td>{{obj.ssgl_dm}}</td>
-			<td>{{obj.ssgl_gz}}</td>
-			<td>{{obj.ssgl_jf}}</td>
-			<td>{{obj.ssgl_zs}}</td>
-			<td>{{obj.ssgl_qr}}</td>
-			<td>{{obj.ssgl_qc}}</td>
-			<td>{{obj.ssgl_kx}}</td>
-			<td>{{obj.ssgl_qh}}</td>
-			<td>{{obj.ssgl_yw}}</td>
-			<td>{{obj.ssgl_other}}</td>
-			<td>{{obj.ljgl}}</td>
-			<td>{{obj.ljks}}</td>
-			<td>{{obj.jhbc}}</td>
-			<td>{{obj.jhbc_m}}</td>
-			<td>{{obj.jhbc_a}}</td>
-			<td>{{obj.sjbc}}</td>
-			<td>{{obj.sjbc_m}}</td>
-			<td>{{obj.sjbc_a}}</td>
-			<td>{{obj.ljbc}}</td>
-			<td>{{obj.ljbc_m}}</td>
-			<td>{{obj.ljbc_a}}</td>
-			<td>{{obj.fzbc}}</td>
-			<td>{{obj.fzbc_m}}</td>
-			<td>{{obj.fzbc_a}}</td>
-			<td>{{obj.dtbc}}</td>
-			<td>{{obj.dtbc_m}}</td>
-			<td>{{obj.dtbc_a}}</td>
-			<td>{{obj.djg}}</td>
-			<td>{{obj.djg_m}}</td>
-			<td>{{obj.djg_a}}</td>
-			<td>{{obj.djg_time}}</td>
-			<td>&nbsp;</td>
-		</tr>
-	{{/each}}
-	{{if list.length == 0}}
-		<tr>
-			<td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
-		</tr>
-	{{/if}}
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+	   
+	   #forms > thead > tr> td >span{
+	    width: 5px; 
+		word-wrap: break-word; 
+		letter-spacing: 20px; 
+	  }
+	  
+	  #forms   > thead > tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>统计日报(按年、月、季度查询请点击<a href="statisticsDailyCalc2.html" target="_blank">【统计查询】</a>)</h1>
+	</div>
+</div>
+
+<!-- <div class="row"> -->
+	<div  class="col-md-12 portlet light porttlet-fit bordered" style="height:calc(100% - 56px)">
+<!-- 		<div> -->
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+				<div style="display: inline-block;margin-left: 29px; " id="gsdmDiv">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
+						<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: 42px;">
+                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 180px;"></select>
+                    </div>
+                    <div style="margin-top: 3px"></div>
+                    <div style="display: inline-block;">
+						<span class="item-label" style="width: 80px;">线路性质: </span>
+						 <select
+							class="form-control" name="nature" id="nature"
+							style="width: 180px;">
+							<option value="0">全部线路</option>
+							<option value="1" selected="selected">营运线路</option>
+							<option value="2">非营运线路</option>
+						</select>
+					</div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
+                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="date2" style="width: 180px;"/>
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="查询"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                        <input class="btn btn-default" type="button" id="exportAll" value="导出全部公司" style="display: none;"/>
+                    </div>
+				</form>
+			</div>
+			<div class="portlet-body" id="tjrbBody" style="overflow:auto;height: calc(100% - 80px)">
+				<div class="table-container"   style="margin-top: 10px;min-width: 906px">
+					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th colspan="45"><label id="tjrq"></label> 线路统计日报</th>
+							</tr>
+							<tr>
+								<td rowspan="3"><span >分公司</span></td>
+								<td rowspan="3"><span >路线名</span></td>
+								<td colspan="21">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
+								<td colspan="15">全日营运班次</td>
+								<td colspan="9">大间隔情况</td>
+							</tr>
+							<tr>
+								<td rowspan="2"><label>计划总</label>
+													<label>公里&nbsp;&nbsp;&nbsp;</label></td>
+								<td rowspan="2"><label>计划营</label><label>运公里</label></td>
+								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
+								<td rowspan="2"><label>实际</label><label>总公里</label></td>
+								<td rowspan="2"><label>实际营</label><label>运公里</label></td>
+								<td rowspan="2"><label>实际空</label><label>驶公里</label></td>
+								<td rowspan="2"><span>少驶公里</span></td>
+								<td rowspan="2"><span>少驶班次</span></td>
+								<td colspan="11">少驶原因（公里）</td>
+								<td colspan="2">临加公里</td>
+								<td colspan="3">计划班次</td>
+								<td colspan="3">实际班次</td>
+								<td colspan="3">临加班次</td>
+								<td colspan="3">放站班次</td>
+								<td colspan="3">调头班次</td>
+								<td colspan="3">发生次数</td>
+								<td rowspan="2">最大间隔时间（分）</td>
+								<td rowspan="2">原因</td>
+							</tr>
+							<tr>
+								<td><span >路阻</span></td>
+								<td><span>吊慢</span></td>
+								<td><span >故障</span></td>
+								<td><span >纠纷</span></td>
+								<td><span >肇事</span></td>
+								<td><span>缺人</span></td>
+								<td><span>缺车</span></td>
+								<td><span >客稀</span></td>
+								<td><span>气候</span></td>
+								<td><span>援外</span></td>
+								<td><span>其他</span></td>
+								<td><span>营运</span></td>
+								<td><span>空驶</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+							</tr>
+						</thead>
+						<tbody class="statisticsDaily">
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+
+<script>
+	$(function(){
+		$('#export').attr('disabled', "true");
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		
+		var dateTime=year + "-" + month + "-" + day;
+		$("#date").val(dateTime);
+		$("#date2").val(dateTime);
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		
+		$("#date2").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		
+		
+		var fage=true;
+		var obj = [];
+		var xlList;
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0){
+						fage=false;
+						$('#fgsdmDiv').css('display','none');
+					}
+				}
+				$('#gsdm').html(options);
+				updateCompany();
+			});
+		})
+		$("#gsdm").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdm').val();
+			var options = '';
+			if(fage){
+				options =  '<option value="">请选择</option>';
+			}
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdm').html(options);
+// 			initXl();
+		}
+		
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			data.push({id: " ", text: "全部线路"});
+			$.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,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdm").attr("disabled", false);
+				$("#fgsdm").attr("disabled", false);
+			} else {
+				var temp = (tempData[$("#line").val()] ? tempData[$("#line").val()] : " : ").split(":");
+				$("#gsdm").val(temp[0]);
+				updateCompany();
+				$("#nature").val(0);
+				$("#fgsdm").val(temp[1]);
+				$("#gsdm").attr("disabled", true);
+				$("#fgsdm").attr("disabled", true);
+			}
+		});
+		
+
+		var line ="";
+		var xlName ="";
+		var date = "";
+		var date2 ="";
+		var gsdm="";
+		var fgsdm="";
+		var nature="";
+		var time1="";
+		var time2="";
+		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+			if($("#date2").val() == null || $("#date2").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+// 			$("#tjrbBody").height($(window).height()-100);
+			line = $("#line").val();
+			date = $("#date").val();
+			date2 =$("#date2").val();
+			gsdm =$("#gsdm").val();
+			fgsdm=$("#fgsdm").val();
+			nature=$("#nature").val();
+			xlName = $("#select2-line-container").html();
+			if(xlName == "全部线路")
+				xlName = $('#fgsdm option:selected').text();
+			if(xlName == "请选择")
+				xlName = $('#gsdm option:selected').text();
+			if(line=="请选择"){
+				line="";
+			}
+			time1 = Date.parse(new Date(date));
+			 time2 = Date.parse(new Date(date2));
+			if(date==null || date =="" ||date2==null || date2 ==""){
+				 layer.msg('请选择时间段.');
+			}else if(time2<time1){
+				layer.msg('结束日期不能小于开始日期.');
+			}else{
+				if((time2-time1)>2678400000){
+					layer.msg('查询超过一个月请点击【统计查询】.');
+				}else{
+					$("#tjrq").html(date+"至"+date2);
+					 var params = {};
+					 params['gsdm'] = gsdm;
+					 params['fgsdm'] =fgsdm ;
+					 params['line'] = line;
+					 params['date'] = date;
+					 params['date2'] = date2;
+					 params['xlName'] = xlName;
+					 params['nature'] = nature;
+					 params['type'] = "query";
+					var i = layer.load(2);
+					$get('/realSchedule/statisticsDailyTj',params,function(result){
+						// 把数据填充到模版中
+						var tbodyHtml = template('statisticsDaily',{list:result});
+						// 把渲染好的模版html文本追加到表格中
+						$('#forms .statisticsDaily').html(tbodyHtml);
+						layer.close(i);
+						
+						if(result.length == 0){
+							$("#export").attr('disabled',"true");
+						}else{
+							$("#export").removeAttr("disabled");
+						}
+					});
+				}
+				
+			}
+			
+		});
+// 		$("#tjrbBody").height($(window).height()-100);
+		$("#export").on("click",function(){
+			 var params = {};
+			 params['gsdm'] = gsdm;
+			 params['fgsdm'] =fgsdm;
+			 params['line'] = line;
+			 date = $("#date").val();
+			 date2 =$("#date2").val();	
+			 params['date'] = date;
+			 params['date2'] = date2;
+			 params['xlName'] = xlName;
+			 params['nature'] = nature;
+			 params['type'] = "export";
+			 if((time2-time1)>2678400000){
+					layer.msg('查询超过一个月请点击【统计查询】.');
+			}else{
+				var i = layer.load(2);
+				$get('/realSchedule/statisticsDailyTj',params,function(result){
+					var dateTime = "";
+					if(date == date2){
+						dateTime = moment(date).format("YYYYMMDD");
+					} else {
+						dateTime = moment(date).format("YYYYMMDD")
+								+"-"+moment(date2).format("YYYYMMDD");
+					}
+					window.open("/downloadFile/download?fileName="
+							+dateTime+"-"+xlName+"-统计日报");
+					layer.close(i);
+				});
+			}
+		});
+		
+		
+		$.get('/user/getCurrentUser', function(result){
+			var roleName = "";
+			$(result.roles).each(function(i, e){
+				roleName += e.roleName + "、";
+			});
+			if(roleName.indexOf("浦交") > -1 || roleName.indexOf("拓华") > -1){
+				$("#exportAll").show();
+			}
+		});
+		$("#exportAll").on("click",function(){
+			var params = {};
+			date = $("#date").val();
+			date2 = $("#date2").val();
+			nature = $("#nature").val();
+			params['date'] = date;
+			params['date2'] = date2;
+			params['nature'] = nature;
+			params['type'] = "exportAll";
+			if((time2-time1)>2678400000){
+					layer.msg('查询超过一个月请点击【统计查询】.');
+			}else{
+				var i = layer.load(2);
+				$get('/realSchedule/statisticsDailyTj',params,function(result){
+					var dateTime = "";
+					if(date == date2){
+						dateTime = moment(date).format("YYYYMMDD");
+					} else {
+						dateTime = moment(date).format("YYYYMMDD")
+								+"-"+moment(date2).format("YYYYMMDD");
+					}
+					window.open("/downloadFile/download?fileName="
+							+dateTime+"-全部公司-统计日报");
+					layer.close(i);
+				});
+			}
+		});
+
+	});
+</script>
+<script type="text/html" id="statisticsDaily">
+	{{each list as obj i}}
+		<tr {{if obj.zt==1}}style='color: red'{{/if}}>
+			<td>{{obj.fgsName}}</td>
+			<td>{{obj.xlName}}</td>
+			<td>{{obj.jhzlc}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.jcclc}}</td>
+			<td>{{obj.sjzgl}}</td>
+			<td>{{obj.sjgl}}</td>
+			<td>{{obj.sjksgl}}</td>
+			<td>{{obj.ssgl}}</td>
+			<td>{{obj.ssbc}}</td>
+			<td>{{obj.ssgl_lz}}</td>
+			<td>{{obj.ssgl_dm}}</td>
+			<td>{{obj.ssgl_gz}}</td>
+			<td>{{obj.ssgl_jf}}</td>
+			<td>{{obj.ssgl_zs}}</td>
+			<td>{{obj.ssgl_qr}}</td>
+			<td>{{obj.ssgl_qc}}</td>
+			<td>{{obj.ssgl_kx}}</td>
+			<td>{{obj.ssgl_qh}}</td>
+			<td>{{obj.ssgl_yw}}</td>
+			<td>{{obj.ssgl_other}}</td>
+			<td>{{obj.ljgl}}</td>
+			<td>{{obj.ljks}}</td>
+			<td>{{obj.jhbc}}</td>
+			<td>{{obj.jhbc_m}}</td>
+			<td>{{obj.jhbc_a}}</td>
+			<td>{{obj.sjbc}}</td>
+			<td>{{obj.sjbc_m}}</td>
+			<td>{{obj.sjbc_a}}</td>
+			<td>{{obj.ljbc}}</td>
+			<td>{{obj.ljbc_m}}</td>
+			<td>{{obj.ljbc_a}}</td>
+			<td>{{obj.fzbc}}</td>
+			<td>{{obj.fzbc_m}}</td>
+			<td>{{obj.fzbc_a}}</td>
+			<td>{{obj.dtbc}}</td>
+			<td>{{obj.dtbc_m}}</td>
+			<td>{{obj.dtbc_a}}</td>
+			<td>{{obj.djg}}</td>
+			<td>{{obj.djg_m}}</td>
+			<td>{{obj.djg_a}}</td>
+			<td>{{obj.djg_time}}</td>
+			<td>&nbsp;</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
 </script>
 \ No newline at end of file
@@ -71,6 +71,7 @@
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
+                        <input class="btn btn-default" type="button" id="exportAll" value="导出全部公司" style="display: none;"/>
                     </div>
 				</form>
 			</div>
@@ -353,6 +354,41 @@
 				layer.close(i);
 			});
 		});
+		
+		
+		$.get('/user/getCurrentUser', function(result){
+			var roleName = "";
+			$(result.roles).each(function(i, e){
+				roleName += e.roleName + "、";
+			});
+			if(roleName.indexOf("浦交") > -1 || roleName.indexOf("拓华") > -1){
+				$("#exportAll").show();
+			}
+		});
+		$("#exportAll").on("click",function(){
+			var params = {};
+			date = $("#date").val();
+			date2 = $("#date2").val();
+			nature = $("#nature").val();
+			params['date'] = date;
+			params['date2'] = date2;
+			params['nature'] = nature;
+			params['type'] = "exportAll";
+			var i = layer.load(2);
+// 			$get('/realSchedule/statisticsDailyTj',params,function(result){
+			$get('/calcWaybill/calcStatisticsDaily',params,function(result){
+				var dateTime = "";
+				if(date == date2){
+					dateTime = moment(date).format("YYYYMMDD");
+				} else {
+					dateTime = moment(date).format("YYYYMMDD")
+							+"-"+moment(date2).format("YYYYMMDD");
+				}
+				window.open("/downloadFile/download?fileName="
+						+dateTime+"-全部公司-统计日报");
+				layer.close(i);
+			});
+		});
 	});
 </script>
@@ -83,15 +83,24 @@
         success: function(rs) {
             if (rs && rs.status === "SUCCESS") {
                 if (rs.data && rs.data.length && rs.data.length > 0) {
-                    var text = "";
+                    var htmlText = "";
+                    var wrapData = [];
                     if (rs.data.length > 8) {
-                        text = "部分停用信息如下：</br>" + rs.data.slice(0, 8).join("</br>");
+                        htmlText = "<span style='font-weight: bold; font-style: italic; '>部分停用信息如下：</span></br>";
+                        wrapData = rs.data.slice(0, 8);
                     } else {
-                        text = "所有停用信息如下：</br>" + rs.data.join("</br>");
+                        htmlText = "<span style='font-weight: bold; font-style: italic; '>所有停用信息如下：</span></br>";
+                        wrapData = rs.data;
                     }
+                    $.each(wrapData, function(index, value) {
+                        wrapData[index] = "<span style='font-size: 14px;'>" + value + "</span>";
+                    });
+
+                    htmlText += wrapData.join("</br>");
+
                     swal({
-                        title: "人员配置停用信息",
-                        text: text,
+                        title: "排班人员停用信息",
+                        text: htmlText,
                         html: true,
                         type: "warning",
                         showCancelButton: true,
@@ -50,7 +50,7 @@
                         <select class="form-control" name="line" id="line" style="width: 140px;"></select>
                     </div>
                     <div style="margin-top: 10px"></div>
-					<div style="display: inline-block;">
+					<div style="display: inline-block;margin-left: 3px;">
 						<span class="item-label" style="width: 80px;">线路性质: </span> <select
 							class="form-control" name="nature" id="nature"
 							style="width: 140px;">
@@ -59,17 +59,18 @@
 							<option value="2">非营运线路</option>
 						</select>
 					</div>
-                    <div style="display: inline-block;margin-left: 15px;">
+                    <div style="display: inline-block;margin-left: 11px;">
                         <span class="item-label" style="width: 80px;">开始时间: </span>
                         <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
                     </div>
-                    <div style="display: inline-block;margin-left: 15px;">
+                    <div style="display: inline-block;margin-left: 16px;">
                         <span class="item-label" style="width: 80px;">结束时间: </span>
                         <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="筛选"/>
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
+                        <input class="btn btn-default" type="button" id="exportAll" value="导出全部公司" style="display: none;"/>
                     </div>
 				</form>
 			</div>
@@ -294,6 +295,39 @@
 			layer.close(i);
 		});
 	});
+	
+	
+	$.get('/user/getCurrentUser', function(result){
+		var roleName = "";
+		$(result.roles).each(function(i, e){
+			roleName += e.roleName + "、";
+		});
+		if(roleName.indexOf("浦交") > -1 || roleName.indexOf("拓华") > -1){
+			$("#exportAll").show();
+		}
+	});
+	$("#exportAll").on("click",function(){
+		var params = {};
+		startDate=$("#startDate").val();
+		endDate=$("#endDate").val();
+		params['startDate'] = startDate;
+		params['endDate'] = endDate;
+		params['nature'] = $("#nature").val();
+		params['type'] = "exportAll";
+		var i = layer.load(2);
+		$get('/calcSheet/calcTurnoutrate',params,function(result){
+			var dateTime = "";
+			if(startDate == endDate){
+				dateTime = startDate;
+			} else {
+				dateTime = startDate+"-"+endDate;
+			}
+			window.open("/downloadFile/download?fileName="
+					+dateTime+"-全部公司-营运线路出车率统计表");
+			layer.close(i);
+		});
+	});
+	
 	});
 </script>
 <script type="text/html" id="calcTurnoutrate">
@@ -358,7 +358,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             //console.log("核对加注量");
             if ($("#rq").val() != "") {
        		 	var params=getParamsList();
-            	$get('/ylb/checkDate',params,function(status){
+            	var par={};
+            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+            	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
@@ -380,7 +383,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
            // console.log("进场油量等于出场油量");
             if ($("#rq").val() != "") {
             	var params=getParamsList();
-            	$get('/ylb/checkDate',params,function(status){
+            	var par={};
+            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+            	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
@@ -400,7 +406,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $(".saveButton").on('click',function(){
         	var params_=getParamsList();
-        	$get('/ylb/checkDate',params_,function(status){
+        	var par={};
+        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+        	$get('/ylb/checkDate',par,function(status){
         		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
@@ -464,7 +473,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $(".sortButton").on('click', function () {
             if ($("#rq").val() != "") {
             	var params_=getParamsList();
-            	$get('/ylb/checkDate',params_,function(status){
+            	var par={};
+            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+            	$get('/ylb/checkDate',par,function(status){
             		if(status=='2'){
                		 layer.msg('只能操作三天内数据.');
                	}else{
@@ -632,7 +644,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             //console.log("获取加存");
             if ($("#rq").val() != "") {
             	var params=getParamsList();
-            	$get('/ylb/checkDate',params,function(status){
+            	var par={};
+            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+            	$get('/ylb/checkDate',par,function(status){
 	            	if(status=='2'){
 	               		 layer.msg('只能操作三天内数据.');
 	               	}else{
@@ -788,7 +803,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         function jsyUpdate(){
         	var params=getParamsList();
-        	$get('/ylb/checkDate',params,function(status){
+        	var par={};
+        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+        	$get('/ylb/checkDate',par,function(status){
 				var id = $(this).data('id');
 	            if(status=='2'){
 	               	layer.msg('只能操作三天内数据.');
@@ -926,7 +944,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         //删除
         $('.removeButton').on('click', function () {
         	var params_=getParamsList();
-        	$get('/ylb/checkDate',params_,function(status){
+        	var par={};
+        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+        	$get('/ylb/checkDate',par,function(status){
 		            if(status=='2'){
 		               	layer.msg('只能操作三天内数据.');
 		            }else{
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+	   
+	   #forms > thead > tr> td >span{
+	    width: 5px; 
+		word-wrap: break-word; 
+		letter-spacing: 20px; 
+	  }
+	  
+	  #forms   > thead > tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>审计公里汇总表</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+					<div style="display: inline-block;">
+						<span class="item-label" style="width: 80px;">线路性质: </span>
+						 <select
+							class="form-control" name="nature" id="nature"
+							style="width: 180px;">
+							<option value="0">全部线路</option>
+							<option value="1" selected="selected">营运线路</option>
+							<option value="2">非营运线路</option>
+						</select>
+					</div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">开始日期: </span>
+                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">结束日期: </span>
+                        <input class="form-control" type="text" id="date2" style="width: 180px;"/>
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="查询"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+				</form>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container"  id="countLine" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th colspan="30"><label id="datetodate"></label> 审计公里汇总表</th>
+							</tr>
+							<tr>
+								<td rowspan="2"><span>公司</span></td>
+								<td rowspan="2"><span>分公司</span></td>
+								<td rowspan="2"><label>计划</label><label>总公里</label></td>
+								<td rowspan="2"><label>计划营</label><label>运公里</label></td>
+								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
+								<td rowspan="2"><label>实际</label><label>总公里</label></td>
+								<td colspan="2"><label>实际营</label><label>运公里</label></td>
+								<td colspan="6"><label>实际空</label><label>驶公里</label></td>
+								<td rowspan="2"><label>少驶营</label><label>运里程</label></td>
+								<td colspan="11">少驶原因(公里)</td>
+								<td colspan="3">临加公里</td>
+							</tr>
+							<tr>
+								<td><label>计划内</label><label>营运</label><label>里程</label></td>
+								<td><label>临时性</label><label>多样化</label><label>调度营</label><label>运里程</label></td>
+								<td><label>计划内</label><label>进出场</label><label>空驶</label></td>
+								<td><label>计划外</label><label>进出场</label><label>空驶</label></td>
+								<td><label>故障</label><label>进出场</label><label>空驶</label></td>
+								<td><label>肇事</label><label>进出场</label><label>空驶</label></td>
+								<td><label>纠纷</label><label>进出场</label><label>空驶</label></td>
+								<td><label>空放 </label><label>空驶</label></td>
+								<td><span>路阻</span></td>
+								<td><span>吊慢</span></td>
+								<td><span>故障</span></td>
+								<td><span>纠纷</span></td>
+								<td><span>肇事</span></td>
+								<td><span>缺人</span></td>
+								<td><span>缺车</span></td>
+								<td><span>客稀</span></td>
+								<td><span>气候</span></td>
+								<td><span>援外</span></td>
+								<td><span>其他</span></td>
+								<td><label>临加营</label><label>运公里</label></td>
+								<td><label>临加进出</label><label>场空驶</label></td>
+								<td><label>临加</label><label>空放</label><label>空驶</label></td>
+							</tr>
+							
+						</thead>
+						<tbody class="count_mileage_sum">
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+// 		$('#export').attr('disabled', "true");
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		$("#date2").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#date").val(year + "-" + month + "-" + day);
+		$("#date2").val(year + "-" + month + "-" + day);
+		
+		var date = "";
+		var date2 = "";
+		var nature = "";
+		$("#query").on("click",function(){
+			$("#countLine").height($(window).height()-280);
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}
+			if($("#date2").val() == null || $("#date2").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}
+			date = $("#date").val();
+			date2 = $("#date2").val();
+// 			if(date==null || date =="" ||date2==null || date2 ==""){
+// 				 layer.msg('请选择时间段.');
+// 			}else{
+				nature = $("#nature").val();
+				var params = {};
+				params['date'] = date;
+				params['date2'] = date2;
+				params['nature'] = nature;
+				params['type'] = "query";
+				var i = layer.load(2);
+				$get('/report/countMileageSum',params,function(result){
+					layer.close(i);
+					$("#datetodate").html(date);
+					// 把数据填充到模版中
+					var tbodyHtml = template('count_mileage_sum',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms .count_mileage_sum').html(tbodyHtml);
+					
+					if(result.length == 0)
+						$("#export").attr('disabled',"true");
+					else
+						$("#export").removeAttr("disabled");
+				});
+// 			}
+			
+		});
+		
+		$("#countLine").height($(window).height()-280);
+		$("#export").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}if($("#date2").val() == null || $("#date2").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}
+			date = $("#date").val();
+			date2 = $("#date2").val();
+			nature = $("#nature").val();
+			var params = {};
+			params['date'] = date;
+			params['date2'] = date2;
+			params['nature'] = nature;
+			params['type'] = "export";
+			params['by']='sj';
+			var i = layer.load(2);
+			$get('/report/countMileageSum',params,function(result){
+				var dateTime = "";
+				if(date == date2){
+					dateTime = moment(date).format("YYYYMMDD");
+				} else {
+					dateTime = moment(date).format("YYYYMMDD")
+							+"-"+moment(date2).format("YYYYMMDD");
+				}
+				window.open("/downloadFile/download?fileName="
+						+dateTime+"-审计公里汇总表");
+				layer.close(i);
+			});
+		});
+	});
+</script>
+<script type="text/html" id="count_mileage_sum">
+	{{each list as obj i}}
+		<tr style='{{if obj.fgsName=='小计' || obj.gsName=='浦交'}}background-color: #b9d6fb;{{/if}}'>
+				<td>{{obj.gsName}}</td>
+				<td>{{obj.fgsName}}</td>
+				<td>{{obj.jhzlc}}</td>
+				<td>{{obj.jhlc}}</td>
+				<td>{{obj.jcclc}}</td>
+				<td>{{obj.sjzgl}}</td>
+				<td>{{obj.jhnlc}}</td>
+				<td>{{obj.jhwlc}}</td>
+				<td>{{obj.jhnjcclc}}</td>
+				<td>{{obj.jhwjcclc_z}}</td>
+				<td>{{obj.zrwjcclc}}</td>
+				<td>{{obj.zrwjcclc1}}</td>
+				<td>{{obj.zrwjcclc2}}</td>
+				<td>{{obj.kfks}}</td>
+				<td>{{obj.lbss}}</td>
+				<td>{{obj.ssgl_lz}}</td>
+				<td>{{obj.ssgl_dm}}</td>
+				<td>{{obj.ssgl_gz}}</td>
+				<td>{{obj.ssgl_jf}}</td>
+				<td>{{obj.ssgl_zs}}</td>
+				<td>{{obj.ssgl_qr}}</td>
+				<td>{{obj.ssgl_qc}}</td>
+				<td>{{obj.ssgl_kx}}</td>
+				<td>{{obj.ssgl_qh}}</td>
+				<td>{{obj.ssgl_yw}}</td>
+				<td>{{obj.ssgl_other}}</td>
+				<td>{{obj.ljyy}}</td>
+				<td>{{obj.ljjcc}}</td>
+                <td>{{obj.ljkfks}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="30"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 \ No newline at end of file
@@ -373,8 +373,10 @@
 		<td>{{obj.sjszddzds}}</td>
 		<td>{{obj.szddzdl}}</td>
 		<td>
-			<button type="button" class="btn btn-sm blue btn-calcSheetList" 
-			data-id="{{obj.xl}}">查看</button>
+			{{if obj.xl && obj.xl > 0}}
+				<button type="button" class="btn btn-sm blue btn-calcSheetList" 
+						data-id="{{obj.xl}}">查看</button>
+			{{/if}}
 		</td>
 		</tr>
 	{{/each}}
@@ -411,7 +413,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="9"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -967,6 +967,87 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         }
                     }
                 ),
+
+                pvInfoExport: $resource(
+                    '/tidc/exportPvInfo/:id',
+                    {id: '@id'},
+                    {
+                        do: {
+                            method: 'GET',
+                            responseType: "arraybuffer",
+                            transformResponse: function(data, headers, status){
+                                if (status != 200) {
+                                    return data;
+                                }
+
+                                // console.log(headers("Content-Disposition"));
+                                // 获取文件名，后台根据是否还有中文名字，返回filename=ascii编码的文件名 或 filename*=unicode编码的文件名
+                                var fileName = headers("Content-Disposition").split(";")[1].split("filename=")[1];
+                                var fileNameUnicode = headers("Content-Disposition").split("filename*=")[1];
+                                if (fileNameUnicode) {//当存在 filename* 时，取filename* 并进行解码（为了解决中文乱码问题）
+                                    fileName = decodeURIComponent(fileNameUnicode);
+                                }
+
+                                return {fileData : data, fileName: fileName};
+                            }
+                        }
+                    }
+                ),
+
+                addLp: $resource(
+                    '/tidc/addLp/:ttInfoId/:lpId',
+                    {},
+                    {
+                        do: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return {msg: dst.data};
+                                } else {
+                                    return {error: dst.msg}; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
+                ),
+
+                removeLp: $resource(
+                    '/tidc/removeLp/:ttInfoId/:lpId',
+                    {},
+                    {
+                        do: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return {msg: dst.data};
+                                } else {
+                                    return {error: dst.msg}; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
+                ),
+
+                switchLp: $resource(
+                    '/tidc/switchLp/:ttInfoId/:lpAId/:lpBId',
+                    {},
+                    {
+                        do: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return {msg: dst.data};
+                                } else {
+                                    return {error: dst.msg}; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
+                ),
+
                 edit: $resource(
                     '/tidc/edit/:xlid/:ttid',
                     {},
@@ -1017,7 +1098,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
+);
+
 // 时刻表日志管理service
 angular.module('ScheduleApp').factory(
     'TimetableLogManageService_g',
@@ -1357,13 +1357,70 @@ ScheduleApp.config([
                     }]
                 }
             })
-
+            .state("ttInfoDetailManage_detail_edit_addLp", { // 时刻表 添加路牌
+                url: '/ttInfoDetailManage_detail_edit_addLp/:xlid/:ttid/:xlname/:ttname/:lineversion',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-addLp.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'ttInfoDetailManage_detail_edit_addLp',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
+                            ]
+                        });
+                    }]
+                }
+            })
+            .state("ttInfoDetailManage_detail_edit_removeLp", { // 时刻表 删除路牌
+                url: '/ttInfoDetailManage_detail_edit_removeLp/:xlid/:ttid/:xlname/:ttname/:lineversion',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-removeLp.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'ttInfoDetailManage_detail_edit_removeLp',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
+                            ]
+                        });
+                    }]
+                }
+            })
+            .state("ttInfoDetailManage_detail_edit_switchLp", { // 时刻表 调换路牌
+                url: '/ttInfoDetailManage_detail_edit_switchLp/:xlid/:ttid/:xlname/:ttname/:lineversion',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-switchLp.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'ttInfoDetailManage_detail_edit_switchLp',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
+                            ]
+                        });
+                    }]
+                }
+            })
         ;
     }
-]);
+]);
+
 // ui route 配置
 /** 时刻表管理配置route */
@@ -11,7 +11,8 @@
                 <th style="width: 15%;">驾驶员</th>
                 <th >售票员工号</th>
                 <th >售票员</th>
-                <th style="width: 80px;">状态</th>
+                <th style="width: 80px;">状态1</th>
+                <th style="width: 80px;">状态2</th>
                 <th style="width: 21%">操作</th>
             </tr>
             <tr role="row" class="filter">
@@ -51,6 +52,11 @@
                     </label>
                 </td>
                 <td>
+                    <label class="checkbox-inline">
+                        <input type="checkbox" ng-model="ctrl.personIsDestroyCheck"/>已停用
+                    </label>
+                </td>
+                <td>
                     <div class="btn-group">
                         <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
                                 ng-click="ctrl.doPage()">
@@ -111,6 +117,10 @@
                     <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
                 </td>
                 <td>
+                    <span class="glyphicon glyphicon-ok" ng-if="info.ryDestroyStatus == 0"></span>
+                    <span class="glyphicon glyphicon-remove" ng-if="info.ryDestroyStatus > 0"></span>
+                </td>
+                <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="employeeConfig_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
@@ -147,4 +157,4 @@
         </div>
     </div>
-</div>
 \ No newline at end of file
+</div>
@@ -236,7 +236,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.searchCondition = function() {
                 return service.getSearchCondition();
             };
+            self.personIsDestroyCheck = false; // 人员停用选择框
             self.doPage = function() {
+                // 人员停用判定（目前只判定驾驶员）
+                delete self.searchCondition()['ryDestroyStatus_gt'];
+                delete self.searchCondition()['ryDestroyStatus_eq'];
+                if (self.personIsDestroyCheck) {
+                    self.searchCondition()['ryDestroyStatus_gt'] = 0; // 选中时，true替换成1
+                } else {
+                    self.searchCondition()['ryDestroyStatus_eq'] = 0;
+                }
+
                 var page = EmpConfig.list(self.searchCondition(), function() {
                     service.getPage(page);
                 });
@@ -152,6 +152,39 @@
                     </div>
                     <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">计划里程*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control" name="jhlc"
+                                   ng-model="ctrl.schedulePlanInfoForSave.jhlc" required ng-pattern="ctrl.float_regex"
+                            />
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.jhlc.$error.required">
+                            计划里程必须填写
+                        </div>
+                        <div class="alert alert-danger well-sm" ng-show="myForm.jhlc.$error.pattern">
+                            输入数字
+                        </div>
+
+                    </div>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">班次历时*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control" name="bcsj"
+                                   ng-model="ctrl.schedulePlanInfoForSave.bcsj" required ng-pattern="ctrl.number_regex"
+                            />
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.bcsj.$error.required">
+                            班次时间必须填写
+                        </div>
+                        <div class="alert alert-danger well-sm" ng-show="myForm.bcsj.$error.pattern">
+                            输入整数
+                        </div>
+
+                    </div>
+
+                    <div class="form-group has-success has-feedback">
                         <label class="col-md-2 control-label">车辆*：</label>
                         <div class="col-md-4">
                             <sa-Select5 name="cl"
@@ -230,6 +230,11 @@ angular.module(&quot;ScheduleApp&quot;).controller(
                 $state.go("schedulePlanInfoManage", $stateParams);
             };
+            // 整数
+            self.number_regex = /^-?\d+$/;
+            // 小数
+            self.float_regex = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/;
+
             // 线路版本描述
             self.title_tip = "版本加载中...";
+<div ng-controller="TimeTableDetailManageFormCtrl_addLp as ctrl">
+    <div class="page-head">
+        <div class="page-title">
+            <h1>时刻表管理</h1>
+        </div>
+    </div>
+
+    <ul class="page-breadcrumb breadcrumb">
+        <li>
+            <a href="/pages/home.html" data-pjax>首页</a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <span class="active">运营计划管理</span>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <a ui-sref="ttInfoManage">时刻表管理</a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <a ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid: ctrl.ttid, xlname: ctrl.xlname, ttname: ctrl.ttname, lineversion: ctrl.lineversion})"><span ng-bind="ctrl.title1"></span></a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <span class="active">添加路牌</span>
+        </li>
+    </ul>
+
+    <div class="portlet light bordered">
+        <div class="portlet-title">
+            <div class="caption">
+                <div>
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title1"></span>
+                </div>
+                <div style="padding-top: 10px;">
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title_tip"></span>
+                </div>
+            </div>
+        </div>
+
+        <div class="portlet-body form">
+            <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
+                <div class="form-body">
+
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">路牌：</label>
+                        <div class="col-md-3">
+                            <sa-Select5 name="lp"
+                                        model="ctrl.formInfo"
+                                        cmaps="{'lpId' : 'id'}"
+                                        dcname="lpId"
+                                        icname="id"
+                                        dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.xlid, 'type': 'all'}, atype:'lpInfo2' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.lpName"
+                                        searchph="输入路牌名字"
+                                        searchexp="this.lpName"
+                                        required
+                            >
+                            </sa-Select5>
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.lp.$error.required">
+                            请选择路牌
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="form-actions">
+                    <div class="row">
+                        <div class="col-md-offset-3 col-md-4">
+                            <button type="submit" class="btn green"
+                                    ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
+                            <a type="button" class="btn default"
+                               ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname, lineversion : ctrl.lineversion})" ><i class="fa fa-times"></i> 取消</a>
+                        </div>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+
+    </div>
+
+</div>
 <div ng-controller="TimeTableDetailManageFormCtrl_old2 as ctrl">
     <div class="page-head">
         <div class="page-title">
-            <h1>修改班次信息</h1>
+            <h1>时刻表管理</h1>
         </div>
     </div>
@@ -23,7 +23,7 @@
             <i class="fa fa-circle"></i>
         </li>
         <li>
-            <span class="active">修改班次信息</span>
+            <span class="active">批量修改</span>
         </li>
     </ul>
 <div ng-controller="TimeTableDetailManageFormCtrl_mulselect as ctrl">
     <div class="page-head">
         <div class="page-title">
-            <h1>修改班次信息</h1>
+            <h1>时刻表管理</h1>
         </div>
     </div>
@@ -19,19 +19,25 @@
             <i class="fa fa-circle"></i>
         </li>
         <li>
-            <a ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname})"><span ng-bind="ctrl.title1"></span></a>
+            <a ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname, lineversion: ctrl.lineversion})"><span ng-bind="ctrl.title1"></span></a>
             <i class="fa fa-circle"></i>
         </li>
         <li>
-            <span class="active">修改班次信息</span>
+            <span class="active">批量选择</span>
         </li>
     </ul>
     <div class="portlet light bordered">
         <div class="portlet-title">
             <div class="caption">
-                <i class="icon-equalizer font-red-sunglo"></i> <span
-                    class="caption-subject font-red-sunglo bold uppercase" >批量选择</span>
+                <div>
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title1"></span>
+                </div>
+                <div style="padding-top: 10px;">
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title_tip"></span>
+                </div>
             </div>
         </div>
+<div ng-controller="TimeTableDetailManageFormCtrl_removeLp as ctrl">
+    <div class="page-head">
+        <div class="page-title">
+            <h1>时刻表管理</h1>
+        </div>
+    </div>
+
+    <ul class="page-breadcrumb breadcrumb">
+        <li>
+            <a href="/pages/home.html" data-pjax>首页</a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <span class="active">运营计划管理</span>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <a ui-sref="ttInfoManage">时刻表管理</a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <a ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid: ctrl.ttid, xlname: ctrl.xlname, ttname: ctrl.ttname, lineversion: ctrl.lineversion})"><span ng-bind="ctrl.title1"></span></a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <span class="active">删除路牌</span>
+        </li>
+    </ul>
+
+    <div class="portlet light bordered">
+        <div class="portlet-title">
+            <div class="caption">
+                <div>
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title1"></span>
+                </div>
+                <div style="padding-top: 10px;">
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title_tip"></span>
+                </div>
+            </div>
+        </div>
+
+        <div class="portlet-body form">
+            <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
+                <div class="form-body">
+
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">路牌：</label>
+                        <div class="col-md-3">
+                            <sa-Select5 name="lp"
+                                        model="ctrl.formInfo"
+                                        cmaps="{'lpId' : 'id'}"
+                                        dcname="lpId"
+                                        icname="id"
+                                        dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.xlid, 'type': 'all'}, atype:'lpInfo2' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.lpName"
+                                        searchph="输入路牌名字"
+                                        searchexp="this.lpName"
+                                        required
+                            >
+                            </sa-Select5>
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.lp.$error.required">
+                            请选择路牌
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="form-actions">
+                    <div class="row">
+                        <div class="col-md-offset-3 col-md-4">
+                            <button type="submit" class="btn green"
+                                    ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
+                            <a type="button" class="btn default"
+                               ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname, lineversion : ctrl.lineversion})" ><i class="fa fa-times"></i> 取消</a>
+                        </div>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+
+    </div>
+
+</div>
+<div ng-controller="TimeTableDetailManageFormCtrl_switchLp as ctrl">
+    <div class="page-head">
+        <div class="page-title">
+            <h1>时刻表管理</h1>
+        </div>
+    </div>
+
+    <ul class="page-breadcrumb breadcrumb">
+        <li>
+            <a href="/pages/home.html" data-pjax>首页</a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <span class="active">运营计划管理</span>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <a ui-sref="ttInfoManage">时刻表管理</a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <a ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid: ctrl.ttid, xlname: ctrl.xlname, ttname: ctrl.ttname, lineversion: ctrl.lineversion})"><span ng-bind="ctrl.title1"></span></a>
+            <i class="fa fa-circle"></i>
+        </li>
+        <li>
+            <span class="active">调换路牌</span>
+        </li>
+    </ul>
+
+    <div class="portlet light bordered">
+        <div class="portlet-title">
+            <div class="caption">
+                <div>
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title1"></span>
+                </div>
+                <div style="padding-top: 10px;">
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title_tip"></span>
+                </div>
+            </div>
+        </div>
+
+        <div class="portlet-body form">
+            <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
+                <div class="form-body">
+
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">路牌A：</label>
+                        <div class="col-md-3">
+                            <sa-Select5 name="lpA"
+                                        model="ctrl.formInfo"
+                                        cmaps="{'lpAId' : 'id'}"
+                                        dcname="lpAId"
+                                        icname="id"
+                                        dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.xlid, 'type': 'all'}, atype:'lpInfo2' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.lpName"
+                                        searchph="输入路牌名字"
+                                        searchexp="this.lpName"
+                                        required
+                            >
+                            </sa-Select5>
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.lpA.$error.required">
+                            请选择路牌A
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">路牌B：</label>
+                        <div class="col-md-3">
+                            <sa-Select5 name="lpB"
+                                        model="ctrl.formInfo"
+                                        cmaps="{'lpBId' : 'id'}"
+                                        dcname="lpBId"
+                                        icname="id"
+                                        dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.xlid, 'type': 'all'}, atype:'lpInfo2' } | json }}"
+                                        iterobjname="item"
+                                        iterobjexp="item.lpName"
+                                        searchph="输入路牌名字"
+                                        searchexp="this.lpName"
+                                        required
+                            >
+                            </sa-Select5>
+                        </div>
+                        <!-- 隐藏块，显示验证信息 -->
+                        <div class="alert alert-danger well-sm" ng-show="myForm.lpB.$error.required">
+                            请选择路牌B
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="form-actions">
+                    <div class="row">
+                        <div class="col-md-offset-3 col-md-4">
+                            <button type="submit" class="btn green"
+                                    ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
+                            <a type="button" class="btn default"
+                               ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname, lineversion : ctrl.lineversion})" ><i class="fa fa-times"></i> 取消</a>
+                        </div>
+                    </div>
+                </div>
+            </form>
+
+        </div>
+
+    </div>
+
+</div>
@@ -121,11 +121,35 @@
                             取消选择
                         </a>
                         <a href="javascript:" style="padding-right: 5px;"
+                           ng-click="ctrl.toAddLp()"
+                           ng-show="ctrl.currentView.btn7">
+                            <i class="fa fa-th-list" aria-hidden="true"></i>
+                            增加路牌
+                        </a>
+                        <a href="javascript:" style="padding-right: 5px;"
+                           ng-click="ctrl.toRemoveLp()"
+                           ng-show="ctrl.currentView.btn8">
+                            <i class="fa fa-th-list" aria-hidden="true"></i>
+                            删除路牌
+                        </a>
+                        <a href="javascript:" style="padding-right: 5px;"
+                           ng-click="ctrl.toSwitchLp()"
+                           ng-show="ctrl.currentView.btn9">
+                            <i class="fa fa-th-list" aria-hidden="true"></i>
+                            调换路牌
+                        </a>
+                        <a href="javascript:" style="padding-right: 5px;"
                            ng-click="ctrl.refresh()"
                            ng-show="ctrl.currentView.btn5">
                             <i class="fa fa-refresh"></i>
                             刷新数据
                         </a>
+                        <a href="javascript:" style="padding-right: 5px;"
+                           ng-click="ctrl.exportPvInfo()"
+                           ng-show="ctrl.currentView.btn6">
+                            <i class="fa fa-file-excel-o" aria-hidden="true"></i>
+                            导出
+                        </a>
                     </div>
@@ -157,10 +157,66 @@ ScheduleApp.config([
                     }]
                 }
             })
-
+            .state("ttInfoDetailManage_detail_edit_addLp", { // 时刻表 添加路牌
+                url: '/ttInfoDetailManage_detail_edit_addLp/:xlid/:ttid/:xlname/:ttname/:lineversion',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-addLp.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'ttInfoDetailManage_detail_edit_addLp',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
+                            ]
+                        });
+                    }]
+                }
+            })
+            .state("ttInfoDetailManage_detail_edit_removeLp", { // 时刻表 删除路牌
+                url: '/ttInfoDetailManage_detail_edit_removeLp/:xlid/:ttid/:xlname/:ttname/:lineversion',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-removeLp.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'ttInfoDetailManage_detail_edit_removeLp',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
+                            ]
+                        });
+                    }]
+                }
+            })
+            .state("ttInfoDetailManage_detail_edit_switchLp", { // 时刻表 调换路牌
+                url: '/ttInfoDetailManage_detail_edit_switchLp/:xlid/:ttid/:xlname/:ttname/:lineversion',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-switchLp.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'ttInfoDetailManage_detail_edit_switchLp',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
+                            ]
+                        });
+                    }]
+                }
+            })
         ;
     }
-]);
 \ No newline at end of file
+]);
@@ -60,6 +60,20 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     );
                 },
+                pvInfoExportPromise: function(ttInfoId) {
+                    return service.pvInfoExport.do({id: ttInfoId}).$promise;
+                },
+
+                addLpPromise: function(ttInfoId, lpId) {
+                    return service.addLp.do({ttInfoId: ttInfoId, lpId: lpId}).$promise;
+                },
+                removeLpPromise: function(ttInfoId, lpId) {
+                    return service.removeLp.do({ttInfoId: ttInfoId, lpId: lpId}).$promise;
+                },
+                switchLpPromise: function(ttInfoId, lpAId, lpBId) {
+                    return service.switchLp.do({ttInfoId: ttInfoId, lpAId: lpAId, lpBId: lpBId}).$promise;
+                },
+
                 /**
                  * 获取编辑用的时刻表明细数据。
                  * @param xlid 线路id
@@ -357,7 +371,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         '$state',
         '$scope',
         '$window',
-        function(service, $stateParams, $uibModal, $state, $scope, $window) {
+        'FileDownload_g',
+        function(service, $stateParams, $uibModal, $state, $scope, $window, fileDownload) {
             var self = this;
             self.xlid = $stateParams.xlid; // 获取传过来的线路id
             self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
@@ -439,12 +454,16 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     btn2 : true,
                     btn3 : true,
                     btn4 : true,
-                    btn5 : true
+                    btn5 : true,
+                    btn7 : true,
+                    btn8 : true,
+                    btn9 : true
                 },
                 "preView" : {
                     viewId : 2,
                     switchBtnMsg : "切换编辑视图",
-                    btn5 : true
+                    btn5 : true,
+                    btn6 : true
                 }
             };
             self.currentView = self.viewInfos["editView"]; // 默认编辑视图
@@ -639,6 +658,50 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 }
             };
+            // 导出pv预览视图数据
+            self.exportPvInfo = function() {
+                var promise = service.pvInfoExportPromise(self.ttid);
+                promise.then(
+                    function(result) {
+                        fileDownload.downloadFile(result.fileData, "application/octet-stream", result.fileName);
+                    },
+                    function(result) {
+                        console.log("导出预览视图信息失败：" + result);
+                    }
+                );
+            };
+
+            // 增加路牌（跳转页面）
+            self.toAddLp = function() {
+                $state.go("ttInfoDetailManage_detail_edit_addLp", {
+                    xlid: self.xlid,
+                    ttid: self.ttid,
+                    xlname: self.xlname,
+                    ttname: self.ttname,
+                    lineversion: self.lineversion
+                });
+            };
+            // 删除路牌（跳转页面）
+            self.toRemoveLp = function() {
+                $state.go("ttInfoDetailManage_detail_edit_removeLp", {
+                    xlid: self.xlid,
+                    ttid: self.ttid,
+                    xlname: self.xlname,
+                    ttname: self.ttname,
+                    lineversion: self.lineversion
+                });
+            };
+            // 调换路牌（跳转页面）
+            self.toSwitchLp = function() {
+                $state.go("ttInfoDetailManage_detail_edit_switchLp", {
+                    xlid: self.xlid,
+                    ttid: self.ttid,
+                    xlname: self.xlname,
+                    ttname: self.ttname,
+                    lineversion: self.lineversion
+                });
+            };
+
         }
     ]
@@ -994,7 +1057,13 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
             self.lineversion = $stateParams.lineversion; // 线路版本
-            self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息";
+            self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息 批量条件选择班次";
+            self.title_tip = "版本加载中...";
+            service.versiondesc(self.xlid, self.lineversion).then(
+                function(result) {
+                    self.title_tip = "线路版本（" + result.desc + "）";
+                }
+            );
             self.xldir = 2; // 线路上下行
             self.starttime = undefined; // 开始时间
@@ -1051,3 +1120,156 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     ]
 );
+// edit-addLp.html 添加路牌页面
+angular.module('ScheduleApp').controller(
+    'TimeTableDetailManageFormCtrl_addLp',
+    [
+        'TimeTableDetailManageService_old',
+        '$stateParams',
+        '$state',
+        function(service, $stateParams, $state) {
+            var self = this;
+
+            // 获取传过来的id，有的话就是修改，获取一遍数据
+            self.xlid = $stateParams.xlid; // 获取传过来的线路id
+            self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
+            self.xlname = $stateParams.xlname; // 获取传过来的线路名字
+            self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+            self.lineversion = $stateParams.lineversion; // 线路版本
+
+            self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息 添加路牌";
+            self.title_tip = "版本加载中...";
+            service.versiondesc(self.xlid, self.lineversion).then(
+                function(result) {
+                    self.title_tip = "线路版本（" + result.desc + "）";
+                }
+            );
+
+            // form数据
+            self.formInfo = {};
+            // from提交
+            self.submit = function() {
+                service.addLpPromise(self.ttid, self.formInfo.lpId).then(
+                    function(rst) {
+                        if (rst.error) {
+                            alert(rst.error);
+                        } else {
+                            service.refreshEditInfo(self.xlid, self.ttid);
+                            $state.go("ttInfoDetailManage_edit3", {
+                                xlid: self.xlid,
+                                ttid: self.ttid,
+                                xlname: self.xlname,
+                                ttname: self.ttname,
+                                lineversion: self.lineversion
+                            });
+                        }
+                    }
+                );
+            };
+
+        }
+    ]
+);
+
+// edit-removeLp.html 删除路牌页面
+angular.module('ScheduleApp').controller(
+    'TimeTableDetailManageFormCtrl_removeLp',
+    [
+        'TimeTableDetailManageService_old',
+        '$stateParams',
+        '$state',
+        function(service, $stateParams, $state) {
+            var self = this;
+
+            // 获取传过来的id，有的话就是修改，获取一遍数据
+            self.xlid = $stateParams.xlid; // 获取传过来的线路id
+            self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
+            self.xlname = $stateParams.xlname; // 获取传过来的线路名字
+            self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+            self.lineversion = $stateParams.lineversion; // 线路版本
+
+            self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息 删除路牌";
+            self.title_tip = "版本加载中...";
+            service.versiondesc(self.xlid, self.lineversion).then(
+                function(result) {
+                    self.title_tip = "线路版本（" + result.desc + "）";
+                }
+            );
+
+            // form数据
+            self.formInfo = {};
+            // from提交
+            self.submit = function() {
+                service.removeLpPromise(self.ttid, self.formInfo.lpId).then(
+                    function(rst) {
+                        if (rst.error) {
+                            alert(rst.error);
+                        } else {
+                            service.refreshEditInfo(self.xlid, self.ttid);
+                            $state.go("ttInfoDetailManage_edit3", {
+                                xlid: self.xlid,
+                                ttid: self.ttid,
+                                xlname: self.xlname,
+                                ttname: self.ttname,
+                                lineversion: self.lineversion
+                            });
+                        }
+                    }
+                );
+            };
+
+        }
+    ]
+);
+
+// edit-switchLp.html 调换路牌页面
+angular.module('ScheduleApp').controller(
+    'TimeTableDetailManageFormCtrl_switchLp',
+    [
+        'TimeTableDetailManageService_old',
+        '$stateParams',
+        '$state',
+        function(service, $stateParams, $state) {
+            var self = this;
+
+            // 获取传过来的id，有的话就是修改，获取一遍数据
+            self.xlid = $stateParams.xlid; // 获取传过来的线路id
+            self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
+            self.xlname = $stateParams.xlname; // 获取传过来的线路名字
+            self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+            self.lineversion = $stateParams.lineversion; // 线路版本
+
+            self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息 路牌A和路牌B的班次互换";
+            self.title_tip = "版本加载中...";
+            service.versiondesc(self.xlid, self.lineversion).then(
+                function(result) {
+                    self.title_tip = "线路版本（" + result.desc + "）";
+                }
+            );
+
+            // form数据
+            self.formInfo = {};
+            // from提交
+            self.submit = function() {
+                service.switchLpPromise(self.ttid, self.formInfo.lpAId, self.formInfo.lpBId).then(
+                    function(rst) {
+                        if (rst.error) {
+                            alert(rst.error);
+                        } else {
+                            service.refreshEditInfo(self.xlid, self.ttid);
+                            $state.go("ttInfoDetailManage_edit3", {
+                                xlid: self.xlid,
+                                ttid: self.ttid,
+                                xlname: self.xlname,
+                                ttname: self.ttname,
+                                lineversion: self.lineversion
+                            });
+                        }
+                    }
+                );
+
+            };
+
+        }
+    ]
+);
@@ -207,6 +207,87 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         }
                     }
                 ),
+
+                pvInfoExport: $resource(
+                    '/tidc/exportPvInfo/:id',
+                    {id: '@id'},
+                    {
+                        do: {
+                            method: 'GET',
+                            responseType: "arraybuffer",
+                            transformResponse: function(data, headers, status){
+                                if (status != 200) {
+                                    return data;
+                                }
+
+                                // console.log(headers("Content-Disposition"));
+                                // 获取文件名，后台根据是否还有中文名字，返回filename=ascii编码的文件名 或 filename*=unicode编码的文件名
+                                var fileName = headers("Content-Disposition").split(";")[1].split("filename=")[1];
+                                var fileNameUnicode = headers("Content-Disposition").split("filename*=")[1];
+                                if (fileNameUnicode) {//当存在 filename* 时，取filename* 并进行解码（为了解决中文乱码问题）
+                                    fileName = decodeURIComponent(fileNameUnicode);
+                                }
+
+                                return {fileData : data, fileName: fileName};
+                            }
+                        }
+                    }
+                ),
+
+                addLp: $resource(
+                    '/tidc/addLp/:ttInfoId/:lpId',
+                    {},
+                    {
+                        do: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return {msg: dst.data};
+                                } else {
+                                    return {error: dst.msg}; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
+                ),
+
+                removeLp: $resource(
+                    '/tidc/removeLp/:ttInfoId/:lpId',
+                    {},
+                    {
+                        do: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return {msg: dst.data};
+                                } else {
+                                    return {error: dst.msg}; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
+                ),
+
+                switchLp: $resource(
+                    '/tidc/switchLp/:ttInfoId/:lpAId/:lpBId',
+                    {},
+                    {
+                        do: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return {msg: dst.data};
+                                } else {
+                                    return {error: dst.msg}; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
+                ),
+
                 edit: $resource(
                     '/tidc/edit/:xlid/:ttid',
                     {},
@@ -257,4 +338,4 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
 \ No newline at end of file
+);
@@ -15,7 +15,7 @@
                     <th style="width: 13%;">当前执行任务</th>
                     <th style="width: 7%;">状态</th>
                     <th style="width: 19%">最后gps时间</th>
-                    <th>请求出场</th>
+                    <th style="width: 11%">请求出场</th>
                 </tr>
             </thead>
             <tbody>
@@ -106,7 +106,7 @@
     <script>
         (function() {
-            var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '路救', '其他'];
+            var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '路救故障', '其他'];
             var modal = '#schedule-jhlb-modal',
                 sch;
             $(modal).on('init', function(e, data) {
+<!-- 临加班次form -->
+<script id="add_normal_sch-form-temp" type="text/html">
+    <form class="uk-form uk-form-horizontal add-sch-form">
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">班次类型</label>
+                    <div class="uk-form-controls">
+                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                                data-group=ScheduleType></select>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">上下行</label>
+                    <div class="uk-form-controls">
+                        <select name="xlDir">
+                            <option value="0">上行</option>
+                            <option value="1">下行</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">起点站</label>
+                    <div class="uk-form-controls">
+                        <select name="qdzCode">
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">终点站</label>
+                    <div class="uk-form-controls">
+                        <select name="zdzCode">
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">开始时间</label>
+                    <div class="uk-form-controls">
+                        <input type="time" value="{{zdsjActual==null?zdsj:zdsjActual}}" name="fcsj" required>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">结束时间</label>
+                    <div class="uk-form-controls">
+                        <input type="time" name="zdsj" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">车辆</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form car-autocom">
+                            <input type="text" value="{{clZbh}}" name="clZbh" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">里程</label>
+                    <div class="uk-form-controls">
+                        <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
+                               required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">驾驶员</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form jsy-autocom">
+                            <input type="text" value="{{jGh}}/{{jName}}" name="jsy" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">售票员</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form spy-autocom">
+                            <input type="text" name="spy" value="{{sGh}}/{{sName}}">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">路牌</label>
+                    <div class="uk-form-controls">
+                        <input type="text" value="{{lpName}}" name="lpName" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">备注</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form remarks-autocom">
+                            <input type="text" name="remarks">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+            <button type="button" class="uk-button uk-modal-close">取消</button>
+            <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存
+            </button>
+        </div>
+    </form>
+</script>
+<script>
+    (function () {
+        var wrap = '#schedule-addsch-modal .normalCont', sch, nf, submitFun;
+
+        $(wrap).on('init', function (e, data) {
+            e.stopPropagation();
+            sch = data.sch;
+            submitFun = data.submitFun;
+
+            nf = addForm();
+            //提交
+            nf.on('success.form.fv', function (e) {
+                e.preventDefault();
+
+                disabled_submit_btn(nf);
+                var data = nf.serializeJSON();
+                submitFun(data, function (rs) {
+                    //前端数据更新
+                    gb_schedule_table.insertSchedule(rs.t, rs.ts);
+                    $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: rs.t});
+                    try {
+                        if(rs.t.bcType=='in' || rs.t.bcType=='out')
+                            gb_data_basic.reload_stat_park_data();
+                    }catch (e){
+                        console.log(e);}
+                    UIkit.modal('#schedule-addsch-modal').hide();
+                    //更新路牌公里统计面板
+                    gb_schedule_table.showLpMileageTipBySch(rs.t);
+                }, function () {
+                    enable_submit_btn(nf);
+                });
+            });
+        });
+        
+        function addForm() {
+            var htmlStr = template('add_normal_sch-form-temp', sch);
+            var f = $(htmlStr);
+            $(wrap).append(f);
+            //字典转换
+            dictionaryUtils.transformDom($('.nt-dictionary', f));
+            //validation
+            f.formValidation({framework: 'uikit', locale: 'zh_CN'});
+            //autocomp
+            f.trigger('init-autoCom');
+
+            $f('bcType', f).trigger('change');
+            return f;
+        }
+
+        function $f(name, f) {
+            return $('[name=' + name + ']', f);
+        }
+    })();
+</script>
 \ No newline at end of file
+<!-- 临加场到场班次form -->
+<script id="add_park_to_park_sch-form-temp" type="text/html">
+    <form class="uk-form uk-form-horizontal">
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">班次类型</label>
+                    <div class="uk-form-controls">
+                        <select class="form-control" name="bcType">
+                            <option value="in">进场</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">上下行</label>
+                    <div class="uk-form-controls">
+                        <select name="xlDir">
+                            <option value="0">上行</option>
+                            <option value="1">下行</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">起点站</label>
+                    <div class="uk-form-controls">
+                        <select name="qdzCode">
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">终点站</label>
+                    <div class="uk-form-controls">
+                        <select name="zdzCode">
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">开始时间</label>
+                    <div class="uk-form-controls">
+                        <input type="time" value="{{zdsjActual==null?zdsj:zdsjActual}}" name="fcsj" required>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">结束时间</label>
+                    <div class="uk-form-controls">
+                        <input type="time" name="zdsj" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">车辆</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form car-autocom">
+                            <input type="text" value="{{clZbh}}" name="clZbh" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">里程</label>
+                    <div class="uk-form-controls">
+                        <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
+                               required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">驾驶员</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form jsy-autocom">
+                            <input type="text" value="{{jGh}}/{{jName}}" name="jsy" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">售票员</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form spy-autocom">
+                            <input type="text" name="spy" value="{{sGh}}/{{sName}}">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">路牌</label>
+                    <div class="uk-form-controls">
+                        <input type="text" value="{{lpName}}" name="lpName" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">备注</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form remarks-autocom">
+                            <input type="text" name="remarks">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+            <button type="button" class="uk-button uk-modal-close">取消</button>
+            <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存
+            </button>
+        </div>
+    </form>
+</script>
+
+<script>
+    (function () {
+        var wrap = '#schedule-addsch-modal .parkToParkCont', sch, nf, submitFun,parks,carsArray;
+
+        $(wrap).on('init', function (e, data) {
+            e.stopPropagation();
+            sch = data.sch;
+            submitFun = data.submitFun;
+            parks = data.parks;
+            carsArray = data.carsArray;
+
+            nf = addForm();
+            //提交
+            nf.on('success.form.fv', function (e) {
+                e.preventDefault();
+
+                disabled_submit_btn(nf);
+                var data = nf.serializeJSON();
+                submitFun(data, function (rs) {
+                    //前端数据更新
+                    gb_schedule_table.insertSchedule(rs.t, rs.ts);
+                    $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: rs.t});
+                    try {
+                        if(rs.t.bcType=='in' || rs.t.bcType=='out')
+                            gb_data_basic.reload_stat_park_data();
+                    }catch (e){
+                        console.log(e);}
+                    UIkit.modal('#schedule-addsch-modal').hide();
+                    //更新路牌公里统计面板
+                    gb_schedule_table.showLpMileageTipBySch(rs.t);
+                }, function () {
+                    enable_submit_btn(nf);
+                });
+            });
+            $f('zdzCode',nf).trigger('change');
+        });
+
+        function addForm() {
+            var htmlStr = template('add_park_to_park_sch-form-temp', sch);
+            var f = $(htmlStr);
+            $(wrap).append(f);
+            //字典转换
+            dictionaryUtils.transformDom($('.nt-dictionary', f));
+            //validation
+            f.formValidation({framework: 'uikit', locale: 'zh_CN'});
+            //autocomp
+            initAutoComp(f);
+
+            //起终点都是停车场
+            var park_opts;
+            for(var i=0,p;p=parks[i++];)
+                park_opts += '<option value="' + p.code + '">' + p.name + '</option>';
+            $f('qdzCode', f).html(park_opts);
+            $f('zdzCode', f).html(park_opts);
+
+            if(sch.bcType=='in'){
+                $f('qdzCode', f).val(sch.zdzCode);
+                //选中的也是场到场班次
+                if(gb_data_basic.getCarparkByCode(sch.qdzCode) != null){
+                    //默认做返程
+                    $f('zdzCode', f).val(sch.qdzCode);
+                    $f('remarks', f).val(sch.remarks);
+                    $f('jhlc', f).val(sch.jhlc);
+                    //时间
+                    var zdsj = moment(sch.zdsj, 'HH:mm').add('minutes', sch.bcsj).format('HH:mm');
+                    $f('zdsj', f).val(zdsj);
+                }
+            }
+            return f;
+        }
+
+        function $f(name, f) {
+            return $('[name=' + name + ']', f);
+        }
+
+        function initAutoComp(f) {
+            //车辆
+            if(carsArray)
+                gb_common.carAutocomplete($('.car-autocom', f), carsArray);
+            //驾驶员
+            gb_common.personAutocomplete($('.jsy-autocom', f));
+            //售票员
+            gb_common.personAutocomplete($('.spy-autocom', f));
+            //备注补全
+            gb_common.remarksAutocomplete($('.remarks-autocom', f));
+        }
+
+    })();
+</script>
 \ No newline at end of file
+<!-- 线路上往返临加班次 -->
+<script id="add_toAndFro_sch-form-temp" type="text/html">
+    <form class="uk-form uk-form-horizontal add-sch-form one_form">
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">班次类型</label>
+                    <div class="uk-form-controls">
+                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                                data-group=ScheduleType></select>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">上下行</label>
+                    <div class="uk-form-controls">
+                        <select name="xlDir">
+                            <option value="0">上行</option>
+                            <option value="1">下行</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">起点站</label>
+                    <div class="uk-form-controls">
+                        <select name="qdzCode" >
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">终点站</label>
+                    <div class="uk-form-controls">
+                        <select name="zdzCode" >
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">开始时间</label>
+                    <div class="uk-form-controls">
+                        <input type="time" value="{{zdsj}}" name="fcsj" required>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">结束时间</label>
+                    <div class="uk-form-controls">
+                        <input type="time" name="zdsj" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">车辆</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form car-autocom">
+                            <input type="text" value="{{clZbh}}" name="clZbh" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">里程</label>
+                    <div class="uk-form-controls">
+                        <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
+                               required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">驾驶员</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form jsy-autocom">
+                            <input type="text" value="{{jGh}}/{{jName}}" name="jsy" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">售票员</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form spy-autocom">
+                            <input type="text" name="spy" value="{{sGh}}/{{sName}}">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">路牌</label>
+                    <div class="uk-form-controls">
+                        <input type="text" value="{{lpName}}" name="lpName" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">备注</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form remarks-autocom">
+                            <input type="text" name="remarks">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+    <hr style="margin-top: 35px;">
+    <form class="uk-form uk-form-horizontal add-sch-form two_form">
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">班次类型</label>
+                    <div class="uk-form-controls">
+                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                                data-group=ScheduleType></select>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">上下行</label>
+                    <div class="uk-form-controls">
+                        <select name="xlDir">
+                            <option value="0">上行</option>
+                            <option value="1">下行</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">起点站</label>
+                    <div class="uk-form-controls">
+                        <select name="qdzCode" >
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">终点站</label>
+                    <div class="uk-form-controls">
+                        <select name="zdzCode" >
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">开始时间</label>
+                    <div class="uk-form-controls">
+                        <input type="time" value="{{zdsj}}" name="fcsj" required>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">结束时间</label>
+                    <div class="uk-form-controls">
+                        <input type="time" name="zdsj" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">车辆</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form car-autocom">
+                            <input type="text" value="{{clZbh}}" name="clZbh" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">里程</label>
+                    <div class="uk-form-controls">
+                        <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
+                               required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">驾驶员</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form jsy-autocom">
+                            <input type="text" value="{{jGh}}/{{jName}}" name="jsy" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">售票员</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form spy-autocom">
+                            <input type="text" name="spy" value="{{sGh}}/{{sName}}">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">路牌</label>
+                    <div class="uk-form-controls">
+                        <input type="text" value="{{lpName}}" name="lpName" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">备注</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form remarks-autocom">
+                            <input type="text" name="remarks">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+
+    <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+        <button type="button" class="uk-button uk-modal-close">取消</button>
+        <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+    </div>
+</script>
+
+<script>
+    (function () {
+        var wrap = '#schedule-addsch-modal .toAndFroCont', sch, f1, f2, submitFun, stationRoutes;
+
+        $(wrap).on('init', function (e, data) {
+            e.stopPropagation();
+            sch = data.sch;
+            submitFun = data.submitFun;
+            stationRoutes = data.stationRoutes;
+
+            var htmlStr = template('add_toAndFro_sch-form-temp', sch);
+            $(wrap).append(htmlStr);
+            //字典转换
+            dictionaryUtils.transformDom($('.nt-dictionary', wrap));
+            //validation
+            $('.add-sch-form', wrap).formValidation({framework: 'uikit', locale: 'zh_CN'}).trigger('init-autoCom');
+            $('.add-sch-form [name=bcType]', wrap).trigger('change');
+
+            f1 = $('.add-sch-form.one_form', wrap);
+            f2 = $('.add-sch-form.two_form', wrap);
+
+            //默认1备注同步到2
+            $f('remarks', f1).on('input', function () {
+                $f('remarks', f2).val($(this).val());
+            });
+            //默认1备注同步到2
+            $('.remarks-autocom', f1).on('selectitem.uk.autocomplete', function (e, data, acobject) {
+                $f('remarks', f2).val(data.value);
+            });
+
+            //人车级联
+            $f('clZbh',f1).on('input change', function () {
+                $f('clZbh', f2).val($(this).val());
+            });
+            $f('jsy',f1).on('input change', function () {
+                $f('jsy', f2).val($(this).val());
+            });
+            $f('spy',f1).on('input change', function () {
+                $f('spy', f2).val($(this).val());
+            });
+            $f('lpName',f1).on('input change', function () {
+                $f('lpName', f2).val($(this).val());
+            });
+            //表单同步
+            $(f1).on('ct_callback', synchroFormData).trigger('ct_callback');
+            //修改1结束时间
+            $f('zdsj',f1).on('input', synchroFormData);
+
+            //表单校验提交相关
+            var dataArray;
+            var fs = $('.add-sch-form', wrap);
+            fs.on('success.form.fv', function (e) {
+                e.preventDefault();
+                dataArray.push($(this).serializeJSON());
+                $(this).data('valid', true);
+                if (allValidSuccess()) {
+                    //开始post
+                    var i = 0;
+                    var inArr = [];
+                    var upArr = [];
+                    (function () {
+                        var f = arguments.callee;
+                        if (i >= dataArray.length) {
+                            //前端数据更新
+                            var last = inArr.pop();
+                            gb_schedule_table.insertSchedule(last, upArr);
+                            $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: last});
+
+                            try {
+                                if(last.bcType=='in' || last.bcType=='out')
+                                    gb_data_basic.reload_stat_park_data();
+                            }catch (e){
+                                console.log(e);}
+                            UIkit.modal('#schedule-addsch-modal').hide();
+                            //更新路牌公里统计面板
+                            gb_schedule_table.showLpMileageTipBySch(last);
+                            return;
+                        }
+                        submitFun(dataArray[i], function (rs) {
+                            inArr.push(rs.t);
+                            upArr = upArr.concat(rs.ts);
+                            upArr.push(rs.t);
+                            i++;
+                            f();
+                        }, function () {
+                            $('[type=submit]', wrap).removeClass('disabled').removeAttr('disabled');
+                        });
+                    })();
+                }
+            });
+            //提交
+            $('[type=submit]', wrap).on('click', function () {
+                $(this).addClass('disabled').attr('disabled', 'disabled');
+                dataArray = [];
+                fs.data('valid', false);
+                fs.formValidation('validate');
+            });
+        });
+
+        function $f(name, f) {
+            return $('[name=' + name + ']', f);
+        }
+
+        function allValidSuccess() {
+            var flag = true;
+            $('form.add-sch-form:visible', wrap).each(function (i, f) {
+                if (!$(f).data('valid')) {
+                    flag = false;
+                    return false;
+                }
+            });
+            return flag;
+        }
+
+        /**
+         * 同步2个表单的数据
+         */
+        var bcTypes = {'normal': 'normal', 'region': 'region', 'out': 'in', 'in': 'out'};
+        var synchroFormData = function () {
+            //同步班次类型
+            var type = $f('bcType', f1).val();
+            if (bcTypes[type])
+                $f('bcType', f2).val(bcTypes[type]).trigger('change');
+            var updown = $f('xlDir', f1).val();
+
+            //1 结束时间 = 2 开始时间
+            $f('fcsj', f2).val($f('zdsj', f1).val());
+            if (type != 'out' && type != 'in') {
+                //走向
+                $f('xlDir', f2).val(updown == 0 ? 1 : 0).trigger('change');
+
+                //第一个表单终点 = 第二个起点
+                var oneZdName = $('[name=zdzCode] option:selected', f1).text();
+                $f('qdzCode', f2).val(searchParallelStation(oneZdName, updown == 0 ? 1 : 0));
+                //第一个表单起点 = 第二个终点
+                var oneQdName = $('[name=qdzCode] option:selected', f1).text();
+                $f('zdzCode', f2).val(searchParallelStation(oneQdName, updown == 0 ? 1 : 0)).trigger('change');
+            }
+            else {
+                //进出场走向相同
+                $f('xlDir', f2).val(updown).trigger('change');
+                //第一个表单终点 = 第二个起点
+                $f('qdzCode', f2).val($f('zdzCode', f1).val());
+                //第一个表单起点 = 第二个终点
+                $f('zdzCode', f2).val($f('qdzCode', f1).val()).trigger('change');
+            }
+
+        };
+
+
+        //返回另一个走向对应的站点
+        function searchParallelStation(stationName, updown) {
+            var routes = stationRoutes[updown]
+                    , len = routes.length;
+
+            for (var i = 0; i < len; i++) {
+                if (routes[i].stationName == stationName)
+                    return routes[i].stationCode;
+            }
+        }
+    })();
+</script>
 \ No newline at end of file
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal">
+    <div class="uk-modal-dialog" style="width: 800px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>新增临加班次</h2></div>
+
+        <div class="uk-grid">
+            <div class="uk-width-1-4">
+                <ul data-uk-switcher="{connect:'#tempScheduleContent'}" class="uk-nav uk-nav-side left_tabs_lg">
+                    <li data-handle="normal"><a>1、临加班次</a></li>
+                    <li data-handle="toAndFro"><a>2、往返</a></li>
+                    <li data-handle="parkToPark"><a>3、场到场</a></li>
+                </ul>
+            </div>
+            <div class="uk-width-3-4">
+                <ul id="tempScheduleContent" class="uk-switcher">
+                    <li class="normalCont"></li>
+                    <li class="toAndFroCont"></li>
+                    <li class="parkToParkCont"></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        (function () {
+            var modal = '#schedule-addsch-modal',
+                    sch, stationRoutes, parks, information, carsArray, st_park_data;
+
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+                sch = data.sch;
+                //站到场数据
+                st_park_data = gb_data_basic.get_stat_park_data()[sch.xlBm];
+                //站点路由
+                stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(sch.xlBm).sort(function (a, b) {
+                    return a.stationRouteCode - b.stationRouteCode;
+                }), 'directions');
+                //停车场
+                parks = gb_data_basic.simpleParksArray();
+                //线路标准
+                information = gb_data_basic.getLineInformation(sch.xlBm);
+                //停车场排序，常用的放前面
+                parks = sort_parks(parks, information, st_park_data);
+                //车辆信息
+                carsArray = gb_data_basic.carsArray();
+
+                var st_doms = gb_schedule_context_menu.get_add_sch_doms_v2();
+                //normal
+                $('.normalCont', modal).html(st_doms.normal_dom)
+                        .trigger('init', {sch: sch, submitFun: submit_temp_schedule_form});
+
+                //to and fro
+                $('.toAndFroCont', modal).html(st_doms.two_way_dom)
+                        .trigger('init', {sch: sch, submitFun: submit_temp_schedule_form, stationRoutes: stationRoutes});
+
+                //park to park
+                $('.parkToParkCont', modal).html(st_doms.park_to_park_dom)
+                        .trigger('init', {sch: sch, submitFun: submit_temp_schedule_form, parks: parks, carsArray: carsArray});
+            });
+
+            //init-autoCom
+            $(modal).on('init-autoCom', '.add-sch-form', function () {
+                //车辆
+                if(carsArray)
+                    gb_common.carAutocomplete($('.car-autocom', this), carsArray);
+                //驾驶员
+                gb_common.personAutocomplete($('.jsy-autocom', this));
+                //售票员
+                gb_common.personAutocomplete($('.spy-autocom', this));
+                //备注补全
+                gb_common.remarksAutocomplete($('.remarks-autocom', this));
+            });
+
+            //班次类型 和 上下行 切换事件
+            $(modal).on('change', '.add-sch-form [name=bcType],.add-sch-form [name=xlDir]', reCalcInputs_type);
+            //起终点站改变事件
+            $(modal).on('change', '[name=qdzCode],[name=zdzCode]', reCalcInputs_station);
+            //开始时间和公里改变
+            $(modal).on('input', '.add-sch-form [name=fcsj],.add-sch-form [name=jhlc]', reCalcEndTime);
+
+
+            function reCalcInputs_type() {
+                var f = $(this).parents('.add-sch-form');
+                var bcType_e = $('[name=bcType]', f)
+                        , xlDir_e = $('[name=xlDir]', f);
+
+                var routes = stationRoutes[xlDir_e.val()]
+                        , lastCode = routes[routes.length - 1].stationCode
+                        , opts = '', park_opts = '';
+                //station options
+                $.each(routes, function () {
+                    opts += '<option value="' + this.stationCode + '">' + this.stationName + '</option>'
+                });
+                //park options
+                for(var i=0,p;p=parks[i++];)
+                    park_opts += '<option value="' + p.code + '">' + p.name + '</option>';
+
+                var qdz = $('[name=qdzCode]', f), zdz = $('[name=zdzCode]', f);
+                //var time, mileage;
+                switch (bcType_e.val()) {
+                    case 'out':
+                        qdz.html(park_opts).val(information.carPark);
+                        zdz.html(opts);
+                        break;
+                    case 'in':
+                        qdz.html(opts);
+                        zdz.html(park_opts).val(information.carPark);
+                        break;
+                    default:
+                        qdz.html(opts);
+                        zdz.html(opts).val(lastCode);
+                }
+
+                zdz.trigger('change');
+                f.trigger('ct_callback');
+            }
+
+            function reCalcInputs_station() {
+                var f = $(this).parents('form'),
+                        bcType = $('[name=bcType]', f).val(),
+                        qdzCode = $('[name=qdzCode]', f).val(),
+                        zdzCode =$('[name=zdzCode]', f).val(),
+                        startDate = $('[name=fcsj]', f).val(),
+                        upDown = $('[name=xlDir]', f).val(), mileage, time;
+
+                //从站到场里获取数据
+                var stp = search_st_park(f);
+                if(stp){
+                    mileage=bcType=='in'?stp['mileage1']:stp['mileage2'];
+                    time=bcType=='in'?stp['time1']:stp['time2'];
+                }
+                else{
+                    switch (upDown + '_' + bcType) {
+                        case '0_out'://上行出场
+                            mileage = information.upOutMileage;
+                            time = information.upOutTimer;
+                            break;
+                        case '1_out'://下行出场
+                            mileage = information.downOutMileage;
+                            time = information.downOutTimer;
+                            break;
+                        case '0_in'://上行进场
+                            mileage = information.upInMileage;
+                            time = information.upInTimer;
+                            break;
+                        case '1_in'://下行进场
+                            mileage = information.downInMileage;
+                            time = information.downInTimer;
+                            break;
+                        default:
+
+                            var qc_time=upDown==0?information.upTravelTime:information.downTravelTime,
+                                    qc_mileage=upDown==0?information.upMileage:information.downMileage, _type;
+                            if(is_normal_sch(f)){
+                                _type='normal';
+                                mileage=qc_mileage;
+                            }
+                            else{
+                                _type='region';
+                                mileage = calcMileage(stationRoutes[upDown], qdzCode, zdzCode);
+                            }
+
+                            time = gb_common.mul(gb_common.accDiv(qc_time, qc_mileage), mileage);
+                            if(bcType!='ldks' && bcType!='major' && bcType!='venting')
+                                $('[name=bcType]', f).val(_type);
+                    }
+                }
+
+                $('[name=jhlc]', f).val(mileage);
+                var et = moment(startDate, 'HH:mm').add(time, 'minutes');
+                $f('zdsj', f).val(et.format('HH:mm'));
+                f.trigger('ct_callback');
+            }
+
+
+            function reCalcEndTime() {
+                var f = $(this).parents('.add-sch-form')
+                        , startDate = $f('fcsj', f).val()//开始时间
+                        , mileage = $f('jhlc', f).val()//公里
+                        , type2 = $f('bcType', f).val(),//班次类型
+                        upDown = $('[name=xlDir]', f).val();
+                if (!startDate || !mileage)
+                    return;
+
+                var time;
+                //从站到场里获取数据
+                var stp = search_st_park(f);
+                if(stp){
+                    time=type2=='in'?stp['time1']:stp['time2'];
+                }
+                else{
+                    if (type2 == 'in')
+                        time = upDown == 0 ? information.upInTimer : information.downInTimer;
+                    else if (type2 == 'out')
+                        time = upDown == 0 ? information.upOutTimer : information.downOutTimer;
+                    else{
+                        var qc_time=upDown==0?information.upTravelTime:information.downTravelTime,
+                                qc_mileage=upDown==0?information.upMileage:information.downMileage;
+
+                        time = gb_common.mul(gb_common.accDiv(qc_time, qc_mileage), mileage);
+                    }
+                }
+
+                var et = moment(startDate, 'HH:mm').add(time, 'minutes');
+                $f('zdsj', f).val(et.format('HH:mm'));
+                f.trigger('ct_callback');
+            }
+
+            function is_normal_sch(f) {
+                var qdzCode = $('[name=qdzCode]', f).val(),
+                        zdzCode =$('[name=zdzCode]', f).val(),
+                        upDown = $('[name=xlDir]', f).val(),
+                        rts = stationRoutes[upDown];
+
+                if(rts[0].stationCode == qdzCode
+                        && rts[rts.length - 1].stationCode == zdzCode)
+                    return true;
+                else
+                    return false;
+            }
+
+            function isInOut(bcType) {
+                return bcType=='in' || bcType=='out';
+            }
+
+            /**
+             *  计算线路上站点间公里
+             */
+            function calcMileage(rts, s, e) {
+                var mileage = 0, flag, code;
+                $.each(rts, function () {
+                    code = this['stationCode'];
+                    if (flag)
+                        mileage = gb_common.accAdd(mileage, this.distances);
+                    if (code == s)
+                        flag = true;
+                    if (code == e)
+                        return false;
+                });
+                return mileage;
+            }
+
+            function search_st_park(f) {
+                if(!st_park_data)
+                    return;
+                var stp;
+                var qdSelect=$f('qdzCode', f)[0],zdSelect=$f('zdzCode', f)[0];
+
+                if(qdSelect.options.selectedIndex < 0)
+                    return;
+                var qdzName=qdSelect.options[qdSelect.options.selectedIndex].text,
+                        zdzName=zdSelect.options[zdSelect.options.selectedIndex].text,
+                        type2 = $f('bcType', f).val();
+
+                if(!isInOut(type2))
+                    return;
+
+                $.each(st_park_data, function () {
+                    if((type2=='in' && this.stationName==qdzName && this.parkName==zdzName)
+                            || (type2=='out' && this.stationName==zdzName && this.parkName==qdzName)){
+                        stp = this;
+                        return false;
+                    }
+                });
+
+                return stp;
+            }
+
+            /**
+             * 停车场排序
+             * @param parks 停车场 code 2 name
+             * @param information 线路标准
+             * @param st_park_data 站到场
+             */
+            function sort_parks(parks, information, st_park_data) {
+                var array = [], names=[];
+                for(var code in parks){
+                    array.push({code: code, name: parks[code]});
+                }
+
+                if(st_park_data && st_park_data.length > 0){
+                    $.each(st_park_data, function () {
+                        names.push(this.parkName);
+                    });
+                }
+
+                //debugger
+                array.sort(function (a, b) {
+                    if(a.code==information.carPark)
+                        return -1;
+                    if(b.code==information.carPark)
+                        return 1;
+
+                    var ai = names.indexOf(a.name),
+                            bi = names.indexOf(b.name);
+
+                    if(ai!=-1 && bi==-1)
+                        return -1;
+                    else if(ai==-1 && bi!=-1)
+                        return 1;
+                    else
+                        return $.trim(a.name).localeCompare($.trim(b.name), 'zh-CN');
+                });
+                return array;
+            }
+
+            function $f(name, f) {
+                return $('[name=' + name + ']', f);
+            }
+
+            /**
+             * 提交表单
+             */
+            function submit_temp_schedule_form(data, cb, err) {
+                data.xlBm = sch.xlBm;
+                data.xlName = sch.xlName;
+                //拆分驾驶员工号和姓名
+                data.jGh = data.jsy.split('/')[0];
+                data.jName = data.jsy.split('/')[1];
+                delete data.jsy;
+                //拆分售票员工号和姓名
+                if (data.spy != '') {
+                    data.sGh = data.spy.split('/')[0];
+                    data.sName = data.spy.split('/')[1];
+                    delete data.spy;
+                }
+
+                //公司信息
+                var line = gb_data_basic.findLineByCodes([data.xlBm]);
+                if(line && line.length > 0){
+                    line = line[0];
+                    data.xlName = line.name;
+                    data.gsBm = line.company;
+                    data.fgsBm = line.brancheCompany;
+                }
+
+                gb_common.$post('/realSchedule', data, function (rs) {
+                    notify_succ('新增临加班次成功');
+                    cb && cb(rs);
+                }, err);
+            }
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -23,7 +23,7 @@ var gb_schedule_context_menu = (function () {
         st_doms.range_2_normal_dom=dom;
     });
     //提前缓存临加的片段页面
-    var add_sch_doms={};
+    var add_sch_doms={}, add_sch_doms_v2 = {};
     $.get(folder + '/temp_sch/add_normal.html', function (dom) {
         add_sch_doms.normal_dom=dom;
     });
@@ -33,6 +33,15 @@ var gb_schedule_context_menu = (function () {
     $.get(folder + '/temp_sch/add_park_to_park.html', function (dom) {
         add_sch_doms.park_to_park_dom=dom;
     });
+    $.get(folder + '/temp_sch_v2/add_normal.html', function (dom) {
+        add_sch_doms_v2.normal_dom=dom;
+    });
+    $.get(folder + '/temp_sch_v2/add_two_way.html', function (dom) {
+        add_sch_doms_v2.two_way_dom=dom;
+    });
+    $.get(folder + '/temp_sch_v2/add_park_to_park.html', function (dom) {
+        add_sch_doms_v2.park_to_park_dom=dom;
+    });
     var callbackHandler = {
@@ -42,6 +51,9 @@ var gb_schedule_context_menu = (function () {
         get_add_sch_doms: function () {
             return add_sch_doms;
         },
+        get_add_sch_doms_v2: function () {
+            return add_sch_doms_v2;
+        },
         dftz: function (sch) {
             if(sch.status > 0){
                 notify_err((sch.status==1?'已发出':'已执行') + '的班次不能修改待发');
@@ -277,6 +289,11 @@ var gb_schedule_context_menu = (function () {
                 sch: sch
             }, modal_opts);
         },
+        add_temp_sch_v2: function (sch) {
+            open_modal(folder + '/temp_sch_v2/main.html', {
+                sch: sch
+            }, modal_opts);
+        },
         add_sub_task: function (sch) {
             if ($('#add-sub-task-main-modal').length>0) {
                 layer.msg('已存在正在添加的子任务.');
@@ -359,6 +376,20 @@ var gb_schedule_context_menu = (function () {
         }
     });
+    $.contextMenu({
+        selector: '.line_schedule .schedule-wrap .card-panel',
+        className: 'schedule-ct-menu',
+        callback: function (key, options) {
+            var $tbody = options.$trigger.parent(), lineCode = $tbody.parents('li.line_schedule').data('id');
+
+            callbackHandler[key] && callbackHandler[key]({ xlBm : lineCode });
+        },
+        items: {
+            'add_temp_sch_v2': {
+                name: '新增临加班次'
+            }
+        }
+    });
     $.contextMenu({
         selector: '.line_schedule .ct_table_body dl.drag-active',
@@ -109,7 +109,7 @@ var gb_schedule_table = (function () {
         });
     };
-    
+
     var renderCarRemark = function () {
         try{
             var $activeTab = $('.north-tabs>ul>li.tab-line.uk-active');//.data('code');
@@ -190,7 +190,7 @@ var gb_schedule_table = (function () {
             sch.status=4;
         }
     }
-    
+
     function arrayIsNull(array) {
@@ -205,6 +205,9 @@ var gb_schedule_table = (function () {
     var insertSchedule = function (sch, upArr) {
         var xls = {};
         xls[sch.xlBm] = 1;
+        if (!line2Schedule[sch.xlBm]) {
+            line2Schedule[sch.xlBm] = {};
+        }
         line2Schedule[sch.xlBm][sch.id] = sch;
         //update
         if (isArray(upArr)) {