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

youxiw2000
2 parents abe8327d 0ad6862a
Showing 23 changed files with 2562 additions and 1781 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) {