调度日报汇总表；审计公里汇总表。

娄高锋
1 parent 5628589d
Showing 13 changed files with 2051 additions and 1042 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.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/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/mould/countMileageSum.xls
src/main/resources/static/pages/forms/mould/dispatchDailySum.xls
src/main/resources/static/pages/forms/statement/dispatchDailySum.html
src/main/resources/static/pages/report/countMileage/countLine/countMileageSum.html
-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 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, 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){
@@ -889,6 +889,16 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		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();
@@ -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 nature, String type);
+	
 	List<Map<String,Object>> statisticsDailyTj(String gsdm,String fgsdm,String line, String date,String date2, String xlName, String type,String nature);
 	//用于实时数据与统计数据合并查询
@@ -2952,6 +2952,189 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         return map;
     }
+    
+    @Override
+    public List<Map<String, Object>> dispatchDailySum(String date, String nature, String type) {
+    	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+    	
+    	List<Map<String, Object>> list = statisticsDailyTj("", "", "", date, date, "", "query", nature);
+    	
+    	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){
+    		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("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,
@@ -3182,6 +3365,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		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();
@@ -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);
@@ -1193,6 +1193,16 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		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>();
@@ -17,6 +17,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;
@@ -38,6 +39,7 @@ 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;
@@ -72,6 +74,8 @@ public class ReportServiceImpl implements ReportService{
 	@Autowired
 	CulateMileageService culateService;
 	@Autowired
+	LineService lineService;
+	@Autowired
 	LineRepository lineRepository;
 	@Autowired
 	StationRouteRepository stationRouteRepository;
@@ -2509,6 +2513,197 @@ 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="";
+		if(map.get("date")!=null){
+			date=map.get("date").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", date);
+		param.put("nature", nature);
+		param.put("type", "query");
+		List<Map<String, Object>> list = countByList(param);
+    	
+    	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){
+    		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 +2733,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 +2744,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 +2754,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 +2785,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 +2977,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());
@@ -1973,6 +1973,16 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		} 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);
+				}
+			}
+			for(Map<String, Object> m : removeList){
+				resList.remove(m);
+			}
 			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>();
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+	   
+	   #forms > thead > tr> td >span{
+	    width: 5px; 
+		word-wrap: break-word; 
+		letter-spacing: 20px; 
+	  }
+	  
+	  #forms   > thead > tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>调度日报汇总表</h1>
+	</div>
+</div>
+
+<!-- <div class="row"> -->
+	<div  class="col-md-12 portlet light porttlet-fit bordered" style="height:calc(100% - 56px)">
+<!-- 		<div> -->
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+                    <div style="display: inline-block;">
+						<span class="item-label" style="width: 80px;">线路性质: </span>
+						 <select
+							class="form-control" name="nature" id="nature"
+							style="width: 180px;">
+							<option value="0">全部线路</option>
+							<option value="1" selected="selected">营运线路</option>
+							<option value="2">非营运线路</option>
+						</select>
+					</div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">营运日期: </span>
+                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="查询"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+				</form>
+			</div>
+			<div class="portlet-body" id="tjrbBody" style="overflow:auto;height: calc(100% - 80px)">
+				<div class="table-container"   style="margin-top: 10px;min-width: 906px">
+					<label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th colspan="45"><label id="tjrq"></label> 调度日报汇总表</th>
+							</tr>
+							<tr>
+								<td rowspan="3"><span >公司</span></td>
+								<td rowspan="3"><span >分公司</span></td>
+								<td colspan="21">全日营运里程（公里）</td>
+								<td colspan="15">全日营运班次</td>
+								<td colspan="9">大间隔情况</td>
+							</tr>
+							<tr>
+								<td rowspan="2"><label>计划总<br/>公里</label></td>
+								<td rowspan="2"><label>计划营</label><label>运公里</label></td>
+								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
+								<td rowspan="2"><label>实际</label><label>总公里</label></td>
+								<td rowspan="2"><label>实际营</label><label>运公里</label></td>
+								<td rowspan="2"><label>实际空</label><label>驶公里</label></td>
+								<td rowspan="2"><span>少驶班次</span></td>
+								<td rowspan="2"><span>少驶公里</span></td>
+								<td colspan="11">少驶原因（公里）</td>
+								<td colspan="2">临加公里</td>
+								<td colspan="3">计划班次</td>
+								<td colspan="3">实际班次</td>
+								<td colspan="3">临加班次</td>
+								<td colspan="3">放站班次</td>
+								<td colspan="3">调头班次</td>
+								<td colspan="3">发生次数</td>
+								<td rowspan="2">最大间隔时间（分）</td>
+								<td rowspan="2">原因</td>
+							</tr>
+							<tr>
+								<td><span>路阻</span></td>
+								<td><span>吊慢</span></td>
+								<td><span>故障</span></td>
+								<td><span>纠纷</span></td>
+								<td><span>肇事</span></td>
+								<td><span>缺人</span></td>
+								<td><span>缺车</span></td>
+								<td><span>客稀</span></td>
+								<td><span>气候</span></td>
+								<td><span>援外</span></td>
+								<td><span>其他</span></td>
+								<td><span>营运</span></td>
+								<td><span>空驶</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+							</tr>
+						</thead>
+						<tbody class="dispatch_daily_sum">
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+
+<script>
+	$(function(){
+// 		$('#export').attr('disabled', "true");
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		
+		var dateTime=year + "-" + month + "-" + day;
+		$("#date").val(dateTime);
+// 		$("#date2").val(dateTime);
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		
+		var date = "";
+		var nature="";
+		var time1="";
+		var time2="";
+		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}
+			date = $("#date").val();
+			nature=$("#nature").val();
+// 			time1 = Date.parse(new Date(date));
+// 			time2 = Date.parse(new Date(date2));
+// 			if(date==null || date =="" ||date2==null || date2 ==""){
+// 				 layer.msg('请选择时间段.');
+// 			}else if(time2<time1){
+// 				layer.msg('结束日期不能小于开始日期.');
+// 			}else{
+// 				if((time2-time1)>2678400000){
+// 					layer.msg('查询超过一个月请点击【统计查询】.');
+// 				}else{
+					$("#tjrq").html(date);
+					$("#rqxs").html(date);
+					 var params = {};
+					 params['date'] = date;
+					 params['nature'] = nature;
+					 params['type'] = "query";
+					var i = layer.load(2);
+					$get('/realSchedule/dispatchDailySum',params,function(result){
+						// 把数据填充到模版中
+						var tbodyHtml = template('dispatch_daily_sum',{list:result});
+						// 把渲染好的模版html文本追加到表格中
+						$('#forms .dispatch_daily_sum').html(tbodyHtml);
+						layer.close(i);
+						
+						if(result.length == 0){
+							$("#export").attr('disabled',"true");
+						}else{
+							$("#export").removeAttr("disabled");
+						}
+					});
+// 				}
+// 			}
+		});
+		
+// 		$("#tjrbBody").height($(window).height()-100);
+		$("#export").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
+			date = $("#date").val();
+			nature=$("#nature").val();
+			var params = {};
+			params['date'] = date;
+			params['nature'] = nature;
+			params['type'] = "export";
+// 			if((time2-time1)>2678400000){
+// 					layer.msg('查询超过一个月请点击【统计查询】.');
+// 			}else{
+				var i = layer.load(2);
+				$get('/realSchedule/dispatchDailySum',params,function(result){
+					var dateTime = "";
+// 					if(date == date2){
+						dateTime = moment(date).format("YYYYMMDD");
+// 					} else {
+// 						dateTime = moment(date).format("YYYYMMDD")
+// 								+"-"+moment(date2).format("YYYYMMDD");
+// 					}
+					window.open("/downloadFile/download?fileName="
+							+dateTime+"-调度日报汇总表");
+					layer.close(i);
+				});
+// 			}
+		});
+		
+
+	});
+</script>
+<script type="text/html" id="dispatch_daily_sum">
+	{{each list as obj i}}
+		<tr {{if obj.zt==1}}style='color: red'{{/if}}>
+			<td>{{obj.gsName}}</td>
+			<td>{{obj.fgsName}}</td>
+			<td>{{obj.jhzlc}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.jcclc}}</td>
+			<td>{{obj.sjzgl}}</td>
+			<td>{{obj.sjgl}}</td>
+			<td>{{obj.sjksgl}}</td>
+			<td>{{obj.ssbc}}</td>
+			<td>{{obj.ssgl}}</td>
+			<td>{{obj.ssgl_lz}}</td>
+			<td>{{obj.ssgl_dm}}</td>
+			<td>{{obj.ssgl_gz}}</td>
+			<td>{{obj.ssgl_jf}}</td>
+			<td>{{obj.ssgl_zs}}</td>
+			<td>{{obj.ssgl_qr}}</td>
+			<td>{{obj.ssgl_qc}}</td>
+			<td>{{obj.ssgl_kx}}</td>
+			<td>{{obj.ssgl_qh}}</td>
+			<td>{{obj.ssgl_yw}}</td>
+			<td>{{obj.ssgl_other}}</td>
+			<td>{{obj.ljgl}}</td>
+			<td>{{obj.ljks}}</td>
+			<td>{{obj.jhbc}}</td>
+			<td>{{obj.jhbc_m}}</td>
+			<td>{{obj.jhbc_a}}</td>
+			<td>{{obj.sjbc}}</td>
+			<td>{{obj.sjbc_m}}</td>
+			<td>{{obj.sjbc_a}}</td>
+			<td>{{obj.ljbc}}</td>
+			<td>{{obj.ljbc_m}}</td>
+			<td>{{obj.ljbc_a}}</td>
+			<td>{{obj.fzbc}}</td>
+			<td>{{obj.fzbc_m}}</td>
+			<td>{{obj.fzbc_a}}</td>
+			<td>{{obj.dtbc}}</td>
+			<td>{{obj.dtbc_m}}</td>
+			<td>{{obj.dtbc_a}}</td>
+			<td>{{obj.djg}}</td>
+			<td>{{obj.djg_m}}</td>
+			<td>{{obj.djg_a}}</td>
+			<td>{{obj.djg_time}}</td>
+			<td>&nbsp;</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 \ No newline at end of file
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+	   
+	   #forms > thead > tr> td >span{
+	    width: 5px; 
+		word-wrap: break-word; 
+		letter-spacing: 20px; 
+	  }
+	  
+	  #forms   > thead > tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>审计公里汇总表</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+					<div style="display: inline-block;">
+						<span class="item-label" style="width: 80px;">线路性质: </span>
+						 <select
+							class="form-control" name="nature" id="nature"
+							style="width: 180px;">
+							<option value="0">全部线路</option>
+							<option value="1" selected="selected">营运线路</option>
+							<option value="2">非营运线路</option>
+						</select>
+					</div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">营运日期: </span>
+                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="查询"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+				</form>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container"  id="countLine" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th colspan="30"><label id="datetodate"></label> 审计公里汇总表</th>
+							</tr>
+							<tr>
+								<td rowspan="2"><span>公司</span></td>
+								<td rowspan="2"><span>分公司</span></td>
+								<td rowspan="2"><label>计划</label><label>总公里</label></td>
+								<td rowspan="2"><label>计划营</label><label>运公里</label></td>
+								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
+								<td rowspan="2"><label>实际</label><label>总公里</label></td>
+								<td colspan="2"><label>实际营</label><label>运公里</label></td>
+								<td colspan="6"><label>实际空</label><label>驶公里</label></td>
+								<td rowspan="2"><label>少驶营</label><label>运里程</label></td>
+								<td colspan="11">少驶原因(公里)</td>
+								<td colspan="3">临加公里</td>
+							</tr>
+							<tr>
+								<td><label>计划内</label><label>营运</label><label>里程</label></td>
+								<td><label>临时性</label><label>多样化</label><label>调度营</label><label>运里程</label></td>
+								<td><label>计划内</label><label>进出场</label><label>空驶</label></td>
+								<td><label>计划外</label><label>进出场</label><label>空驶</label></td>
+								<td><label>故障</label><label>进出场</label><label>空驶</label></td>
+								<td><label>肇事</label><label>进出场</label><label>空驶</label></td>
+								<td><label>纠纷</label><label>进出场</label><label>空驶</label></td>
+								<td><label>空放 </label><label>空驶</label></td>
+								<td><span>路阻</span></td>
+								<td><span>吊慢</span></td>
+								<td><span>故障</span></td>
+								<td><span>纠纷</span></td>
+								<td><span>肇事</span></td>
+								<td><span>缺人</span></td>
+								<td><span>缺车</span></td>
+								<td><span>客稀</span></td>
+								<td><span>气候</span></td>
+								<td><span>援外</span></td>
+								<td><span>其他</span></td>
+								<td><label>临加营</label><label>运公里</label></td>
+								<td><label>临加进出</label><label>场空驶</label></td>
+								<td><label>临加</label><label>空放</label><label>空驶</label></td>
+							</tr>
+							
+						</thead>
+						<tbody class="count_mileage_sum">
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+// 		$('#export').attr('disabled', "true");
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#date").val(year + "-" + month + "-" + day);
+		
+		var date = "";
+		var nature="";
+		$("#query").on("click",function(){
+			$("#countLine").height($(window).height()-280);
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}
+			date = $("#date").val();
+// 			if(date==null || date =="" ||date2==null || date2 ==""){
+// 				 layer.msg('请选择时间段.');
+// 			}else{
+				nature = $("#nature").val();
+				var params = {};
+				params['date'] = date;
+				params['nature'] = nature;
+				params['type'] = "query";
+				var i = layer.load(2);
+				$get('/report/countMileageSum',params,function(result){
+					layer.close(i);
+					$("#datetodate").html(date);
+					// 把数据填充到模版中
+					var tbodyHtml = template('count_mileage_sum',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms .count_mileage_sum').html(tbodyHtml);
+					
+					if(result.length == 0)
+						$("#export").attr('disabled',"true");
+					else
+						$("#export").removeAttr("disabled");
+				});
+// 			}
+			
+		});
+		
+		$("#countLine").height($(window).height()-280);
+		$("#export").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择日期！");
+				return;
+			}
+			date = $("#date").val();
+			nature = $("#nature").val();
+			var params = {};
+			params['date'] = date;
+			params['nature'] = nature;
+			params['type'] = "export";
+			params['by']='sj';
+			var i = layer.load(2);
+			$get('/report/countMileageSum',params,function(result){
+				var dateTime = "";
+// 				if(date == date2){
+					dateTime = moment(date).format("YYYYMMDD");
+// 				} else {
+// 					dateTime = moment(date).format("YYYYMMDD")
+// 							+"-"+moment(date2).format("YYYYMMDD");
+// 				}
+				window.open("/downloadFile/download?fileName="
+						+dateTime+"-审计公里汇总表");
+				layer.close(i);
+			});
+		});
+	});
+</script>
+<script type="text/html" id="count_mileage_sum">
+	{{each list as obj i}}
+		<tr>
+				<td>{{obj.gsName}}</td>
+				<td>{{obj.fgsName}}</td>
+				<td>{{obj.jhzlc}}</td>
+				<td>{{obj.jhlc}}</td>
+				<td>{{obj.jcclc}}</td>
+				<td>{{obj.sjzgl}}</td>
+				<td>{{obj.jhnlc}}</td>
+				<td>{{obj.jhwlc}}</td>
+				<td>{{obj.jhnjcclc}}</td>
+				<td>{{obj.jhwjcclc_z}}</td>
+				<td>{{obj.zrwjcclc}}</td>
+				<td>{{obj.zrwjcclc1}}</td>
+				<td>{{obj.zrwjcclc2}}</td>
+				<td>{{obj.kfks}}</td>
+				<td>{{obj.lbss}}</td>
+				<td>{{obj.ssgl_lz}}</td>
+				<td>{{obj.ssgl_dm}}</td>
+				<td>{{obj.ssgl_gz}}</td>
+				<td>{{obj.ssgl_jf}}</td>
+				<td>{{obj.ssgl_zs}}</td>
+				<td>{{obj.ssgl_qr}}</td>
+				<td>{{obj.ssgl_qc}}</td>
+				<td>{{obj.ssgl_kx}}</td>
+				<td>{{obj.ssgl_qh}}</td>
+				<td>{{obj.ssgl_yw}}</td>
+				<td>{{obj.ssgl_other}}</td>
+				<td>{{obj.ljyy}}</td>
+				<td>{{obj.ljjcc}}</td>
+                <td>{{obj.ljkfks}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="30"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 \ No newline at end of file