Merge branch 'minhang' into pudong

潘钊
2 parents af2009fe 68cd3a2c
Showing 26 changed files with 1588 additions and 51 deletions
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/controller/realcontrol/RealChartsController.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/entity/mcy_forms/Changetochange.java
src/main/java/com/bsth/entity/mcy_forms/Linepasswengerflow.java
src/main/java/com/bsth/entity/mcy_forms/Operationservice.java
src/main/java/com/bsth/entity/mcy_forms/Shifday.java
src/main/java/com/bsth/entity/mcy_forms/Shiftuehiclemanth.java
src/main/java/com/bsth/entity/mcy_forms/Singledata.java
src/main/java/com/bsth/entity/mcy_forms/Vehicleloading.java
src/main/java/com/bsth/entity/mcy_forms/Waybillday.java
src/main/java/com/bsth/entity/schedule/SchedulePlan.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/forms/FormsService.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/RealChartsService.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
+package com.bsth.controller.forms;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Linepasswengerflow;
+import com.bsth.entity.mcy_forms.Operationservice;
+import com.bsth.entity.mcy_forms.Shifday;
+import com.bsth.entity.mcy_forms.Shiftuehiclemanth;
+import com.bsth.entity.mcy_forms.Singledata;
+import com.bsth.entity.mcy_forms.Vehicleloading;
+import com.bsth.entity.mcy_forms.Waybillday;
+import com.bsth.service.forms.FormsService;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+
+@RestController
+@RequestMapping("mcy_forms")
+public class MCY_FormsController {
+	
+	@Autowired
+	FormsService formsService;
+	
+	@Autowired
+	ScheduleRealInfoService scheduleRealInfoService;
+	
+	//行车路单日报表
+	@RequestMapping(value = "/waybillday",method = RequestMethod.POST)
+	public List<Waybillday> waybillday(@RequestParam Map<String, Object> map){
+	 
+		 
+//		scheduleRealInfoService.findKMBC(jName, clZbh, lpName, date)
+		return formsService.waybillday(map);
+	}
+	
+	@RequestMapping(value = "/waybilldayExcel")
+	public List<Waybillday> dailyInfo(@RequestParam Map<String, Object> map) {
+		return formsService.waybilldayExcel(map);
+	}
+ 
+	
+	//线路客流量报表
+	@RequestMapping(value = "/linepasswengerflow",method = RequestMethod.POST)
+	public List<Linepasswengerflow> linepasswengerflow(@RequestParam Map<String, Object> map){
+		
+		return formsService.linepasswengerflow(map);
+	}
+	
+	
+	
+	//班次车辆人员月报表
+	@RequestMapping(value = "/shiftuehiclemanth",method = RequestMethod.POST)
+	public List<Shiftuehiclemanth> shiftuehiclemanth(@RequestParam Map<String, Object> map){
+		
+		return formsService.shiftuehiclemanth(map);
+	}
+	
+	
+	//班次车辆人员日统计
+	@RequestMapping(value = "/shifday",method = RequestMethod.POST)
+	public List<Shifday> shifday(@RequestParam Map<String, Object> map){
+		
+		return formsService.shifday(map);
+	}
+	
+	//换人换车情况统计表
+	@RequestMapping(value = "/changetochange",method = RequestMethod.POST)
+	public List<Changetochange> changetochange(@RequestParam Map<String, Object> map){
+			
+		return formsService.changetochange(map);
+	}
+		
+	//路单数据
+	@RequestMapping(value = "/singledata",method = RequestMethod.POST)
+	public List<Singledata> singledata(@RequestParam Map<String, Object> map){
+					
+		return formsService.singledata(map);
+	}	
+	
+	//车辆加注
+	@RequestMapping(value = "/vehicleloading",method = RequestMethod.POST)
+	public List<Vehicleloading> vehicleloading(@RequestParam String line ,@RequestParam String data){
+		return formsService.vehicleloading(line,data);
+	}
+	//运营服务阶段报表
+	@RequestMapping(value = "/operationservice",method = RequestMethod.POST)
+	public List<Operationservice> operationservice(@RequestParam Map<String, Object> map){
+						
+		return formsService.operationservice(map);
+	}
+	
+	
+}
@@ -3,6 +3,7 @@ package com.bsth.controller.realcontrol;
 import com.bsth.service.realcontrol.RealChartsService;
 import com.bsth.service.realcontrol.dto.CarOutRate;
 import com.bsth.service.realcontrol.dto.DeviceOnlineRate;
+import com.bsth.service.realcontrol.dto.ScheduleExecRate;
 import com.bsth.service.realcontrol.dto.StratEndPunctualityRate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,13 +33,18 @@ public class RealChartsController {
         return realChartsService.carOutRate(month, idx);
     }
-    @RequestMapping("stratEndPunctualityRate")
+/*    @RequestMapping("stratEndPunctualityRate")
     public List<StratEndPunctualityRate> stratEndPunctualityRate(@RequestParam String idx, @RequestParam String month){
         return realChartsService.stratEndPunctualityRate(month, idx);
-    }
+    }*/
     @RequestMapping("sePunctualityRateLine")
     public List<StratEndPunctualityRate> sePunctualityRateLine(@RequestParam String idx, @RequestParam String month){
         return realChartsService.sePunctualityRateLine(month, idx);
     }
+
+    @RequestMapping("scheduleExecRates")
+    public List<ScheduleExecRate> scheduleExecRates(@RequestParam String idx, @RequestParam String date){
+        return realChartsService.scheduleExecRates(date, idx);
+    }
 }
@@ -116,6 +116,7 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
         if (sheet.getRows() == 0 || sheet.getColumns() == 0) { // 工作区是否为空
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", String.format("%s 工作区没有数据！", sheetname));
+            return rtn;
         } else {
             if (sheet.getRows() <= 1 || sheet.getColumns() <= 1) {
                 rtn.put("status", ResponseCode.ERROR);
@@ -147,11 +148,11 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
                                 List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
                                 if (CollectionUtils.isEmpty(stationRouteList)) {
                                     rtn.put("status", ResponseCode.ERROR);
-                                    rtn.put("msg", String.format("第1行，第%d列数据在%s站点路由中不是起点站", i + 1, linename));
+                                    rtn.put("msg", String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
                                     return rtn;
                                 } else if (stationRouteList.size() > 1) {
                                     rtn.put("status", ResponseCode.ERROR);
-                                    rtn.put("msg", String.format("第1行，第%d列数据在%s站点路由中上下行都是起点站", i + 1, linename));
+                                    rtn.put("msg", String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
                                     return rtn;
                                 }
                             }
@@ -363,6 +364,7 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
         ttInfoDetailService.fileDataImport(
                 new File(filename + "_temp.xls"),
+                (String) form.get("sheetname"),
                 (String) form.get("xlname"),
                 (String) form.get("ttname"),
                 tccname
@@ -51,7 +51,7 @@ public class SchAttrCalculator {
 			if(sch.getFcsj().compareTo(conf.getStartOpt()) < 0){
-				sch.setFcsjAll(sch.getFcsjT() + DAY_TIME);
+				sch.setFcsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsj()) + DAY_TIME);
 			}
 			sch.setRealExecDate(fmtyyyyMMdd.print(sch.getFcsjT()));
+package com.bsth.entity.mcy_forms;
+
+public class Changetochange {
+
+	
+}
+package com.bsth.entity.mcy_forms;
+
+public class Linepasswengerflow {
+
+	private String stationName;//站点名字
+
+	public String getStationName() {
+		return stationName;
+	}
+
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+
+	
+	
+}
+package com.bsth.entity.mcy_forms;
+
+public class Operationservice {
+	
+	private String xlName;//线路
+	
+	private String jzl;//加注量
+	
+	private String xhl;//消耗量
+	
+	private String xsgl;//行驶公里
+	
+	private String emptMileage;//空驶里程
+	
+	private String sjbc;//实际班次
+
+	public String getXlName() {
+		return xlName;
+	}
+
+	public void setXlName(String xlName) {
+		this.xlName = xlName;
+	}
+
+	public String getJzl() {
+		return jzl;
+	}
+
+	public void setJzl(String jzl) {
+		this.jzl = jzl;
+	}
+
+	public String getXhl() {
+		return xhl;
+	}
+
+	public void setXhl(String xhl) {
+		this.xhl = xhl;
+	}
+
+	public String getXsgl() {
+		return xsgl;
+	}
+
+	public void setXsgl(String xsgl) {
+		this.xsgl = xsgl;
+	}
+
+	public String getEmptMileage() {
+		return emptMileage;
+	}
+
+	public void setEmptMileage(String emptMileage) {
+		this.emptMileage = emptMileage;
+	}
+
+	public String getSjbc() {
+		return sjbc;
+	}
+
+	public void setSjbc(String sjbc) {
+		this.sjbc = sjbc;
+	}
+	
+	
+}
+package com.bsth.entity.mcy_forms;
+
+public class Shifday {
+
+	private String jName;//驾驶员
+	
+	private String sName;//售票员
+	
+	private String lpName;//路牌
+	
+	private String carPlate;//车辆
+
+	private String jhlc;//计划里程
+	
+	private String sjjhlc;//实际计划里程
+	
+	private String yygl;//运营里程
+	
+	private String emptMileage;//空驶里程
+	
+	private String remMileage;//实际公里
+	
+	private String addMileage;//增加公里
+	
+	private String totalm;//总公里
+	
+	private String jhbc;//计划班次
+	
+	private String sjjhbc;//实际计划班次
+	
+	private String cjbc;//抽减班次
+	
+	private String ljbc;//增加班次
+	
+	private String sjbc;//实际班次
+	
+	
+	public String getJhlc() {
+		return jhlc;
+	}
+
+	public void setJhlc(String jhlc) {
+		this.jhlc = jhlc;
+	}
+
+	public String getSjjhlc() {
+		return sjjhlc;
+	}
+
+	public void setSjjhlc(String sjjhlc) {
+		this.sjjhlc = sjjhlc;
+	}
+
+	public String getYygl() {
+		return yygl;
+	}
+
+	public void setYygl(String yygl) {
+		this.yygl = yygl;
+	}
+
+	public String getEmptMileage() {
+		return emptMileage;
+	}
+
+	public void setEmptMileage(String emptMileage) {
+		this.emptMileage = emptMileage;
+	}
+
+	public String getRemMileage() {
+		return remMileage;
+	}
+
+	public void setRemMileage(String remMileage) {
+		this.remMileage = remMileage;
+	}
+
+	public String getAddMileage() {
+		return addMileage;
+	}
+
+	public void setAddMileage(String addMileage) {
+		this.addMileage = addMileage;
+	}
+
+	public String getTotalm() {
+		return totalm;
+	}
+
+	public void setTotalm(String totalm) {
+		this.totalm = totalm;
+	}
+
+	public String getJhbc() {
+		return jhbc;
+	}
+
+	public void setJhbc(String jhbc) {
+		this.jhbc = jhbc;
+	}
+
+	public String getSjjhbc() {
+		return sjjhbc;
+	}
+
+	public void setSjjhbc(String sjjhbc) {
+		this.sjjhbc = sjjhbc;
+	}
+
+	public String getCjbc() {
+		return cjbc;
+	}
+
+	public void setCjbc(String cjbc) {
+		this.cjbc = cjbc;
+	}
+
+	public String getLjbc() {
+		return ljbc;
+	}
+
+	public void setLjbc(String ljbc) {
+		this.ljbc = ljbc;
+	}
+
+	public String getSjbc() {
+		return sjbc;
+	}
+
+	public void setSjbc(String sjbc) {
+		this.sjbc = sjbc;
+	}
+
+
+	public String getjName() {
+		return jName;
+	}
+
+	public void setjName(String jName) {
+		this.jName = jName;
+	}
+
+	public String getsName() {
+		return sName;
+	}
+
+	public void setsName(String sName) {
+		this.sName = sName;
+	}
+
+	public String getLpName() {
+		return lpName;
+	}
+
+	public void setLpName(String lpName) {
+		this.lpName = lpName;
+	}
+
+	public String getCarPlate() {
+		return carPlate;
+	}
+
+	public void setCarPlate(String carPlate) {
+		this.carPlate = carPlate;
+	}
+	
+	
+}
+package com.bsth.entity.mcy_forms;
+
+public class Shiftuehiclemanth {
+
+	private String jName;//驾驶员名字
+	
+	private String jhlc;//运营里程
+	
+	private String emptMileage;//空驶里程
+	
+	private String remMileage;//抽减公里
+	
+	private String addMileage;//增加公里
+	
+	private String totalm;//总公里
+	
+	private String cjbc;//抽减班次
+	
+	private String ljbc;//增加班次
+	
+	private String sjbc;//实际班次
+
+	
+	public String getCjbc() {
+		return cjbc;
+	}
+
+	public void setCjbc(String cjbc) {
+		this.cjbc = cjbc;
+	}
+
+	public String getLjbc() {
+		return ljbc;
+	}
+
+	public void setLjbc(String ljbc) {
+		this.ljbc = ljbc;
+	}
+
+	public String getSjbc() {
+		return sjbc;
+	}
+
+	public void setSjbc(String sjbc) {
+		this.sjbc = sjbc;
+	}
+
+
+	public String getjName() {
+		return jName;
+	}
+
+	public void setjName(String jName) {
+		this.jName = jName;
+	}
+
+	public String getJhlc() {
+		return jhlc;
+	}
+
+	public void setJhlc(String jhlc) {
+		this.jhlc = jhlc;
+	}
+
+	public String getEmptMileage() {
+		return emptMileage;
+	}
+
+	public void setEmptMileage(String emptMileage) {
+		this.emptMileage = emptMileage;
+	}
+
+	public String getRemMileage() {
+		return remMileage;
+	}
+
+	public void setRemMileage(String remMileage) {
+		this.remMileage = remMileage;
+	}
+
+	public String getAddMileage() {
+		return addMileage;
+	}
+
+	public void setAddMileage(String addMileage) {
+		this.addMileage = addMileage;
+	}
+
+	public String getTotalm() {
+		return totalm;
+	}
+
+	public void setTotalm(String totalm) {
+		this.totalm = totalm;
+	}
+	
+	
+	
+	
+	
+	
+	
+}
+package com.bsth.entity.mcy_forms;
+
+public class Singledata {
+
+	private String rQ;//日期
+	
+	private String gS;//所属公司
+	
+	private String xL;//线路
+	
+	private String clzbh;//车号
+	
+	private String jsy;//驾驶员职号
+	
+    private String jName;//驾驶员名字
+	
+    private String sgh;//售票员职号
+    
+    private String sName;//售票员名称
+    
+	private String jhlc;//运营里程
+	
+	private String emptMileage;//空驶里程
+	
+	private String hyl;//耗油量
+	
+	private String jzl;//加注量
+	
+	private String unyyyl;//非商业用油
+	
+	private String jhjl;//计划公里
+
+	public String getrQ() {
+		return rQ;
+	}
+
+	public void setrQ(String rQ) {
+		this.rQ = rQ;
+	}
+
+	public String getgS() {
+		return gS;
+	}
+
+	public void setgS(String gS) {
+		this.gS = gS;
+	}
+
+	public String getxL() {
+		return xL;
+	}
+
+	public void setxL(String xL) {
+		this.xL = xL;
+	}
+
+	public String getClzbh() {
+		return clzbh;
+	}
+
+	public void setClzbh(String clzbh) {
+		this.clzbh = clzbh;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getjName() {
+		return jName;
+	}
+
+	public void setjName(String jName) {
+		this.jName = jName;
+	}
+
+	public String getSgh() {
+		return sgh;
+	}
+
+	public void setSgh(String sgh) {
+		this.sgh = sgh;
+	}
+
+	public String getsName() {
+		return sName;
+	}
+
+	public void setsName(String sName) {
+		this.sName = sName;
+	}
+
+	public String getJhlc() {
+		return jhlc;
+	}
+
+	public void setJhlc(String jhlc) {
+		this.jhlc = jhlc;
+	}
+
+	public String getEmptMileage() {
+		return emptMileage;
+	}
+
+	public void setEmptMileage(String emptMileage) {
+		this.emptMileage = emptMileage;
+	}
+
+	public String getHyl() {
+		return hyl;
+	}
+
+	public void setHyl(String hyl) {
+		this.hyl = hyl;
+	}
+
+	public String getJzl() {
+		return jzl;
+	}
+
+	public void setJzl(String jzl) {
+		this.jzl = jzl;
+	}
+
+	public String getUnyyyl() {
+		return unyyyl;
+	}
+
+	public void setUnyyyl(String unyyyl) {
+		this.unyyyl = unyyyl;
+	}
+
+	public String getJhjl() {
+		return jhjl;
+	}
+
+	public void setJhjl(String jhjl) {
+		this.jhjl = jhjl;
+	}
+	
+	
+	
+}
+package com.bsth.entity.mcy_forms;
+
+public class Vehicleloading {
+
+	private String rQ;//日期
+	
+	private String gS;//所属公司
+	
+	private String xL;//线路
+	
+	private String clzbh;//车号
+	
+	private String hyl;//耗油量
+	
+	private String jzl;//加注量
+	
+	private String ls;//尿素
+	
+	private String jhlc;//实际里程
+	
+	private String unyyyl;//非商业用油
+	
+	private String jhbc;//计划班次
+	
+	private String sjbc;//实际班次
+	
+	public String getLs() {
+		return ls;
+	}
+
+	public void setLs(String ls) {
+		this.ls = ls;
+	}
+
+	
+	
+	public String getrQ() {
+		return rQ;
+	}
+
+	public void setrQ(String rQ) {
+		this.rQ = rQ;
+	}
+
+	public String getgS() {
+		return gS;
+	}
+
+	public void setgS(String gS) {
+		this.gS = gS;
+	}
+
+	public String getxL() {
+		return xL;
+	}
+
+	public void setxL(String xL) {
+		this.xL = xL;
+	}
+
+	public String getClzbh() {
+		return clzbh;
+	}
+
+	public void setClzbh(String clzbh) {
+		this.clzbh = clzbh;
+	}
+
+	public String getHyl() {
+		return hyl;
+	}
+
+	public void setHyl(String hyl) {
+		this.hyl = hyl;
+	}
+
+	public String getJzl() {
+		return jzl;
+	}
+
+	public void setJzl(String jzl) {
+		this.jzl = jzl;
+	}
+
+	public String getJhlc() {
+		return jhlc;
+	}
+
+	public void setJhlc(String jhlc) {
+		this.jhlc = jhlc;
+	}
+
+	public String getUnyyyl() {
+		return unyyyl;
+	}
+
+	public void setUnyyyl(String unyyyl) {
+		this.unyyyl = unyyyl;
+	}
+
+	
+
+	public String getJhbc() {
+		return jhbc;
+	}
+
+	public void setJhbc(String jhbc) {
+		this.jhbc = jhbc;
+	}
+
+	public String getSjbc() {
+		return sjbc;
+	}
+
+	public void setSjbc(String sjbc) {
+		this.sjbc = sjbc;
+	}
+
+	
+
+	
+}
+package com.bsth.entity.mcy_forms;
+
+/**
+ * 
+ * @author 马陈艳
+ * 线路调度日报表统计
+ *
+ */
+public class Waybillday {
+	
+	private String carPlate;//车牌号
+	
+	private String jzl;//加注量
+	
+	private String jzl1;//空驶公里
+	
+	private String yh;//油耗
+	
+	private String jName;//驾驶员
+	
+	private String zlc;//里程
+	
+	private String yl;//用油
+	
+	private String nbbm;//机油 
+
+	public String getCarPlate() {
+		return carPlate;
+	}
+
+	public void setCarPlate(String carPlate) {
+		this.carPlate = carPlate;
+	}
+
+
+	public String getJzl1() {
+		return jzl1;
+	}
+
+	public void setJzl1(String jzl1) {
+		this.jzl1 = jzl1;
+	}
+
+
+	public String getJzl() {
+		return jzl;
+	}
+
+	public void setJzl(String jzl) {
+		this.jzl = jzl;
+	}
+
+	public String getYh() {
+		return yh;
+	}
+
+	public void setYh(String yh) {
+		this.yh = yh;
+	}
+
+	public String getjName() {
+		return jName;
+	}
+
+	public void setjName(String jName) {
+		this.jName = jName;
+	}
+
+	public String getZlc() {
+		return zlc;
+	}
+
+	public void setZlc(String string) {
+		this.zlc = string;
+	}
+
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getYl() {
+		return yl;
+	}
+
+	public void setYl(String yl) {
+		this.yl = yl;
+	}
+	
+	
+}
@@ -38,6 +38,15 @@ public class SchedulePlan {
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private ScheduleRule1 scheduleRule1;
+    // TODO： 新字段，测试完后删除旧的字段
+
+    /** 使用的时刻表名字列表（用逗号连接） */
+    private String ttInfoNames;
+    /** 使用的时刻表id列表（用逗号连接） */
+    private String ttInfoId;
+    /** 使用的规则1列表（用逗号连接） */
+    private String rule1Ids;
+
     /** 排班计划的开始时间 */
     @Column(nullable = false)
     private Date scheduleFromTime;
@@ -150,4 +159,28 @@ public class SchedulePlan {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public String getTtInfoNames() {
+        return ttInfoNames;
+    }
+
+    public void setTtInfoNames(String ttInfoNames) {
+        this.ttInfoNames = ttInfoNames;
+    }
+
+    public String getTtInfoId() {
+        return ttInfoId;
+    }
+
+    public void setTtInfoId(String ttInfoId) {
+        this.ttInfoId = ttInfoId;
+    }
+
+    public String getRule1Ids() {
+        return rule1Ids;
+    }
+
+    public void setRule1Ids(String rule1Ids) {
+        this.rule1Ids = rule1Ids;
+    }
 }
@@ -121,6 +121,13 @@ public class SchedulePlanInfo {
     @Column(nullable = false)
     private String bcType;
+    // 重要的新增字段
+    /** 关联的时刻表id */
+    private Long ttInfo;
+    /** 关联的时刻表名字 */
+    private String ttInfoName;
+
+
     /** 创建人 */
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private SysUser createBy;
@@ -555,4 +562,20 @@ public class SchedulePlanInfo {
     public void setSchedulePlan(SchedulePlan schedulePlan) {
         this.schedulePlan = schedulePlan;
     }
+
+    public Long getTtInfo() {
+        return ttInfo;
+    }
+
+    public void setTtInfo(Long ttInfo) {
+        this.ttInfo = ttInfo;
+    }
+
+    public String getTtInfoName() {
+        return ttInfoName;
+    }
+
+    public void setTtInfoName(String ttInfoName) {
+        this.ttInfoName = ttInfoName;
+    }
 }
 package com.bsth.entity.search;
+import org.joda.time.DateTime;
+
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
@@ -27,7 +29,26 @@ public class PredicatesBuilder {
 	}
 	public static Predicate eq(CriteriaBuilder cb,Path<?> expression, Object object){
-		return cb.equal(expression, object);
+        Class<?> leftType = expression.getJavaType();
+        Class<?> rightType = object.getClass();
+
+        if (Number.class.isAssignableFrom(leftType) &&
+                (Number.class.isAssignableFrom(rightType) || String.class.isAssignableFrom(rightType))) { // Number == Number/String
+            return cb.equal(expression, object);
+        } else if (String.class.isAssignableFrom(leftType) &&
+                (String.class.isAssignableFrom(rightType) || Number.class.isAssignableFrom(rightType))) { // String == String/Number
+            return cb.equal(expression, object);
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                Date.class.isAssignableFrom(rightType)) { // Date == Date
+            return cb.equal(expression, object);
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                String.class.isAssignableFrom(rightType)) { // Date == String
+            DateTime dateTime = new DateTime(object);
+            return cb.equal(expression, dateTime.toDate());
+        } else {
+            throw new RuntimeException("eq 不支持类型组合：" + expression.getJavaType() + "==" + object.getClass());
+        }
+
 	}
 	public static Predicate ne(CriteriaBuilder cb,Path<?> expression, Object object){
@@ -47,15 +68,19 @@ public class PredicatesBuilder {
         Class<?> leftType = expression.getJavaType();
         Class<?> rightType = object.getClass();
-        if (leftType.isAssignableFrom(Number.class) &&
-                rightType.isAssignableFrom(Number.class)) { // 判定是否是Number类型的子类
+        if (Number.class.isAssignableFrom(leftType) &&
+                (Number.class.isAssignableFrom(rightType) || String.class.isAssignableFrom(rightType))) { // Number >= Number/String
             return cb.ge((Path<Number>) expression, (Number) object);
-        } else if (leftType.isAssignableFrom(String.class) &&
-                rightType.isAssignableFrom(String.class)) { // 判定是否是String类型的子类
+        } else if (String.class.isAssignableFrom(leftType) &&
+                (String.class.isAssignableFrom(rightType) || Number.class.isAssignableFrom(rightType))) { // String >= String/Number
             return cb.greaterThanOrEqualTo((Path<String>) expression, (String) object);
-        } else if (leftType.isAssignableFrom(Date.class) &&
-                rightType.isAssignableFrom(Date.class)) { // 判定是否是Date类型的子类
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                Date.class.isAssignableFrom(rightType)) { // Date >= Date
             return cb.greaterThanOrEqualTo((Path<Date>) expression, (Date) object);
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                String.class.isAssignableFrom(rightType)) { // Date >= String
+            DateTime dateTime = new DateTime(object);
+            return cb.greaterThanOrEqualTo((Path<Date>) expression, dateTime.toDate());
         } else {
             throw new RuntimeException("ge 不支持类型组合：" + expression.getJavaType() + ">=" + object.getClass());
         }
@@ -74,17 +99,22 @@ public class PredicatesBuilder {
         Class<?> leftType = expression.getJavaType();
         Class<?> rightType = object.getClass();
-        if (leftType.isAssignableFrom(Number.class) &&
-                rightType.isAssignableFrom(Number.class)) { // 判定是否是Number类型的子类
+
+        if (Number.class.isAssignableFrom(leftType) &&
+                (Number.class.isAssignableFrom(rightType) || String.class.isAssignableFrom(rightType))) { // Number <= Number/String
             return cb.le((Path<Number>) expression, (Number) object);
-        } else if (leftType.isAssignableFrom(String.class) &&
-                rightType.isAssignableFrom(String.class)) { // 判定是否是String类型的子类
+        } else if (String.class.isAssignableFrom(leftType) &&
+                (String.class.isAssignableFrom(rightType) || Number.class.isAssignableFrom(rightType))) { // String <= String/Number
             return cb.lessThanOrEqualTo((Path<String>) expression, (String) object);
-        } else if (leftType.isAssignableFrom(Date.class) &&
-                rightType.isAssignableFrom(Date.class)) { // 判定是否是Date类型的子类
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                Date.class.isAssignableFrom(rightType)) { // Date <= Date
             return cb.lessThanOrEqualTo((Path<Date>) expression, (Date) object);
+        } else if (Date.class.isAssignableFrom(leftType) &&
+                String.class.isAssignableFrom(rightType)) { // Date <= String
+            DateTime dateTime = new DateTime(object);
+            return cb.lessThanOrEqualTo((Path<Date>) expression, dateTime.toDate());
         } else {
-            throw new RuntimeException("ge 不支持类型组合：" + expression.getJavaType() + ">=" + object.getClass());
+            throw new RuntimeException("le 不支持类型组合：" + expression.getJavaType() + "<=" + object.getClass());
         }
 	}
@@ -81,8 +81,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and bcType='normal' order by bcs")
 	List<ScheduleRealInfo> queryListWaybill2(String jName,String clZbh,String lpName,String date);
-	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and bcType='normal' order by bcs")
-	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String lpName,String date);
+	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') and bcType='normal' order by bcs")
+	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleDaily(String line,String date);
+package com.bsth.service.forms;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Linepasswengerflow;
+import com.bsth.entity.mcy_forms.Operationservice;
+import com.bsth.entity.mcy_forms.Shifday;
+import com.bsth.entity.mcy_forms.Shiftuehiclemanth;
+import com.bsth.entity.mcy_forms.Singledata;
+import com.bsth.entity.mcy_forms.Vehicleloading;
+import com.bsth.entity.mcy_forms.Waybillday;
+
+
+public interface FormsService {
+	
+	public List<Waybillday> waybillday(Map<String, Object> map);
+	
+	List<Waybillday> waybilldayExcel(Map<String, Object> map);
+
+	public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map);
+
+	public List<Shiftuehiclemanth> shiftuehiclemanth(Map<String, Object> map);
+
+	public List<Changetochange> changetochange(Map<String, Object> map);
+
+	public List<Shifday> shifday(Map<String, Object> map);
+ 
+	public List<Singledata> singledata(Map<String, Object> map);
+	 
+	public List<Vehicleloading> vehicleloading(String line,String data);
+	
+	public List<Operationservice> operationservice(Map<String, Object> map);
+}
+package com.bsth.service.forms.impl;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import com.bsth.entity.mcy_forms.Linepasswengerflow;
+import com.bsth.entity.mcy_forms.Operationservice;
+import com.bsth.entity.mcy_forms.Shifday;
+import com.bsth.entity.mcy_forms.Shiftuehiclemanth;
+import com.bsth.entity.mcy_forms.Singledata;
+import com.bsth.entity.mcy_forms.Vehicleloading;
+import com.bsth.entity.mcy_forms.Waybillday;
+import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.service.forms.FormsService;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.ReportRelatedUtils;
+import com.bsth.util.ReportUtils;
+
+@Service
+public class FormsServiceImpl implements FormsService{
+	
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+	@Autowired
+	ScheduleRealInfoService scheduleRealInfoService;
+	
+	//行车路单日报表
+	@Override
+	public List<Waybillday> waybillday(Map<String, Object> map) {
+		 List list1=new ArrayList<>();//
+ 		String sql = "select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH,y.YH,c.personnel_name from bsth_c_ylb y" +
+ 				" LEFT JOIN bsth_c_personnel c ON c.job_code=y.JSY   " +
+				" where to_days(y.RQ)=to_days('"+map.get("date").toString()+"') " +
+				" and y.XLBM="+map.get("line").toString()+ 
+				" GROUP BY y.NBBM";
+		
+		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
+			@Override
+			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Waybillday wbd = new Waybillday();
+				wbd.setCarPlate(arg0.getString("NBBM"));
+				wbd.setJzl(arg0.getString("JZL"));
+				wbd.setYh(arg0.getString("YH"));
+				wbd.setjName(arg0.getString("personnel_name"));
+				//wbd.setZlc(arg0.getInt("zlc"));
+				//System.out.println(arg0.getObject("yl"));
+				//wbd.setYl(arg0.getString("yl"));
+				//wbd.setNbbm(arg0.getString("nbbm"));
+				Map<String, Object> maps=new HashMap<>();
+				maps=scheduleRealInfoService.findKMBC2(arg0.getString("JSY"), arg0.getString("nbbm"), arg0.getString("RQ"));
+				wbd.setJzl1(maps.get("ksgl").toString());
+				wbd.setZlc(maps.get("realMileage").toString());
+//				{realMileage=211.20, cjbc=2, ljbc=0, remMileage=38.40, ksgl=0.00,
+//						jhlc=211.20, sjbc=9, jhbc=11, addMileage=0.00, yygl=211.20
+				
+				return wbd;
+				
+			}
+		});
+		return list;
+	}
+	
+	
+	
+	//线路客流量报表
+	@Override
+	public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map) {
+		String sql = " SELECT s.station_name,l.name,l.create_date from bsth_c_stationroute s " +
+				     " LEFT JOIN bsth_c_line l on s.line_code=l.line_code " +
+				     " where to_days(l.create_date)=to_days('"+map.get("date").toString()+"') " +
+				     " and l.line_code="+map.get("line").toString()+
+				     " GROUP BY s.station_name ";
+		
+		List<Linepasswengerflow> list = jdbcTemplate.query(sql, new RowMapper<Linepasswengerflow>() {
+
+			@Override
+			public Linepasswengerflow mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Linepasswengerflow lin = new Linepasswengerflow();
+			    lin.setStationName(arg0.getString("station_name"));
+				
+				return lin;
+			}
+		});
+		return list;
+	}
+
+
+	//导出
+	@Override
+	public List<Waybillday> waybilldayExcel(Map<String,Object> map) {
+		ReportUtils ee = new ReportUtils();
+		ReportRelatedUtils rru = new ReportRelatedUtils();
+		List<Iterator<?>> list = new ArrayList<Iterator<?>>();
+		List<Waybillday> Waybilldays = waybillday(map);
+		List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
+		
+		DecimalFormat format = new DecimalFormat("0.00");
+        String jName=null;
+		Map<String,Object> map1 = new HashMap<>();
+		for(Waybillday Waybillday : Waybilldays){
+			map1.put("carPlate", Waybillday.getCarPlate());
+			map1.put("jzl1", Waybillday.getJzl1());
+			map1.put("jzl", Waybillday.getJzl());
+			map1.put("yh", Waybillday.getYh());
+			map1.put("jName", Waybillday.getjName());
+			jName=Waybillday.getjName();
+			map1.put("zlc", Waybillday.getZlc());			
+		}
+//		
+//		//计算里程和班次数，并放入Map里
+//		map1 = new HashMap<String, Object>();
+//		map1.put("jhlc", format.format(jhlc));
+//		map1.put("remMileage", format.format(remMileage));
+//		map1.put("addMileage", format.format(addMileage));
+//		map1.put("yygl", format.format(yygl));
+//		map1.put("ksgl", format.format(ksgl));
+//		map1.put("realMileage", format.format(yygl+ksgl));
+//		map1.put("jhbc", jhbc);
+//		map1.put("cjbc", cjbc);
+//		map1.put("ljbc", ljbc);
+//		map1.put("sjbc", jhbc-cjbc+ljbc);
+		
+		String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+
+		list.add(listMap.iterator());
+		ee.excelReplace(list, new Object[] { Waybilldays.get(0),map1 }, path+"mould\\waybill_minhang.xls",
+				path+"export\\" + jName + ".xls");
+		return Waybilldays;
+	}
+
+
+	//班次车辆人员月统计
+	String startDate;
+	String endDate;
+	@Override
+	public List<Shiftuehiclemanth> shiftuehiclemanth( Map<String, Object> map) {
+ 		 List list1=new ArrayList<>();//
+	 		String sql = "select r.j_name,r.schedule_date_str,r.update_date,r.cl_zbh " +
+	 				" from bsth_c_s_sp_info_real r " +
+	 				" LEFT JOIN bsth_c_s_ttinfo_detail d on r.lp_name=d.lp " +
+	 				" LEFT JOIN bsth_c_line_information l on l.line=r.lp_name  " +
+	 				" where  to_days(r.schedule_date_str) BETWEEN to_days('"+map.get("startDate").toString()+"') " +
+	 				" and  to_days('"+map.get("endDate").toString()+"') " +
+	 				" and r.xl_bm='"+map.get("line").toString() +"' " +
+	 				" GROUP BY r.j_name" +
+	 				" ORDER BY r.j_name";
+	 		  startDate=map.get("startDate").toString();
+	 		 endDate=map.get("endDate").toString();
+			List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
+				
+				@Override
+				public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Shiftuehiclemanth shif = new Shiftuehiclemanth();
+					shif.setjName(arg0.getString("j_name"));
+					
+					Map<String, Object> maps=new HashMap<>();
+					 
+  					maps=scheduleRealInfoService.findKMBC1(arg0.getString("j_name"), arg0.getString("cl_zbh"), startDate ,  endDate );
+					shif.setJhlc(maps.get("jhlc").toString());
+  					shif.setEmptMileage(maps.get("ksgl").toString());
+  					shif.setRemMileage(maps.get("remMileage").toString());
+  					shif.setAddMileage(maps.get("addMileage").toString());
+  					shif.setTotalm(maps.get("realMileage").toString());
+  					shif.setCjbc(maps.get("cjbc").toString());
+  					shif.setLjbc(maps.get("ljbc").toString());
+  					shif.setSjbc(maps.get("sjbc").toString());
+  					
+					return shif;
+					
+				}
+			});
+			
+			return list;
+	}
+
+
+	//班次车辆人员日统计
+	@Override
+	public List<Shifday> shifday(Map<String, Object> map) {
+		String sql = " select r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.schedule_date,r.cl_zbh,r.j_gh " +
+				     " FROM bsth_c_s_sp_info_real r   " +
+			         " where to_days(r.schedule_date)=to_days('"+map.get("date").toString()+"') and r.xl_bm="+map.get("line").toString()+
+			         " GROUP BY r.j_name ";
+	
+	List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
+
+		@Override
+		public Shifday mapRow(ResultSet arg0, int arg1) throws SQLException {
+			Shifday shifday  = new Shifday();
+			shifday.setjName(arg0.getString("j_name").toString());
+			shifday.setsName(arg0.getString("s_name")==null?"":arg0.getString("s_name").toString());
+			shifday.setLpName(arg0.getString("r.lp_name").toString());
+			shifday.setCarPlate(arg0.getString("cl_zbh").toString());
+			
+			Map<String, Object> map=new HashMap<>();
+			map=scheduleRealInfoService.findKMBC2(arg0.getString("j_gh"), arg0.getString("cl_zbh"), arg0.getString("schedule_date"));
+			shifday.setJhlc(map.get("jhlc").toString());//计划里程
+			//shifday.setSjjhlc(map.get("remMileage").toString());//实际计划里程
+			shifday.setYygl(map.get("yygl").toString());//营运里程
+			shifday.setEmptMileage(map.get("ksgl").toString());//空驶里程
+			shifday.setRemMileage(map.get("remMileage").toString());//抽减里程
+			shifday.setAddMileage(map.get("addMileage").toString());//增加里程
+			shifday.setTotalm(map.get("realMileage").toString());//总里程
+			shifday.setJhbc(map.get("jhbc").toString());//计划班次
+			//shifday.setSjjhbc(map.get("sjjhbc").toString());//实际计划班次
+			shifday.setCjbc(map.get("cjbc").toString());//抽减班次
+			shifday.setLjbc(map.get("ljbc").toString());//增加班次
+			shifday.setSjbc(map.get("sjbc").toString());//实际班次
+			return shifday;
+		}
+	});
+	return list;
+	}
+
+	//换人换车情况日统计
+	@Override
+	public List<Changetochange> changetochange(Map<String, Object> map) {
+		
+		return null;
+	}
+
+
+	//路单数据
+	@Override
+	public List<Singledata> singledata(Map<String, Object> map) {
+		
+		String sql = " SELECT y.RQ,y.SSGSDM,y.XLBM,y.NBBM,y.JSY,y.YH,y.JZL " +
+					 "  FROM bsth_c_ylb y" +
+					 "  where y.RQ BETWEEN '"+map.get("startDate").toString() +"'" +
+		 			 "  and '"+map.get("endDate").toString()+"'"+
+		 			 "  and y.XLBM='"+map.get("line").toString()+"'"+
+					 "  GROUP BY y.NBBM ";
+	
+	List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		@Override
+		public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
+			Singledata sin = new Singledata();
+		    sin.setrQ(sdf.format(arg0.getDate("rq")));
+		    sin.setgS(arg0.getString("SSGSDM").toString());
+		    sin.setxL(arg0.getString("XLBM").toString());
+		    sin.setClzbh(arg0.getString("NBBM").toString());
+		    sin.setJsy(arg0.getString("JSY").toString());
+		    sin.setHyl(arg0.getString("YH").toString());
+		    sin.setJzl(arg0.getString("JZL").toString());
+		   // sin.setJzl(arg0.getString(""));//非营业性用油
+		    sin.setJhjl(arg0.getString("JZL"));
+			Map<String, Object> maps=new HashMap<>();
+			maps=scheduleRealInfoService.findKMBC2(sin.getJsy(),sin.getClzbh(),sin.getrQ());
+			sin.setjName(maps.get("j_name")==null?"":maps.get("j_name").toString());
+			sin.setSgh(maps.get("s_gh")==null?"":maps.get("s_gh").toString());
+			sin.setsName(maps.get("s_name")==null?"":maps.get("s_name").toString());
+			sin.setJhlc(maps.get("yygl")==null?"":maps.get("yygl").toString());
+			sin.setEmptMileage(maps.get("ksgl")==null?"":maps.get("ksgl").toString());
+			sin.setJhjl(maps.get("jhlc")==null?"":maps.get("jhlc").toString());
+			
+			return sin;
+		}
+	});
+	return list;
+}
+
+
+	//运营服务阶段报表
+	@Override
+	public List<Operationservice> operationservice(Map<String, Object> map) {
+		
+	String sql = " SELECT y.RQ,y.XLBM,y.NBBM,y.JSY,y.YH,y.JZL " +
+				 "  FROM bsth_c_ylb y" +
+				 "  where y.RQ BETWEEN '"+map.get("startDate").toString() +"'" +
+	 			 "  and '"+map.get("endDate").toString()+"'"+
+				 "  and y.XLBM='"+map.get("line").toString()+"'"+
+				 "  GROUP BY y.NBBM ";
+	
+	List<Operationservice> list = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		@Override
+		public Operationservice mapRow(ResultSet arg0, int arg1) throws SQLException {
+			Singledata sin = new Singledata();
+			Operationservice op = new Operationservice();
+			op.setXlName(arg0.getString("XLBM").toString());
+			op.setJzl(arg0.getString("JZL").toString());
+			op.setXhl(arg0.getString("YH").toString());
+			Map<String, Object> maps=new HashMap<>();
+			maps=scheduleRealInfoService.findKMBC2(sin.getJsy(),sin.getClzbh(),sin.getrQ());
+			op.setXsgl(maps.get("yygl").toString()==null?"":maps.get("yygl").toString());
+			op.setEmptMileage(maps.get("ksgl").toString()==null?"":maps.get("ksgl").toString());
+			op.setSjbc(maps.get("sjbc").toString()==null?"":maps.get("sjbc").toString());
+			return op;
+		}
+	});
+	return list;
+	}
+
+
+	//车辆加注
+	@Override
+	public List<Vehicleloading> vehicleloading(String line,String data) {
+		
+		String sql = " SELECT y.RQ,y.SSGSDM,y.XLBM,y.NBBM,y.JSY,y.YH,y.JZL " +
+				 	"  FROM bsth_c_ylb y " +
+				 	"  where to_days(y.RQ)=to_days('"+data +"')" +
+				 	"  and y.XLBM='"+line+"' "+
+				 	"  GROUP BY y.NBBM ";
+	
+	   List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
+		@Override
+		public Vehicleloading mapRow(ResultSet arg0, int arg1) throws SQLException {
+			Vehicleloading ve = new Vehicleloading();
+			ve.setrQ(arg0.getString("RQ").toString());
+			ve.setgS(arg0.getString("SSGSDM").toString());
+			ve.setxL(arg0.getString("XLBM").toString());
+			ve.setClzbh(arg0.getString("NBBM").toString());
+			ve.setHyl(arg0.getString("YH").toString());
+			ve.setJzl(arg0.getString("JZL").toString());
+			//ve.setLs(arg0.getString("").toString());//尿素
+			Map<String, Object> maps=new HashMap<>();
+			maps=scheduleRealInfoService.findKMBC2(arg0.getString("JSY"), arg0.getString("NBBM"), arg0.getString("RQ"));
+			ve.setJhlc(maps.get("yygl")==null?"":maps.get("yygl").toString());
+			ve.setJhbc(maps.get("jhbc").toString()==null?"":maps.get("jhbc").toString());//计划班次
+			ve.setSjbc(maps.get("sjbc").toString()==null?"":maps.get("sjbc").toString());//实际班次
+			return ve;
+		}
+	});
+	return list;
+	}
+
+
+}
@@ -2,6 +2,7 @@ package com.bsth.service.realcontrol;
 import com.bsth.service.realcontrol.dto.CarOutRate;
 import com.bsth.service.realcontrol.dto.DeviceOnlineRate;
+import com.bsth.service.realcontrol.dto.ScheduleExecRate;
 import com.bsth.service.realcontrol.dto.StratEndPunctualityRate;
 import java.util.List;
@@ -15,7 +16,9 @@ public interface RealChartsService {
     List<CarOutRate> carOutRate(String month, String idx);
-    List<StratEndPunctualityRate> stratEndPunctualityRate(String month, String idx);
+    /*List<StratEndPunctualityRate> stratEndPunctualityRate(String month, String idx);*/
     List<StratEndPunctualityRate> sePunctualityRateLine(String month, String idx);
+
+    List<ScheduleExecRate> scheduleExecRates(String date, String idx);
 }
@@ -86,8 +86,12 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,String>> findLine(String line);
+	Map<String,Object> findKMBC1(String jName,String clZbh, String date,String enddate);
+	
 	Map<String,Object> findKMBC(String jName,String clZbh,String lpName,String date);
+	Map<String,Object> findKMBC2(String jName,String clZbh,String date);
+	
 	List<Map<String,String>> findLpName(String lpName);
 	List<Map<String,Object>> account(String line,String date,String code,String xlName);
+package com.bsth.service.realcontrol.dto;
+
+/**
+ * 班次执行率DTO
+ * Created by panzhao on 2016/11/14.
+ */
+public class ScheduleExecRate {
+
+    private long id;
+    private String dfsj;
+    private String fcsjActual;
+    private String zdsj;
+    private String zdsjActual;
+    private int status;
+    private String lineCode;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getDfsj() {
+        return dfsj;
+    }
+
+    public void setDfsj(String dfsj) {
+        this.dfsj = dfsj;
+    }
+
+    public String getFcsjActual() {
+        return fcsjActual;
+    }
+
+    public void setFcsjActual(String fcsjActual) {
+        this.fcsjActual = fcsjActual;
+    }
+
+    public String getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(String zdsj) {
+        this.zdsj = zdsj;
+    }
+
+    public String getZdsjActual() {
+        return zdsjActual;
+    }
+
+    public void setZdsjActual(String zdsjActual) {
+        this.zdsjActual = zdsjActual;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+}
@@ -10,17 +10,17 @@ public class StratEndPunctualityRate {
     private String lineCode;
-    private String nbbm;
-
     //首班时间 06:00/06:01
     private String startTime;
     //末班时间 20:30/20:31
     private String endTime;
-    //末班真实执行日期
-    private String etRealExecDate;
+    //上下行
+    private int updown;
+    //真实执行日期
+    private String etRealExecDate;
     public String getDateStr() {
         return dateStr;
@@ -38,14 +38,6 @@ public class StratEndPunctualityRate {
         this.lineCode = lineCode;
     }
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
     public String getStartTime() {
         return startTime;
     }
@@ -62,6 +54,14 @@ public class StratEndPunctualityRate {
         this.endTime = endTime;
     }
+    public int getUpdown() {
+        return updown;
+    }
+
+    public void setUpdown(int updown) {
+        this.updown = updown;
+    }
+
     public String getEtRealExecDate() {
         return etRealExecDate;
     }
@@ -4,10 +4,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.service.realcontrol.RealChartsService;
-import com.bsth.service.realcontrol.dto.CarOutRate;
-import com.bsth.service.realcontrol.dto.DeviceOnlineRate;
-import com.bsth.service.realcontrol.dto.RealOnline;
-import com.bsth.service.realcontrol.dto.StratEndPunctualityRate;
+import com.bsth.service.realcontrol.dto.*;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.apache.commons.lang3.StringUtils;
@@ -37,7 +34,8 @@ public class RealChartsServiceImpl implements RealChartsService {
     LineConfigData lineConfigData;
-    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
+            ,fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
     private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
     /**
@@ -164,7 +162,7 @@ public class RealChartsServiceImpl implements RealChartsService {
      * @param idx
      * @return
      */
-    @Override
+/*    @Override
     public List<StratEndPunctualityRate> stratEndPunctualityRate(String month, String idx) {
         List<String> idArray = Splitter.on(",").splitToList(idx);
         //拼接in语句
@@ -208,7 +206,7 @@ public class RealChartsServiceImpl implements RealChartsService {
             }
         });
         return list;
-    }
+    }*/
     @Override
     public List<StratEndPunctualityRate> sePunctualityRateLine(String month, String idx) {
@@ -220,10 +218,7 @@ public class RealChartsServiceImpl implements RealChartsService {
         }
         inStr = " (" + inStr.substring(1) + ")";
-        String sql = "select SCHEDULE_DATE_STR,XL_BM, min(sj) as STARTDATE, max(sj) as ENDDATE " +
-                "from (select SCHEDULE_DATE_STR,dfsj, concat_ws('/',dfsj, fcsj_actual) as sj,XL_BM from bsth_c_s_sp_info_real " +
-                "where schedule_date_str like :month and bc_type='normal' and dfsj is not null and xl_bm in "+inStr+") t group by SCHEDULE_DATE_STR,XL_BM";
-
+        String sql = "select min(DFSJ) as STARTDATE,max(DFSJ) as ENDDATE,SCHEDULE_DATE_STR,XL_BM,XL_DIR,REAL_EXEC_DATE  from (SELECT SCHEDULE_DATE_STR,concat_ws('_',concat_ws('/', dfsj, fcsj_actual),fcno) AS DFSJ,XL_BM,XL_DIR,REAL_EXEC_DATE FROM bsth_c_s_sp_info_real WHERE schedule_date_str LIKE :month AND bc_type = 'normal' AND dfsj IS NOT NULL AND xl_bm IN "+inStr+") t group by SCHEDULE_DATE_STR,XL_BM,XL_DIR,REAL_EXEC_DATE";
         MapSqlParameterSource parameters = new MapSqlParameterSource();
         parameters.addValue("month", month+"-%");
@@ -235,10 +230,11 @@ public class RealChartsServiceImpl implements RealChartsService {
                 obj.setDateStr(rs.getString("SCHEDULE_DATE_STR"));
                 obj.setStartTime(rs.getString("STARTDATE"));
                 obj.setEndTime(rs.getString("ENDDATE"));
-                obj.setEtRealExecDate(obj.getDateStr());
+                obj.setUpdown(rs.getInt("XL_DIR"));
+                obj.setEtRealExecDate(rs.getString("REAL_EXEC_DATE"));
-                if(obj.getEndTime().length() == 11){
-                    //末班真实执行日期
+                if(obj.getEndTime().length() >= 11){
+                    //末班真实执行日期，末班可能跨过12点。
                     LineConfig conf =lineConfigData.get(obj.getLineCode());
                     String fcsjActual=obj.getEndTime().split("/")[1];
@@ -247,7 +243,40 @@ public class RealChartsServiceImpl implements RealChartsService {
                         obj.setEtRealExecDate(fmtyyyyMMdd.print(fmtyyyyMMdd.parseMillis(obj.getEtRealExecDate()) + DAY_TIME));
                     }
                 }
+                return obj;
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public List<ScheduleExecRate> scheduleExecRates(String date, String idx) {
+        List<String> idArray = Splitter.on(",").splitToList(idx);
+        //拼接in语句
+        String inStr = "";
+        for (String code : idArray) {
+            inStr += (",'" + code+"'");
+        }
+        inStr = " (" + inStr.substring(1) + ")";
+        String sql = "SELECT ID,DFSJ,FCSJ_ACTUAL,ZDSJ,ZDSJ_ACTUAL,`STATUS`,XL_BM FROM bsth_c_s_sp_info_real WHERE schedule_date_str=:date AND concat_ws('', real_exec_date, dfsj)<:cdate and xl_bm in "+inStr+" ORDER BY dfsj";
+
+        MapSqlParameterSource parameters = new MapSqlParameterSource();
+        parameters.addValue("date", date);
+        parameters.addValue("cdate", fmtyyyyMMddHHmm.print(new Date().getTime()));
+
+
+        List<ScheduleExecRate> list = jdbcTemplate.query(sql, parameters, new RowMapper<ScheduleExecRate>() {
+            @Override
+            public ScheduleExecRate mapRow(ResultSet rs, int rowNum) throws SQLException {
+                ScheduleExecRate obj = new ScheduleExecRate();
+                obj.setId(rs.getLong("ID"));
+                obj.setDfsj(rs.getString("DFSJ"));
+                obj.setFcsjActual(rs.getString("FCSJ_ACTUAL"));
+                obj.setZdsj(rs.getString("ZDSJ"));
+                obj.setZdsjActual(rs.getString("ZDSJ_ACTUAL"));
+                obj.setStatus(rs.getInt("STATUS"));
+                obj.setLineCode(rs.getString("XL_BM"));
                 return obj;
             }
         });
@@ -1046,6 +1046,74 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
 	@Override
+	public Map<String, Object> findKMBC2(String jName, String clZbh,String date) {
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh ,  date);
+
+		DecimalFormat format = new DecimalFormat("0.00");
+//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
+//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
+		int jhbc = 0,cjbc = 0,ljbc = 0;
+		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0;
+		float addMileage = 0l,remMileage = 0l;
+		String j_Name="";
+		Map<String,Object> map = new HashMap<String, Object>();
+		for(ScheduleRealInfo scheduleRealInfo : list){
+			if(scheduleRealInfo != null){
+				j_Name=scheduleRealInfo.getjName();
+				//计划里程（主任务过滤掉临加班次），
+				//烂班里程（主任务烂班），
+				//临加里程（主任务临加），
+				//计划班次，烂班班次，增加班次
+				tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+				if(scheduleRealInfo.isSflj()){
+					addMileage += tempJhlc;
+					ljbc++;
+				}else{
+					jhlc += tempJhlc;
+					jhbc++;
+					if(scheduleRealInfo.getStatus() == -1){
+						remMileage += tempJhlc;
+						cjbc++;
+					}				
+				}
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				//计算营运里程，空驶里程
+				if(childTaskPlans.isEmpty()){
+					if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+							|| scheduleRealInfo.getBcType().equals("venting")){
+						ksgl += tempJhlc;
+					}else{
+						yygl += tempJhlc;
+					}	
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					while(it.hasNext()){
+						ChildTaskPlan childTaskPlan = it.next();
+						if(childTaskPlan.getMileageType().equals("empty")){
+							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}else{
+							yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}
+					}
+				}
+			}
+		}
+		map.put("j_name", j_Name);
+		map.put("jhlc", format.format(jhlc));
+		map.put("remMileage", format.format(remMileage));
+		map.put("addMileage", format.format(addMileage));
+		map.put("yygl", format.format(yygl));
+		map.put("ksgl", format.format(ksgl));
+		map.put("realMileage", format.format(yygl+ksgl));
+		map.put("jhbc", jhbc);
+		map.put("cjbc", cjbc);
+		map.put("ljbc", ljbc);
+		map.put("sjbc", jhbc-cjbc+ljbc);
+		return map;
+	}
+	
+	
+	@Override
 	public Map<String, Object> findKMBC(String jName, String clZbh,
 			String lpName,String date) {
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date);
@@ -1592,6 +1660,71 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		rs.put("ts", list);
 		return rs;
 	}
+	
+
+	@Override
+	public Map<String, Object> findKMBC1(String jName, String clZbh,
+			  String date, String enddate) {
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill2(jName, clZbh, date, enddate);
+		DecimalFormat format = new DecimalFormat("0.00");
+//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
+//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
+		int jhbc = 0,cjbc = 0,ljbc = 0;
+		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0;
+		float addMileage = 0l,remMileage = 0l;
+		Map<String,Object> map = new HashMap<String, Object>();
+		for(ScheduleRealInfo scheduleRealInfo : list){
+			if(scheduleRealInfo != null){
+				//计划里程（主任务过滤掉临加班次），
+				//烂班里程（主任务烂班），
+				//临加里程（主任务临加），
+				//计划班次，烂班班次，增加班次
+				tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+				if(scheduleRealInfo.isSflj()){
+					addMileage += tempJhlc;
+					ljbc++;
+				}else{
+					jhlc += tempJhlc;
+					jhbc++;
+					if(scheduleRealInfo.getStatus() == -1){
+						remMileage += tempJhlc;
+						cjbc++;
+					}				
+				}
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				//计算营运里程，空驶里程
+				if(childTaskPlans.isEmpty()){
+					if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+							|| scheduleRealInfo.getBcType().equals("venting")){
+						ksgl += tempJhlc;
+					}else{
+						yygl += tempJhlc;
+					}	
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					while(it.hasNext()){
+						ChildTaskPlan childTaskPlan = it.next();
+						if(childTaskPlan.getMileageType().equals("empty")){
+							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}else{
+							yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}
+					}
+				}
+			}
+		}
+		map.put("jhlc", format.format(jhlc));
+		map.put("remMileage", format.format(remMileage));
+		map.put("addMileage", format.format(addMileage));
+		map.put("yygl", format.format(yygl));
+		map.put("ksgl", format.format(ksgl));
+		map.put("realMileage", format.format(yygl+ksgl));
+		map.put("jhbc", jhbc);
+		map.put("cjbc", cjbc);
+		map.put("ljbc", ljbc);
+		map.put("sjbc", jhbc-cjbc+ljbc);
+		return map;
+	}
 	/**
 	 * 调整班次类型
@@ -136,7 +136,7 @@ public interface TTInfoDetailService extends BaseService&lt;TTInfoDetail, Long&gt; {
                                String ttinfoname,
                                String tccname) throws Exception;
-    void fileDataImport(File file, String xlmc, String ttinfoname, String tccname) throws Exception;
+    void fileDataImport(File file, String sheetname, String xlmc, String ttinfoname, String tccname) throws Exception;
 }
@@ -114,6 +114,7 @@ public class TTInfoDetailServiceImpl extends BaseServiceImpl&lt;TTInfoDetail, Long&gt;
         return editInfo;
     }
+    @Override
     /**
      * 上传并导入数据，和DataImportExportService的同名方法有差别。
      * @param datafile form上传文件
@@ -128,12 +129,12 @@ public class TTInfoDetailServiceImpl extends BaseServiceImpl&lt;TTInfoDetail, Long&gt;
                                String tccname) throws Exception {
         // 上传数据文件
         File uploadFile = dataImportExportService.uploadFile(datafile);
-        fileDataImport(uploadFile, xlmc, ttinfoname, tccname);
+        fileDataImport(uploadFile, "工作表1", xlmc, ttinfoname, tccname);
     }
     @Override
-    public void fileDataImport(File uploadFile, String xlmc, String ttinfoname, String tccname) throws Exception {
+    public void fileDataImport(File uploadFile, String sheetname, String xlmc, String ttinfoname, String tccname) throws Exception {
         // 1、上传数据文件
         System.out.println("线路名称：" + xlmc);
         System.out.println("时刻表名称：" + ttinfoname);
@@ -162,6 +163,7 @@ public class TTInfoDetailServiceImpl extends BaseServiceImpl&lt;TTInfoDetail, Long&gt;
         // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
         trans.setParameterValue("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
         trans.setParameterValue("filepath", uploadFile.getAbsolutePath()); // 指定导入数据文件的位置
+        trans.setParameterValue("sheetname", sheetname); // sheet工作区的名字
         trans.setParameterValue("erroroutputdir", dataToolsProperties.getTransErrordir()); // ktr转换错误输出目录
         trans.setParameterValue("xlname", xlmc); // 线路名称
         trans.setParameterValue("ttinfoname", ttinfoname); // 时刻表名称