Merge remote-tracking branch 'origin/qingpu_20180808' into qingpu_20180808

王通
2 parents 227d3a18 25f3363e
Showing 35 changed files with 2211 additions and 93 deletions
src/main/java/com/bsth/controller/calc/CalcExportController.java
src/main/java/com/bsth/controller/calc/CalcMixController.java
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/repository/oil/CwjyRepository.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/repository/oil/LsylbRepository.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/calc/CalcMixService.java
src/main/java/com/bsth/service/calc/impl/CalcMixServiceImpl.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
+package com.bsth.controller.calc;
+
+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.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.common.ResponseCode;
+import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.entity.mcy_forms.Waybillday;
+import com.bsth.service.calc.CalcMixService;
+import com.bsth.service.calc.CalcWaybillService;
+import com.bsth.util.ReportUtils;
+
+@RestController
+@RequestMapping("calc_export")
+public class CalcExportController {
+	
+	@Autowired
+	CalcWaybillService service;
+
+	@Autowired
+	CalcMixService clacMixService;
+
+	@RequestMapping(value = "/waybilldayExport", method = RequestMethod.GET)
+	public Map<String, Object> calcjsyspyExport(@RequestParam Map<String, Object> map) {
+		
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String lineName="";
+		if(map.get("lineName")!=null){
+			lineName=map.get("lineName").toString().trim();
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String cont="";
+		if(map.get("cont")!=null){
+			cont=map.get("cont").toString().trim();
+		}
+		String empnames="";
+		if(map.get("empnames")!=null){
+			empnames=map.get("empnames").toString().trim();
+		}
+		String gsdmManth="";
+		if(map.get("gsdmManth")!=null){
+			gsdmManth=map.get("gsdmManth").toString().trim();
+		}
+		String fgsdmManth="";
+		if(map.get("fgsdmManth")!=null){
+			fgsdmManth=map.get("fgsdmManth").toString().trim();
+		}
+
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> list = clacMixService.calcjsyspy(line, startDate, endDate, empnames, cont, gsdmManth, fgsdmManth);
+		
+		Map<String, Object> temp = new HashMap<String, Object>();
+		temp.put("i", "序号");
+		temp.put("jName", empnames);
+		temp.put("jhyybc", "计划营运班次");
+		temp.put("jhfyybc", "计划空驶班次");
+		temp.put("sjyybc", "实际营运班次");
+		temp.put("sjfyybc", "实际空驶班次");
+		temp.put("lbbc", "烂班班次");
+		temp.put("ljbc", "临加班次");
+		temp.put("jhzlc", "计划总里程");
+		temp.put("jhyylc", "计划营运里程");
+		temp.put("jhfyylc", "计划空驶里程");
+		temp.put("sjzlc", "实际总里程");
+		temp.put("sjyylc", "实际营运里程");
+		temp.put("sjfyylc", "实际空驶里程");
+		temp.put("lblc", "烂班里程");
+		temp.put("ljyylc", "临加营运里程");
+		temp.put("ljfyylc", "临加空驶里程");
+		resList.add(temp);
+		for(int i = 0; i < list.size(); i++){
+			temp = list.get(i);
+			temp.put("i", i+1);
+			resList.add(temp);
+		}
+		
+		String date = startDate.replaceAll("-", "");
+		if(!startDate.equals(endDate)){
+			date = startDate.replaceAll("-", "") + "-" + endDate.replaceAll("-", "");
+		}
+		
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String,Object> mm = new HashMap<String, Object>();
+		ReportUtils ee = new ReportUtils();
+		
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcjsyspy.xls",
+					path+"export/"+date+"-"+lineName+"-人车班次公里统计.xls");
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			e.printStackTrace();
+			resMap.put("status", ResponseCode.ERROR);
+		}
+		return resMap;
+	}
+
+	@RequestMapping(value = "/singledataExportTj", method = RequestMethod.GET)
+	public Map<String, Object> singledataExportTj(@RequestParam Map<String, Object> map) {
+		
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String lineName="";
+		if(map.get("lineName")!=null){
+			lineName=map.get("lineName").toString().trim();
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String tjtype="";
+		if(map.get("tjtype")!=null){
+			tjtype=map.get("tjtype").toString().trim();
+		}
+		String cont="";
+		if(map.get("cont")!=null){
+			cont=map.get("cont").toString().trim();
+		}
+		String gsdmSing="";
+		if(map.get("gsdmSing")!=null){
+			gsdmSing=map.get("gsdmSing").toString().trim();
+		}
+		String fgsdmSing="";
+		if(map.get("fgsdmSing")!=null){
+			fgsdmSing=map.get("fgsdmSing").toString().trim();
+		}
+
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> list = clacMixService.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing);
+		
+		Map<String, Object> temp = new HashMap<String, Object>();
+		temp.put("i", "序号");
+		temp.put("gS", "所属公司");
+		temp.put("xlName", "线路");
+		temp.put("jName", tjtype);
+		temp.put("jhzlc", "计划公里");
+		temp.put("sjzlc", "行驶里程(包括空放)");
+		temp.put("sjfyylc", "空驶里程");
+		temp.put("hyl", "耗油量");
+		temp.put("jzl", "加注量");
+		temp.put("sh", "非营业用油");
+		
+		resList.add(temp);
+		for(int i = 0; i < list.size(); i++){
+			temp = list.get(i);
+			temp.put("i", i+1);
+			if(temp.get("xlName") == null){
+				temp.put("xlName", "");
+			}
+			resList.add(temp);
+		}
+		
+		String date = startDate.replaceAll("-", "");
+		if(!startDate.equals(endDate)){
+			date = startDate.replaceAll("-", "") + "-" + endDate.replaceAll("-", "");
+		}
+		
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String,Object> mm = new HashMap<String, Object>();
+		ReportUtils ee = new ReportUtils();
+		
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcsingledata.xls",
+					path+"export/"+date+"-"+lineName+"-路单数据(统计).xls");
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			e.printStackTrace();
+			resMap.put("status", ResponseCode.ERROR);
+		}
+		return resMap;
+	}
+	
+}
+package com.bsth.controller.calc;
+
+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.service.calc.CalcMixService;
+
+@RestController
+@RequestMapping("calc_mix")
+public class CalcMixController {
+	
+	@Autowired
+	CalcMixService service;
+
+	@RequestMapping(value="/calcjsyspy")
+	public List<Map<String, Object>> calcjsyspy(@RequestParam Map<String, Object> map){
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String empnames="";
+		if(map.get("empnames")!=null){
+			empnames=map.get("empnames").toString().trim();
+		}
+		String cont="";
+		if(map.get("cont")!=null){
+			cont=map.get("cont").toString().trim();
+		}
+		String gsdmManth="";
+		if(map.get("gsdmManth")!=null){
+			gsdmManth=map.get("gsdmManth").toString().trim();
+		}
+		String fgsdmManth="";
+		if(map.get("fgsdmManth")!=null){
+			fgsdmManth=map.get("fgsdmManth").toString().trim();
+		}
+		return service.calcjsyspy(line, startDate, endDate, empnames, cont, gsdmManth, fgsdmManth);
+	}
+
+	@RequestMapping(value = "/singledatatj", method = RequestMethod.GET)
+	public List<Map<String, Object>> singledatatj(@RequestParam Map<String, Object> map) {
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String tjtype="";
+		if(map.get("tjtype")!=null){
+			tjtype=map.get("tjtype").toString().trim();
+		}
+		String cont="";
+		if(map.get("cont")!=null){
+			cont=map.get("cont").toString().trim();
+		}
+		String gsdmSing="";
+		if(map.get("gsdmSing")!=null){
+			gsdmSing=map.get("gsdmSing").toString().trim();
+		}
+		String fgsdmSing="";
+		if(map.get("fgsdmSing")!=null){
+			fgsdmSing=map.get("fgsdmSing").toString().trim();
+		}
+		return service.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing);
+	}
+	
+}
@@ -152,7 +152,11 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			m.put("rq", y.getRq());
 			m.put("gsname",y.getGsname() );
 			m.put("fgsname", y.getFgsname());
-			m.put("xlname", y.getXlname());
+			if(y.getLinename()==null){
+				m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			}else{
+				m.put("xlname", y.getLinename());
+			}			
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
@@ -255,7 +255,11 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("rq", sdfMonth.format(y.getRq()));
 			m.put("gsname",y.getGsname() );
 			m.put("fgsname", y.getFgsname());
-			m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			if(y.getLinename()==null){
+				m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			}else{
+				m.put("xlname", y.getLinename());
+			}
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.report.ReportService;
 import com.bsth.util.ReportUtils;
@@ -357,10 +358,17 @@ public class ReportController {
 		return lMap;
 	}
-	
-	
 	@RequestMapping(value="/online")
 	public Map<String, Object> online(@RequestParam Map<String, Object> map){
 		return service.online(map);
 	}
+	
+	
+	
+	@RequestMapping(value = "/singledatatj", method = RequestMethod.GET)
+	public List<Singledata> singledatatj(@RequestParam Map<String, Object> map) {
+
+		return service.singledatatj(map);
+	}
+	
 }
@@ -55,6 +55,7 @@ public class BasicData {
     //线路编码和名称对照
     public static Map<String, String> lineCode2NameMap;
+    public static Map<String, String> lineCodeAllNameMap;
     //停车场
     public static List<String> parkCodeList;
@@ -315,6 +316,14 @@ public class BasicData {
             lineId2ShangHaiCodeMap = id2SHcode;
             lineCode2ShangHaiCodeMap = code2SHcode;
             stationName2YgcNumber = tempStationName2YgcNumber;
+            
+            Map<String, String> code2nameAll = new HashMap<>();
+            Iterator<Line> iteratorAll = lineRepository.findAll().iterator();
+            while (iteratorAll.hasNext()) {
+                line = iteratorAll.next();
+                code2nameAll.put(line.getLineCode(), line.getName());
+            }
+            lineCodeAllNameMap=code2nameAll;
         }
         /**
@@ -22,6 +22,7 @@ public class Dlb {
 	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private Date rq;
 	private String xlbm;
+	private String linename;
 	private String ssgsdm;
 	private String fgsdm;
 	private String nbbm;
@@ -102,6 +103,14 @@ public class Dlb {
 		this.xlbm = xlbm;
 	}
+	public String getLinename() {
+		return linename;
+	}
+
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+
 	public String getSsgsdm() {
 		return ssgsdm;
 	}
@@ -348,7 +357,7 @@ public class Dlb {
 	}
 	public String getXlname() {
-		return BasicData.lineCode2NameMap.get(this.xlbm);
+		return BasicData.lineCodeAllNameMap.get(this.xlbm);
 	}
 	public void setXlname(String xlname) {
@@ -22,6 +22,7 @@ public class Ylb {
 	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private Date rq;
 	private String xlbm;
+	private String linename;
 	private String ssgsdm;
 	private String fgsdm;
 	private String nbbm;
@@ -95,6 +96,15 @@ public class Ylb {
 	public void setXlbm(String xlbm) {
 		this.xlbm = xlbm;
 	}
+	
+	public String getLinename() {
+		return linename;
+	}
+
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+
 	public String getSsgsdm() {
 		return ssgsdm;
 	}
@@ -292,7 +302,7 @@ public class Ylb {
 	}
 	public String getXlname() {
-		return BasicData.lineCode2NameMap.get(this.xlbm);
+		return BasicData.lineCodeAllNameMap.get(this.xlbm);
 	}
 	public void setXlname(String xlname) {
@@ -51,6 +51,8 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	@Query("SELECT L FROM Line L where L.destroy=0 and L.remove !=1")
 	List<Line> findAllService();
+	@Query("SELECT L FROM Line L")
+	List<Line> findAll();
 	@Modifying
 	@Query(value = "UPDATE Line l set l.name=?1 , l.company=?2, l.brancheCompany=?3, "
@@ -58,4 +58,15 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1")
 	List<ScheduleRealInfo> findAllScheduleByDate(String schDate);
+	
+	//按照时间段统计，公司下线路 (驾驶员)
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and CONCAT(jGh,'/',jName) like %?6% order by c.xl")
+	List<CalcWaybill> scheduleByJsy(String line,String date,String date2,String gsdm,String fgsdm,String jsy);
+	//按照时间段统计，公司下线路 (售票员)
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and CONCAT(sGh,'/',sName) like %?6% order by c.xl")
+	List<CalcWaybill> scheduleBySpy(String line,String date,String date2,String gsdm,String fgsdm,String spy);
+	//按照时间段统计，公司下线路 (车辆自编号)
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and cl like %?6% order by c.xl")
+	List<CalcWaybill> scheduleByZbh(String line,String date,String date2,String gsdm,String fgsdm,String zbh);
+
 }
@@ -22,8 +22,8 @@ public interface CwjyRepository extends BaseRepository&lt;Cwjy, Integer&gt;{
 	 */
 	@Query(value="SELECT a.gsdm as gsdm,a.nbbm as nbbm,b.jsy as jsy,b.jzl as jzl ,b.stationid as stationid,"
 			+ "b.nylx as nylx,b.yj as yj,b.bz as bz,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
-   " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days(?1) and jylx=1) b " +
-  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  from bsth_c_ylb where  to_days(rq)= to_days(?1 ) group by nbbm "+
+   " left  join ( select * from bsth_c_ylxxb b where b.yyrq=?1 and jylx=1) b " +
+  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  from bsth_c_ylb where rq= ?1  group by nbbm "+
    " ) c on a.nbbm=c.nbbm  where  a.nbbm like %?2% ",nativeQuery=true)
 	List<Object[]> obtainCwjycl(String rq,String nbbm);
@@ -28,13 +28,13 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+	@Query(value="SELECT * FROM bsth_c_dlb  where rq=?1 and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc",nativeQuery=true)
 	List<Dlb> obtainDl(String rq,String gsbm,String fgsdm,String xlbm,String nbbm,String px);
 	@Query(value="select s from Dlb s "
-			+ " where to_days(?1)=to_days(s.rq) "
+			+ " where to_days(s.rq)=to_days(?1) "
 			+ " and s.ssgsdm like %?2% "
 			+ " and s.fgsdm like %?3%"
 			+ " and s.xlbm like %?4% "
@@ -49,14 +49,14 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Query(value="select nbbm,count(nbbm) from bsth_c_dlb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,count(nbbm) from bsth_c_dlb where rq=?1 and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
 			+ " group by nbbm,rq,ssgsdm,fgsdm",nativeQuery=true)
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
-	@Query(value="select nbbm,sum(cdl*100) as cdl ,sum(zlc*100) as zlc from bsth_c_dlb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,sum(cdl*100) as cdl ,sum(zlc*100) as zlc from bsth_c_dlb where rq= ?1 and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
@@ -66,7 +66,7 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	@Query(value="select cdl,hd,sh from Dlb s "
-			+ " where to_days(?1)=to_days(s.rq)  "
+			+ " where  to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm like %?2% "
 			+ " and s.fgsdm like %?3%"
 			+ " and s.xlbm like %?4% "
@@ -74,7 +74,7 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	List<Object[]> sumDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
 	@Query(value="select ifnull(cdl,0),ifnull(hd,0),ifnull(sh,0) from bsth_c_dlb "
-			+ " where to_days(?1)=to_days(rq) "
+			+ " where rq=?1 "
 			+ " and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% "
@@ -93,10 +93,10 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 				" WHERE id = ?1", nativeQuery=true)
 	public void dlbUpdate(Integer id,double czcd,double jzcd,double hd, double sh,String shyy,int yhlx);
-	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_dlb  where rq=?1 and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
 	List<Dlb> queryListDlb(String rq,String nbbm,String jgh,String xlbm);
-	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and xlbm=?2",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_dlb  where rq=?1 and xlbm=?2",nativeQuery=true)
 	List<Dlb> queryDlbByRqXlbm(String rq, String xlbm);
 }
@@ -22,7 +22,7 @@ public interface LsylbRepository extends BaseRepository&lt;Lsylb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Query(value="select nbbm,count(nbbm) from bsth_ls_ylb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,count(nbbm) from bsth_ls_ylb where rq=?1 and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5%  and nylx= ?6 "
@@ -30,7 +30,7 @@ public interface LsylbRepository extends BaseRepository&lt;Lsylb, Integer&gt;{
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int nylx);
 	@Query(value="select s from Lsylb s "
-			+ " where to_days(?1)=to_days(s.rq) "
+			+ " where to_days(s.rq)=to_days(?1) "
 			+ " and s.ssgsdm =?2 "
 			+ " and s.fgsdm =?3 "
 			+ " and s.xlbm like %?4% "
@@ -38,7 +38,7 @@ public interface LsylbRepository extends BaseRepository&lt;Lsylb, Integer&gt;{
 			+ " and s.nbbm in ?6 order by nbbm,jhsj")
 	List<Lsylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,int nylx,List<String> listNbbm);
-	@Query(value="select nbbm,sum(jzl*100) as jzl ,sum(zlc*100) as zlc from bsth_ls_ylb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,sum(jzl*100) as jzl ,sum(zlc*100) as zlc from bsth_ls_ylb where rq=?1 and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% and nylx =?6 "
@@ -47,7 +47,7 @@ public interface LsylbRepository extends BaseRepository&lt;Lsylb, Integer&gt;{
 	@Query(value="select ifnull(jzl,0),ifnull(yh,0),ifnull(sh,0) from bsth_ls_ylb "
-			+ " where to_days(?1)=to_days(rq) "
+			+ " where rq=?1 "
 			+ " and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% "
@@ -57,7 +57,7 @@ public interface LsylbRepository extends BaseRepository&lt;Lsylb, Integer&gt;{
 	@Query(value="select jzl,yh,sh from Lsylb s "
-			+ " where to_days(?1)=to_days(s.rq)  "
+			+ " where  to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm like %?2% "
 			+ " and s.fgsdm like %?3%"
 			+ " and s.xlbm like %?4% "
@@ -33,7 +33,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select y.* from (select max(d.id) as id ,d.nbbm from ("
 			+ " select b.rq,b.nbbm,max(b.jcsx) as jcsx from ("
 			+ " select max(t.rq) as rq ,t.nbbm   from bsth_c_ylb t "
-			+ " where to_days(t.rq)< to_days(?1) "
+			+ " where t.rq< ?1 "
 			+ " and t.ssgsdm like %?2% and t.fgsdm like %?3%  "
 			+ " and t.xlbm like %?4%  and t.nbbm like %?5% group by nbbm ) a "
 			+ " left join bsth_c_ylb b on  a.rq=b.rq and a.nbbm=b.nbbm "
@@ -63,29 +63,29 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+	@Query(value="SELECT * FROM bsth_c_ylb  where rq=?1 and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
 	List<Ylb> obtainYl(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+	@Query(value="SELECT * FROM bsth_c_ylb  where  rq=?1  and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm = ?4 and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
 	List<Ylb> obtainYlEq(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+	@Query(value="SELECT * FROM bsth_c_ylb  where  rq=?1  and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm = ?4 and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
 	List<Ylb> obtainYl_eq(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylb  where  rq=?1  and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
 	List<Ylb> queryListYlb(String rq,String nbbm,String jgh,String xlbm);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and xlbm=?2",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylb  where  rq=?1  and xlbm=?2",nativeQuery=true)
 	List<Ylb> queryYlbByRqXlbm(String rq,String xlbm);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4 order by ?5 asc",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylb  where  rq=?1 and nbbm =?2 and jsy=?3 and xlbm=?4 order by ?5 asc",nativeQuery=true)
 	List<Ylb> checkYlb(String rq,String nbbm,String jgh,String xlbm,String px);
 	/**
 	 * 查询当天总的加注量和总里程
@@ -102,7 +102,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Query(value="select nbbm,count(nbbm) from bsth_c_ylb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,count(nbbm) from bsth_c_ylb where  rq=?1  and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
@@ -117,7 +117,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Query(value="select nbbm,sum(jzl*100) as jzl ,sum(zlc*100) as zlc from bsth_c_ylb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,sum(jzl*100) as jzl ,sum(zlc*100) as zlc from bsth_c_ylb where  rq=?1  and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
@@ -126,7 +126,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select jzl,yh,sh from Ylb s "
-			+ " where to_days(?1)=to_days(s.rq)  "
+			+ " where to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm like %?2% "
 			+ " and s.fgsdm like %?3%"
 			+ " and s.xlbm like %?4% "
@@ -134,7 +134,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Object[]> sumYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
 	@Query(value="select ifnull(jzl,0),ifnull(yh,0),ifnull(sh,0) from bsth_c_ylb "
-			+ " where to_days(?1)=to_days(rq) "
+			+ " where  rq=?1  "
 			+ " and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% "
@@ -144,7 +144,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select s from Ylb s "
-			+ " where to_days(?1)=to_days(s.rq) "
+			+ " where  to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm =?2 "
 			+ " and s.fgsdm =?3 "
 			+ " and s.xlbm like %?4% "
+package com.bsth.service.calc;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by 19/02/28.
+ */
+public interface CalcMixService {
+	
+	List<Map<String, Object>> calcjsyspy(String line, String startDate, String endDate, String cont, String empnames, String gsdmManth, String fgsdmManth);
+	
+	List<Map<String, Object>> singledatatj(String line, String startDate, String endDate, String tjtype, String cont, String gsdmSing, String fgsdmSing);
+	
+}
+package com.bsth.service.calc.impl;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.entity.mcy_forms.Singledata;
+import com.bsth.repository.calc.CalcWaybillRepository;
+import com.bsth.service.calc.CalcMixService;
+import com.bsth.util.Arith;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by 19/02/28.
+ */
+@Service
+public class CalcMixServiceImpl implements CalcMixService {
+	
+	@Autowired
+	private CalcWaybillRepository calcRepository;
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+    
+
+	@Override
+	public List<Map<String, Object>> calcjsyspy(String line, String date, String date2,
+			String empnames, String cont, String gsdm, String fgsdm) {
+		
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<CalcWaybill> list = null;
+		
+		int flag = 0;
+		if("驾驶员".equals(empnames)){
+			flag = 1;
+			list = calcRepository.scheduleByJsy(line, date, date2, gsdm, fgsdm, cont);
+		} else if("售票员".equals(empnames)){
+			flag = 2;
+			list = calcRepository.scheduleBySpy(line, date, date2, gsdm, fgsdm, cont);
+		} else if("车辆自编号".equals(empnames)){
+			flag = 3;
+			list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont);
+		}
+		
+		List<CalcWaybill> calcList = new ArrayList<CalcWaybill>();
+		Map<String, CalcWaybill> calcMap = new HashMap<String, CalcWaybill>();
+		
+		CalcWaybill zjCalc = this.initCalcWaybill();
+		zjCalc.setjName("合计");
+		for(CalcWaybill c : list){
+			String key = "";
+			if(flag == 1){
+				if(c.getjGh() != null && c.getjName() != null)
+					key = c.getjGh() + "/" + c.getjName();
+			} else if(flag == 2){
+				if(c.getsGh() != null && c.getsName() != null)
+					key = c.getsGh() + "/" + c.getsName();
+			} else if(flag == 3){
+				if(c.getCl() != null)
+				key = c.getCl();
+			}
+			
+			if(key.trim().length() == 0 || "/".equals(key))
+				continue;
+			
+			CalcWaybill calc = null;
+			if(calcMap.containsKey(key)){
+				calc = calcMap.get(key);
+			} else {
+				calc = this.initCalcWaybill();
+				calc.setjName(key);
+				calcList.add(calc);
+				calcMap.put(key, calc);
+			}
+			
+			this.summation(calc, c);
+			
+			this.summation(zjCalc, c);
+			
+		}
+		calcList.add(zjCalc);
+		calcMap.put("合计", zjCalc);
+		
+		for(CalcWaybill c : calcList){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("jName", c.getjName());
+			m.put("jhyybc", c.getJhyybc());
+			m.put("jhfyybc", c.getJhfyybc());
+			m.put("sjyybc", c.getSjyybc());
+			m.put("sjfyybc", c.getSjfyybc());
+			m.put("lbbc", c.getLbbc());
+			m.put("ljbc", c.getLjbc());
+			m.put("jhzlc", Arith.add(c.getJhyylc(), c.getJhfyylc()));
+			m.put("jhyylc", c.getJhyylc());
+			m.put("jhfyylc", c.getJhfyylc());
+			m.put("sjzlc", Arith.add(c.getSjyylc(), c.getSjfyylc()));
+			m.put("sjyylc", c.getSjyylc());
+			m.put("sjfyylc", c.getSjfyylc());
+			m.put("lblc", c.getLblc());
+			m.put("ljyylc", c.getLjyylc());
+			m.put("ljfyylc", c.getLjfyylc());
+			resList.add(m);
+		}
+		
+		return resList;
+	}
+	
+	public CalcWaybill initCalcWaybill(){
+		CalcWaybill calc = new CalcWaybill();
+		calc.setJhyybc(0);
+		calc.setJhyylc(0d);
+		calc.setJhfyybc(0);
+		calc.setJhfyylc(0d);
+		calc.setSjyybc(0);
+		calc.setSjyylc(0d);
+		calc.setSjfyybc(0);
+		calc.setSjfyylc(0d);
+		calc.setLbbc(0);
+		calc.setLblc(0d);
+		calc.setLjbc(0);
+		calc.setLjyylc(0d);
+		calc.setLjfyylc(0d);
+		return calc;
+	}
+
+	public CalcWaybill summation(CalcWaybill c1, CalcWaybill c2){
+		c1.setJhyybc(c1.getJhyybc() + c2.getJhyybc());
+		c1.setJhyylc(Arith.add(c1.getJhyylc(), c2.getJhyylc()));
+		c1.setJhfyybc(c1.getJhfyybc() + c2.getJhfyybc());
+		c1.setJhfyylc(Arith.add(c1.getJhfyylc(), c2.getJhfyylc()));
+		c1.setSjyybc(c1.getSjyybc() + c2.getSjyybc());
+		c1.setSjyylc(Arith.add(c1.getSjyylc(), c2.getSjyylc()));
+		c1.setSjyylc(Arith.add(c1.getSjyylc(), c2.getLjyylc()));
+		c1.setSjfyybc(c1.getSjfyybc() + c2.getSjfyybc());
+		c1.setSjfyylc(Arith.add(c1.getSjfyylc(), c2.getSjfyylc()));
+		c1.setSjfyylc(Arith.add(c1.getSjfyylc(), c2.getLjfyylc()));
+		c1.setLbbc(c1.getLbbc() + c2.getLbbc());
+		c1.setLblc(Arith.add(c1.getLblc(), c2.getLblc()));
+		c1.setLjbc(c1.getLjbc() + c2.getLjbc());
+		c1.setLjyylc(Arith.add(c1.getLjyylc(), c2.getLjyylc()));
+		c1.setLjfyylc(Arith.add(c1.getLjfyylc(), c2.getLjfyylc()));
+		return c1;
+	}
+
+	@Override
+	public List<Map<String, Object>> singledatatj(String line,
+			String date, String date2,
+			String tjtype, String cont,
+			String gsdm, String fgsdm) {
+		
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<CalcWaybill> list = null;
+		
+		int flag = 0;
+		if("驾驶员".equals(tjtype)){
+			flag = 1;
+			list = calcRepository.scheduleByJsy(line, date, date2, gsdm, fgsdm, cont);
+		} else if("售票员".equals(tjtype)){
+			flag = 2;
+			list = calcRepository.scheduleBySpy(line, date, date2, gsdm, fgsdm, cont);
+		} else if("车辆自编号".equals(tjtype)){
+			flag = 3;
+			list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont);
+		}
+		
+		List<CalcWaybill> calcList = new ArrayList<CalcWaybill>();
+		Map<String, CalcWaybill> calcMap = new HashMap<String, CalcWaybill>();
+		
+		CalcWaybill zjCalc = this.initCalcWaybill();
+		zjCalc.setjName("合计");
+		for(CalcWaybill c : list){
+			String key = "";
+			if(flag == 1){
+				if(c.getjGh() != null && c.getjName() != null)
+					key += c.getjGh() + "/" + c.getjName();
+			} else if(flag == 2){
+				if(c.getsGh() != null && c.getsName() != null)
+					key += c.getsGh() + "/" + c.getsName();
+			} else if(flag == 3){
+				if(c.getCl() != null)
+				key += c.getCl();
+			}
+			
+			if(key.trim().length() == 0 || "/".equals(key))
+				continue;
+			
+			String jName = key;
+			key = c.getXl() + "/" + key;
+			
+			CalcWaybill calc = null;
+			if(calcMap.containsKey(key)){
+				calc = calcMap.get(key);
+			} else {
+				calc = this.initCalcWaybill();
+				calc.setXlName(c.getXlName());
+				calc.setXl(c.getXl());
+				calc.setjName(jName);
+				calcList.add(calc);
+				calcMap.put(key, calc);
+			}
+			
+			this.summation(calc, c);
+			
+			this.summation(zjCalc, c);
+			
+		}
+		calcList.add(zjCalc);
+		calcMap.put("合计", zjCalc);
+		
+		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
+		for(CalcWaybill c : calcList){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("gS", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+			m.put("xl", c.getXl());
+			m.put("xlName", c.getXlName());
+			m.put("jName", c.getjName());
+			m.put("jhyybc", c.getJhyybc());
+			m.put("jhfyybc", c.getJhfyybc());
+			m.put("sjyybc", c.getSjyybc());
+			m.put("sjfyybc", c.getSjfyybc());
+			m.put("lbbc", c.getLbbc());
+			m.put("ljbc", c.getLjbc());
+			m.put("jhzlc", Arith.add(c.getJhyylc(), c.getJhfyylc()));
+			m.put("jhyylc", c.getJhyylc());
+			m.put("jhfyylc", c.getJhfyylc());
+			m.put("sjzlc", Arith.add(c.getSjyylc(), c.getSjfyylc()));
+			m.put("sjyylc", c.getSjyylc());
+			m.put("sjfyylc", c.getSjfyylc());
+			m.put("lblc", c.getLblc());
+			m.put("ljyylc", c.getLjyylc());
+			m.put("ljfyylc", c.getLjfyylc());
+			if(flag != 2){
+				m.put("hyl", 0);
+				m.put("jzl", 0);
+				m.put("sh", 0);
+			}
+			resList.add(m);
+			keyMap.put(c.getXl() + "/" + c.getjName(), m);
+		}
+		
+		String linesql="";
+	    if(!line.equals("")){
+	    	linesql +=" and xlbm ='"+line+"' ";
+	    }
+	    if(!gsdm.equals("")){
+	    	linesql +=" and ssgsdm ='"+gsdm+"' ";
+	    }
+	    if(!fgsdm.equals("")){
+	    	linesql +=" and fgsdm ='"+fgsdm+"' ";
+	    }
+		String nysql="SELECT id,xlbm,nbbm,jsy,jzl as jzl,yh as yh,sh as sh,fgsdm FROM bsth_c_ylb"
+				+ " WHERE rq >= '"+date+"' and rq <= '"+date2+"'"
+				+ linesql
+				+ " union"
+				+ " SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh,fgsdm FROM bsth_c_dlb"
+				+ " WHERE rq >= '"+date2+"' and rq <= '"+date2+"'"
+				+ linesql;
+		List<Singledata> listNy = jdbcTemplate.query(nysql, new RowMapper<Singledata>() {
+			@Override
+			public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Singledata sin = new Singledata();
+				sin.setxL(arg0.getString("xlbm"));
+				sin.setJsy(arg0.getString("jsy"));
+				sin.setClzbh(arg0.getString("nbbm"));
+				sin.setJzl(arg0.getString("jzl"));
+				sin.setHyl(arg0.getString("yh"));
+				sin.setUnyyyl(arg0.getString("sh"));
+				sin.setgS(arg0.getString("fgsdm"));
+				return sin;
+			}
+		});
+		
+		if(flag != 2){
+			Map<String, Object> last = resList.get(resList.size()-1);
+			last.put("hyl", 0);
+			last.put("jzl", 0);
+			last.put("sh", 0);
+			
+			//统计油，电表中手动添加的或者有加注没里程的数据
+			for (int i = 0; i < listNy.size(); i++) {
+				Singledata sin_=listNy.get(i);
+				String xl=sin_.getxL();
+				String str = "";
+				if(flag == 1){
+					str = sin_.getJsy() + "/" + BasicData.allPerson.get(gsdm+"-"+sin_.getJsy());
+				} else {
+					str = sin_.getClzbh();
+				}
+//				boolean fages=true;
+				if(keyMap.containsKey(xl + "/" + str)){
+					Map<String, Object> m = keyMap.get(xl + "/" + str);
+					m.put("hyl", Arith.add(m.get("hyl"), sin_.getHyl()!=null?sin_.getHyl():0));
+					m.put("jzl", Arith.add(m.get("jzl"), sin_.getJzl()!=null?sin_.getJzl():0));
+					m.put("sh", Arith.add(m.get("sh"), sin_.getUnyyyl()!=null?sin_.getUnyyyl():0));
+					last.put("hyl", Arith.add(last.get("hyl"), m.get("hyl")));
+					last.put("jzl", Arith.add(last.get("jzl"), m.get("jzl")));
+					last.put("sh", Arith.add(last.get("sh"), m.get("sh")));
+				} else {
+					Map<String, Object> m = new HashMap<String, Object>();
+					m.put("gS", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+					m.put("xl", xl);
+					m.put("xlName", BasicData.lineCodeAllNameMap.get(xl));
+					m.put("jName", str);
+					m.put("jhzlc", 0);
+					m.put("sjzlc", 0);
+					m.put("sjfyylc", 0);
+					m.put("hyl", sin_.getHyl()!=null?sin_.getHyl():0);
+					m.put("jzl", sin_.getJzl()!=null?sin_.getJzl():0);
+					m.put("sh", sin_.getUnyyyl()!=null?sin_.getUnyyyl():0);
+					last.put("hyl", Arith.add(last.get("hyl"), m.get("hyl")));
+					last.put("jzl", Arith.add(last.get("jzl"), m.get("jzl")));
+					last.put("sh", Arith.add(last.get("sh"), m.get("sh")));
+					
+					keyMap.put(xl + "/" + str, m);
+				}
+			}
+			resList.remove(last);
+			resList.add(last);
+		}
+		
+		return resList;
+	}
+
+}
@@ -1729,7 +1729,7 @@ public class FormsServiceImpl implements FormsService {
 		startDate = map.get("startDate").toString();
 		String sql="select r.s_gh,r.s_name, "
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm,xl_name"
 				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
 		if(!xlbm.equals("")){
 			sql += " and r.xl_bm = '"+xlbm+"'";
@@ -1741,7 +1741,7 @@ public class FormsServiceImpl implements FormsService {
 			sql += " and r.fgs_bm='"+fgsdm+"'";
 		}
 		sql += " group  by  r.s_gh,r.s_name,"
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm,xl_name order by r.xl_bm,r.cl_zbh";
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1755,6 +1755,7 @@ public class FormsServiceImpl implements FormsService {
 				sin.setjName(arg0.getString("j_name"));
 				sin.setSgh(arg0.getString("s_gh"));
 				sin.setsName(arg0.getString("s_name"));
+				sin.setXlmc(arg0.getString("xl_name"));
 				sin.setgS(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs_bm")+"_"+arg0.getString("gs_bm")));
 				return sin;
@@ -1772,7 +1773,7 @@ public class FormsServiceImpl implements FormsService {
 			String clzbh=sin.getClzbh();
 			String xl=sin.getxL();
 			String spy=sin.getSgh();
-			sin.setxL(BasicData.lineCode2NameMap.get(xl));
+			sin.setxL(sin.getXlmc());
 			for (int j = 0; j < listReal.size(); j++) {
 				ScheduleRealInfo s=listReal.get(j);
 				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
@@ -1917,7 +1918,12 @@ public class FormsServiceImpl implements FormsService {
 						sin.setEmptMileage(String.valueOf(zksgl));
 						sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 						sin.setxL(y.getXlbm());
-						sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
+						if(y.getLinename()==null){
+							sin.setXlmc(y.getXlname());
+						}else{
+							sin.setXlmc(y.getLinename());
+						}
+						
 						sin.setClzbh(clzbh);
 						sin.setJsy(jsy);
 						sin.setrQ(startDate);
@@ -1999,8 +2005,11 @@ public class FormsServiceImpl implements FormsService {
 						sin.setEmptMileage(String.valueOf(zksgl));
 						sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 						sin.setxL(y.getXlbm());
-						sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
-						sin.setClzbh(clzbh);
+						if(y.getLinename()==null){
+							sin.setXlmc(y.getXlname());
+						}else{
+							sin.setXlmc(y.getLinename());
+						}						sin.setClzbh(clzbh);
 						sin.setJsy(jsy);
 						sin.setrQ(startDate);
 						if(newList.size()>0){
@@ -2024,7 +2033,7 @@ public class FormsServiceImpl implements FormsService {
 				list.addAll(listD);
 			}else{
 				String sql="select r.s_gh,r.s_name, "
-						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm"
+						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm,r.xl_name"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'"
 								+ " and r.s_gh !='' and r.s_gh is not null ";
@@ -2038,7 +2047,7 @@ public class FormsServiceImpl implements FormsService {
 					sql += " and r.fgs_bm='"+fgsdm+"'";
 				}
 				sql += " group  by  r.s_gh,r.s_name,"
-						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
+						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm,r.xl_name order by r.xl_bm,r.cl_zbh";
 				 list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 					//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -2050,6 +2059,7 @@ public class FormsServiceImpl implements FormsService {
 						sin.setClzbh(arg0.getString("cl_zbh"));
 						sin.setSgh(arg0.getString("s_gh"));
 						sin.setsName(arg0.getString("s_name"));
+						sin.setXlmc(arg0.getString("xl_name"));
 						return sin;
 					}
 				});
@@ -2059,6 +2069,7 @@ public class FormsServiceImpl implements FormsService {
 					String jsy=sin.getSgh();
 					String line=sin.getxL();
 					String clzbh=sin.getClzbh();
+					String xl_name=sin.getXlmc();
 					List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
 					List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
@@ -2091,7 +2102,7 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
+					sin.setXlmc(xl_name);
 					sin.setClzbh(clzbh);
 					sin.setJsy("");
 					sin.setjName("");
@@ -2197,8 +2208,11 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setxL(y.getXlbm());
-					sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
-					sin.setClzbh(clzbh);
+					if(y.getLinename()==null){
+						sin.setXlmc(y.getXlname());
+					}else{
+						sin.setXlmc(y.getLinename());
+					}					sin.setClzbh(clzbh);
 					sin.setJsy(jsy);
 					sin.setrQ(startDate);
 					if(newList.size()>0){
@@ -2279,7 +2293,11 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setxL(y.getXlbm());
-					sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
+					if(y.getLinename()==null){
+						sin.setXlmc(y.getXlname());
+					}else{
+						sin.setXlmc(y.getLinename());
+					}
 					sin.setClzbh(clzbh);
 					sin.setJsy(jsy);
 					sin.setrQ(startDate);
@@ -2304,7 +2322,7 @@ public class FormsServiceImpl implements FormsService {
 			list.addAll(listD);
 		}else{
 			String sql="select r.s_gh,r.s_name, "
-					+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm"
+					+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm,r.xl_name"
 					+ " from bsth_c_s_sp_info_real r where "
 					+ " r.schedule_date_str = '"+startDate+"'"
 					+ " and r.s_gh !='' and r.s_gh is not null ";
@@ -2318,7 +2336,7 @@ public class FormsServiceImpl implements FormsService {
 				sql += " and r.fgs_bm='"+fgsdm+"'";
 			}
 		       sql += " group  by  r.s_gh,r.s_name,"
-		       		+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
+		       		+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm,xl_name order by r.xl_bm,r.cl_zbh";
 			 list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 				//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -2330,6 +2348,7 @@ public class FormsServiceImpl implements FormsService {
 					sin.setClzbh(arg0.getString("cl_zbh"));
 					sin.setSgh(arg0.getString("s_gh"));
 					sin.setsName(arg0.getString("s_name"));
+					sin.setXlmc(arg0.getString("xl_name"));
 					return sin;
 				}
 			});
@@ -2339,6 +2358,7 @@ public class FormsServiceImpl implements FormsService {
 				String jsy=sin.getSgh();
 				String line=sin.getxL();
 				String clzbh=sin.getClzbh();
+				String xl_name=sin.getXlmc();
 				List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
 				List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
@@ -2372,7 +2392,7 @@ public class FormsServiceImpl implements FormsService {
 				sin.setEmptMileage(String.valueOf(zksgl));
 				sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-				sin.setXlmc(BasicData.lineCode2NameMap.get(line));
+				sin.setXlmc(xl_name);
 				sin.setClzbh(clzbh);
 				sin.setJsy("");
 				sin.setjName("");
@@ -505,7 +505,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			}
 			String key = schedule.getXlBm() + "/" + schedule.getXlName() + "/" + schedule.getQdzName()
-					+ "/" + schedule.getFgsName() + "/" + schedule.getFgsBm();
+					+ "/" + schedule.getFgsBm();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 			keyMap.get(key).add(schedule);
@@ -618,8 +618,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					tempMap.put("line", split[1]);
 					tempMap.put("qdz", split[2]);
 					tempMap.put("company", companyName);
-					tempMap.put("subCompany", split[3]);
-					tempMap.put("fgsbm", split[4]);
+					tempMap.put("subCompany", subCompanyName);
+					tempMap.put("fgsbm", split[3]);
 					long jhInterval = 0l;
 					long sjInterval = 0l;
 					for(Long i : fcsjs)
@@ -677,7 +677,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}else if(statu.equals("0")){
 			List<Long> longList = new ArrayList<Long>();
 			for(String key : keyList){
-				long xlBm = Long.valueOf(key.split("/")[4]) * 1000000l + Long.valueOf(key.split("/")[0]);
+				long xlBm = Long.valueOf(key.split("/")[3]) * 1000000l + Long.valueOf(key.split("/")[0]);
 				if(!longList.contains(xlBm))
 					longList.add(xlBm);
 				Collections.sort(longList);
@@ -685,7 +685,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(long xlBm : longList){
 				for(String key : keyList){
 					String[] split = key.split("/");
-					long kl = Long.valueOf(split[4]) * 1000000l + Long.valueOf(split[0]);
+					long kl = Long.valueOf(split[3]) * 1000000l + Long.valueOf(split[0]);
 					if(kl == xlBm){
 						Map<String, Object> tempMap = new HashMap<String, Object>();
 						List<Long> fcsjs = new ArrayList<Long>();
@@ -712,8 +712,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						tempMap.put("line", split[1]);
 						tempMap.put("qdz", split[2]);
 						tempMap.put("company", companyName);
-						tempMap.put("subCompany", split[3]);
-						tempMap.put("fgsbm", split[4]);
+						tempMap.put("subCompany", subCompanyName);
+						tempMap.put("fgsbm", split[3]);
 						tempMap.put("jhInterval", fcsjs.size()>0?df.format((double)fcsj/fcsjs.size()):"/");
 						tempMap.put("sjInterval", fcsjAs.size()>0?df.format((double)fcsjA/fcsjAs.size()):"/");
 						tempMap.put("MaxInterval", fcsjAs.size()>0?fcsjAs.get(fcsjAs.size() - 1):"/");
@@ -328,7 +328,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		}
 		String sql_ylb="SELECT nbbm,group_concat(jsy) AS jsy FROM bsth_c_ylb WHERE "
-				+ " to_days(rq) = to_days('"+rq+"') AND ssgsdm = '"+gsdm+"' AND "
+				+ " rq = '"+rq+"' AND ssgsdm = '"+gsdm+"' AND "
 				+ " fgsdm = '"+fgsdm+"' GROUP BY nbbm";
 		List<Map<String, String>> ylbList= jdbcTemplate.query(sql_ylb,
@@ -197,6 +197,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
 					t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
 					t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
+					t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
 					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 					t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 					t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
@@ -464,6 +465,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								t.setZlc(map.get("totalKilometers") == null ? 0.0
 										: Double.parseDouble(map.get("totalKilometers").toString()));
 								t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+								t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
 								t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 								t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
 								t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
@@ -884,7 +886,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			String px) {
 		// TODO Auto-generated method stub
 		String sql="SELECT * FROM bsth_c_dlb  "
-				+ " where to_days('"+rq+"')=to_days(rq) and ssgsdm like '%"+gsdm+"%' "
+				+ " where rq='"+rq+"' and ssgsdm like '%"+gsdm+"%' "
 				+ " and fgsdm like '%"+fgsdm+"%'";
 		if(xlbm.equals("")){
 			sql+= " and xlbm like '%"+xlbm+"%' ";
@@ -194,6 +194,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
 						t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString()));
 						t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
+						t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
 						t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 						t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 						t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
@@ -492,6 +493,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setZlc(map.get("totalKilometers") == null ? 0.0
 							: Double.parseDouble(map.get("totalKilometers").toString()));
 					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+					t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
 					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
 					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
@@ -3265,6 +3265,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          * 对计划发车时间相同的班次进行排序 out最前 in最后
          */
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        SimpleDateFormat sdfnyr =new SimpleDateFormat("yyyy-MM-dd");
         String minfcsj = "02:00";
         List<Line> lineList = lineRepository.findLineByCode(line);
         if (lineList.size() > 0) {
@@ -3293,9 +3294,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 Calendar calendar = new GregorianCalendar();
                 calendar.setTime(s.getScheduleDate());
                 calendar.add(calendar.DATE, 1);
-                s.setScheduleDate(calendar.getTime());
+                Date date_sch= calendar.getTime();
                 try {
-                    fscjT = sdf.parse(sdf.format(s.getScheduleDate()) + " " + s.getFcsj()).getTime();
+                    fscjT = sdf.parse(sdfnyr.format(date_sch) + " " + s.getFcsj()).getTime();
                 } catch (ParseException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
@@ -3307,15 +3308,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 } catch (ParseException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
-                }
-                ;
+                };
             }
             s.setFcsjT(fscjT);
         }
         List<ScheduleRealInfo> listInfo2=new ArrayList<ScheduleRealInfo>();
         listInfo2.addAll(listInfo);
         Collections.sort(listInfo, new compareLpFcsjType());
-        System.out.println(listInfo);
         Collections.sort(listInfo2,new compareDirLpFcsjType());
         for (int i = 0; i < listInfo.size(); i++) {
             ScheduleRealInfo t = listInfo.get(i);
@@ -3454,6 +3453,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          * 对计划发车时间相同的班次进行排序 out最前 in最后
          */
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        SimpleDateFormat sdfnyr = new SimpleDateFormat("yyyy-MM-dd");
+
         String minfcsj = "02:00";
         List<Line> lineList = lineRepository.findLineByCode(line);
         if (lineList.size() > 0) {
@@ -3482,9 +3483,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 Calendar calendar = new GregorianCalendar();
                 calendar.setTime(s.getScheduleDate());
                 calendar.add(calendar.DATE, 1);
-                s.setScheduleDate(calendar.getTime());
+                Date date_sch=calendar.getTime();
                 try {
-                    fscjT = sdf.parse(sdf.format(s.getScheduleDate()) + " " + s.getFcsj()).getTime();
+                    fscjT = sdf.parse(sdfnyr.format(date_sch) + " " + s.getFcsj()).getTime();
                 } catch (ParseException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
@@ -3773,6 +3774,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             boolean fage = true;
             String company = "";
             String bCompany = "";
+            String lineName="";
             List<ScheduleRealInfo> listS = new ArrayList<ScheduleRealInfo>();
             for (ScheduleRealInfo scheduleRealInfo : lists) {
                 if (scheduleRealInfo.getjGh().equals(jName)
@@ -3783,6 +3785,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         //根据线路代码获取公司
                         company = scheduleRealInfo.getGsBm();
                         bCompany = scheduleRealInfo.getFgsBm();
+                        lineName = scheduleRealInfo.getXlName();
                         fage = false;
                     }
                     Set<ChildTaskPlan> cts = scheduleRealInfo.getcTasks();
@@ -3797,6 +3800,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             yesterdayDataList.get(x).put("company", company);
             yesterdayDataList.get(x).put("bCompany", bCompany);
+            yesterdayDataList.get(x).put("lineName", lineName);
             Double ljgl = culateMieageService.culateLjgl(listS);
             Double sjgl = culateMieageService.culateSjgl(listS);
             Double ksgl = culateMieageService.culateKsgl(listS);
@@ -4565,6 +4569,37 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 s.setSjlc(String.valueOf(sjlc));
                 s.setRemarks(remarks);
                 newList.add(s);
+                
+                if (!childTaskPlans.isEmpty()) {
+//                	Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					List<ChildTaskPlan> listit = new ArrayList<ChildTaskPlan>(childTaskPlans);
+					Collections.sort(listit, new ComparableChild());
+					for (int j = 0; j < listit.size(); j++) {
+						ScheduleRealInfo t = new ScheduleRealInfo();
+						ChildTaskPlan childTaskPlan = listit.get(j);
+						if (childTaskPlan.getCcId() == null) {
+							if (childTaskPlan.isDestroy()) {
+								t.setFcsjActual("");
+								t.setZdsjActual("");
+//								t.setJhlc(0.0);
+								t.setSjlc("0.0");
+							} else {
+								t.setFcsjActual(childTaskPlan.getStartDate());
+								t.setZdsjActual(childTaskPlan.getEndDate());
+//								t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+								t.setSjlc(String.valueOf(childTaskPlan.getMileage()));
+							}
+							t.setFcsj(childTaskPlan.getStartDate());
+							t.setZdsj(childTaskPlan.getEndDate());
+							t.setQdzName(childTaskPlan.getStartStationName());
+							t.setZdzName(childTaskPlan.getEndStationName());
+							t.setRemarks(childTaskPlan.getRemarks());
+							t.setAdjustExps("子");
+							newList.add(t);
+						}
+					}
+                }
+                
             }
         }
@@ -5,6 +5,7 @@ import java.util.Map;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -56,4 +57,6 @@ public interface ReportService {
 	 List<Map<String, Object>> countDjg(Map<String, Object> map);
 	 Map<String, Object> online(Map<String, Object> map);
+	 
+	 List<Singledata> singledatatj(Map<String, Object> map);
  }
@@ -6,6 +6,7 @@ import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
 import com.bsth.entity.mcy_forms.Daily;
+import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -52,6 +53,9 @@ public class ReportServiceImpl implements ReportService{
 	private Logger logger = LoggerFactory.getLogger(this.getClass());
+	SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+            sdfSimple = new SimpleDateFormat("yyyyMMdd");
+	
 	@Autowired
 	JdbcTemplate jdbcTemplate;
@@ -65,7 +69,10 @@ public class ReportServiceImpl implements ReportService{
 	LineRepository lineRepository;
 	@Autowired
 	StationRouteRepository stationRouteRepository;
-
+	@Autowired
+	CulateMileageService culateMileageService;
+	
+	
 	@Override
 	public List<ScheduleRealInfo> queryListBczx(String line, String date,String clzbh) {
 		// TODO Auto-generated method stub
@@ -1895,7 +1902,7 @@ public class ReportServiceImpl implements ReportService{
 	            if(cts != null && cts.size() > 0){
 	            	lists.add(s);
 	            }else{
-		            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+		            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null && s.getZdsjActual().length() > 0 && s.getFcsjActual().length() > 0){
 		            	lists.add(s);
 		            }
 	            }
@@ -2633,7 +2640,7 @@ public class ReportServiceImpl implements ReportService{
 			if(cts != null && cts.size() > 0){
 				lists.add(s);
 			}else{
-				if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+				if(s.getZdsjActual()!=null && s.getFcsjActual()!=null && s.getZdsjActual().length() > 0 && s.getFcsjActual().length() > 0){
 					lists.add(s);
 				}
 			}
@@ -3243,7 +3250,7 @@ public class ReportServiceImpl implements ReportService{
 			            if(cts != null && cts.size() > 0){
 			            	type_=true;
 			            }else{
-				            if(sinfo.getZdsjActual()!=null && sinfo.getFcsjActual()!=null){
+				            if(sinfo.getZdsjActual()!=null && sinfo.getFcsjActual()!=null && sinfo.getZdsjActual().length() > 0 && sinfo.getFcsjActual().length() > 0){
 				            	type_=true;
 				            }
 			            }
@@ -3549,6 +3556,393 @@ public class ReportServiceImpl implements ReportService{
 		}
 		return list;
 	}
+	@Override
+	public List<Singledata> singledatatj(Map<String, Object> map) {
+		String sfyy="";
+		if(map.get("sfyy")!=null){
+			sfyy=map.get("sfyy").toString();
+		}
+		String gsdm="";
+		if(map.get("gsdmSing")!=null){
+			gsdm=map.get("gsdmSing").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdmSing")!=null){
+			fgsdm=map.get("fgsdmSing").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		String tjtype=map.get("tjtype").toString();
+		String xlbm=map.get("line").toString().trim();
+		String startDate = map.get("startDate").toString();
+		String endDate = map.get("endDate").toString();
+
+		List<ScheduleRealInfo> listReal=new ArrayList<ScheduleRealInfo>();
+		if(xlbm.equals("")){
+			listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj(xlbm, startDate, endDate, gsdm, fgsdm);
+		}else{
+			listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj2(xlbm, startDate, endDate);
+		}
+		List<Singledata> list=new ArrayList<Singledata>();
+		List<Singledata> list_=new ArrayList<Singledata>();
+		if(tjtype.equals("jsy")){
+			//油统计
+			String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.fgs_bm"
+					+ " from bsth_c_s_sp_info_real r where "
+					+ " r.schedule_date_str >= '"+startDate+"'"
+					+ " and r.schedule_date_str<='"+endDate+"'";
+			if(xlbm.length() != 0){
+				sql += " and r.xl_bm = '"+xlbm+"'";
+			}
+			if(gsdm.length() != 0){
+				sql += " and r.gs_bm ='"+gsdm+"'";
+			}
+			if(fgsdm.length() != 0){
+				sql += " and r.fgs_bm ='"+fgsdm+"'";
+			}
+		    sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh order by r.xl_bm,r.cl_zbh";
+		    
+		    list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
+				@Override
+				public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Singledata sin = new Singledata();
+					sin.setxL(arg0.getString("xl_bm"));
+					sin.setJsy(arg0.getString("j_gh"));
+					sin.setClzbh(arg0.getString("cl_zbh"));
+					sin.setgS(arg0.getString("fgs_bm"));
+					return sin;
+				}
+			});
+
+		    
+		    String linesql="";
+		    if(!xlbm.equals("")){
+		    	linesql +=" and xlbm ='"+xlbm+"' ";
+		    }
+		    if(!gsdm.equals("")){
+		    	linesql +=" and ssgsdm ='"+gsdm+"' ";
+		    }
+		    if(!fgsdm.equals("")){
+		    	linesql +=" and fgsdm ='"+fgsdm+"' ";
+		    }
+			/*String nysql="SELECT id,xlbm,nbbm,jsy,jzl as jzl,yh as yh,sh as sh,fgsdm FROM bsth_c_ylb"
+					+ " WHERE rq >= '"+startDate+"' and rq <='"+endDate+"'"
+					+ linesql
+					+ " union"
+					+ "  SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh,fgsdm FROM bsth_c_dlb"
+					+ " WHERE rq = '"+startDate+"' and rq <='"+endDate+"'"
+					+ linesql;*/
+		    
+		    String nysql="SELECT 'yh' as type,xlbm,nbbm,jsy,sum(jzl*1000)/1000 as jzl,"
+		    		+ " sum(yh*1000)/1000 as yh,"
+		    		+ " sum(sh*1000)/1000 as sh FROM "
+		    		+ "bsth_c_ylb  where  rq>='"+startDate+"' "
+		    		+ " and rq <='"+endDate+"' " +linesql
+		    		+ " group by xlbm ,nbbm,jsy "
+		    		+ " union SELECT 'dh' as type,xlbm,nbbm,jsy, "
+		    		+ " sum(cdl*1000)/1000 as jzl,sum(hd*1000)/1000 as yh,"
+		    		+ " sum(sh * 1000) / 1000 AS sh"
+		    		+ " FROM  bsth_c_dlb where rq>='"+startDate+"' "
+		    		+ " and rq <='"+endDate+"'" +linesql
+		    		+ " group by xlbm ,nbbm,jsy" ;
+
+			List<Singledata> listNy = jdbcTemplate.query(nysql, new RowMapper<Singledata>() {
+				@Override
+				public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Singledata sin = new Singledata();
+					sin.setxL(arg0.getString("xlbm"));
+					sin.setJsy(arg0.getString("jsy"));
+					sin.setClzbh(arg0.getString("nbbm"));
+					sin.setJzl(arg0.getString("jzl"));
+					sin.setHyl(arg0.getString("yh"));
+					sin.setUnyyyl(arg0.getString("sh"));
+					return sin;
+				}
+			});
+			//统计油，电表中手动添加的或者有加注没里程的数据
+			for (int i = 0; i < listNy.size(); i++) {
+				Singledata sin_=listNy.get(i);
+				String jsy=sin_.getJsy();
+				String line=sin_.getxL();
+				String clzbh=sin_.getClzbh();
+				boolean fages=true;
+				for (int j = 0; j < list.size(); j++) {
+					Singledata sin=list.get(j);
+					String jsy_=sin.getJsy();
+					String line_=sin.getxL();
+					String clzbh_=sin.getClzbh();
+					if(jsy.equals(jsy_)
+					 &&line.equals(line_)
+					 &&clzbh.equals(clzbh_)){
+						fages=false;
+					}
+				}
+				if(fages){
+					Singledata s=new Singledata();
+					s.setJsy(jsy);
+					s.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+					s.setClzbh(clzbh);
+					s.setSgh("");
+					s.setsName("");
+					s.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+					s.setxL(line);
+					s.setXlmc(BasicData.lineCodeAllNameMap.get(line));
+					s.setJzl(sin_.getJzl());
+					s.setHyl(sin_.getHyl());
+					s.setUnyyyl(sin_.getUnyyyl());
+					s.setJhlc("0.0");
+					s.setEmptMileage("0.0");
+					s.setJhjl("0.0");
+					if(startDate.equals(endDate))
+						s.setrQ(startDate);
+					else
+						s.setrQ(startDate+"-"+endDate);
+
+					list_.add(s);
+				}
+			}
+			for (int  i= 0; i < list.size(); i++) {
+				Singledata sin=list.get(i);
+				String jsy=sin.getJsy();
+				String line=sin.getxL();
+				String clzbh=sin.getClzbh();
+				double jzl=0.0;
+				double yh=0.0;
+				double sh=0.0;
+				for (int j = 0; j < listNy.size(); j++) {
+					Singledata y=listNy.get(j);
+					if(y.getJsy().equals(jsy)
+					  &&y.getClzbh().equals(clzbh)
+					  &&y.getxL().equals(line)){
+						jzl=Arith.add(jzl, y.getJzl());
+						yh=Arith.add(yh, y.getHyl());
+						sh=Arith.add(sh, y.getUnyyyl());
+					}
+				}
+				sin.setHyl(String.valueOf(yh));
+				sin.setJzl(String.valueOf(jzl));
+				sin.setUnyyyl(String.valueOf(sh));
+				
+				List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+				List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
+				for (int j = 0; j < listReal.size(); j++) {
+					ScheduleRealInfo s=listReal.get(j);
+					if(s.getjGh().equals(jsy)
+						&& s.getClZbh().equals(clzbh)
+						&&s.getXlBm().equals(line)){
+							newList.add(s);
+							Set<ChildTaskPlan> cts = s.getcTasks();
+				            if(cts != null && cts.size() > 0){
+				            	newList_.add(s);
+				            }else{
+					            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+					            	newList_.add(s);
+					            }
+				            }
+					}
+				}
+				double jhgl=culateMileageService.culateJhgl(newList);
+				double jhjcc=culateMileageService.culateJhJccgl(newList);
+				double yygl=culateMileageService.culateSjgl(newList_);
+				double ljgl=culateMileageService.culateLjgl(newList_);
+				double ksgl=culateMileageService.culateKsgl(newList_);
+				double jcgl=culateMileageService.culateJccgl(newList_);
+				
+				double zyygl=Arith.add(yygl, ljgl);
+				double zksgl=Arith.add(ksgl, jcgl);
+				sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
+				sin.setEmptMileage(String.valueOf(zksgl));
+				sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
+				if(newList.size()>0){
+					sin.setXlmc(newList.get(0).getXlName());
+					sin.setjName(newList.get(0).getjName());
+				}else{
+					sin.setXlmc(BasicData.lineCodeAllNameMap.get(line));
+					sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+
+				}	
+				if(startDate.equals(endDate))
+					sin.setrQ(startDate);
+				else
+					sin.setrQ(startDate+"-"+endDate);
+//				sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+				sin.setSgh("");
+				sin.setsName("");
+				sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+				list_.add(sin);
+				
+			}
+		}else{
+			String sql="select r.s_gh,r.s_name, "
+					+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm"
+					+ " from bsth_c_s_sp_info_real r where "
+					+ " r.schedule_date_str >= '"+startDate+"'"
+					+ " schedule_date_str <='"+endDate+"'"
+					+ " and r.s_gh !='' and r.s_gh is not null ";
+			if(!xlbm.equals("")){
+				sql += " and r.xl_bm = '"+xlbm+"'";
+			}
+			if(!gsdm.equals("")){
+				sql += " and r.gs_bm = '"+gsdm+"'";
+			}
+			if(!fgsdm.equals("")){
+				sql += " and r.fgs_bm = '"+fgsdm+"'";
+			}
+		    sql += " group  by  r.s_gh,r.s_name,"
+		       		+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
+		
+			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(startDate);
+					sin.setxL(arg0.getString("xl_bm"));
+					sin.setClzbh(arg0.getString("cl_zbh"));
+					sin.setSgh(arg0.getString("s_gh"));
+					sin.setsName(arg0.getString("s_name"));
+					sin.setgS(arg0.getString("fgs_bm"));
+					return sin;
+				}
+			});
+			
+			String spy="";
+			if(map.get("map")!=null){
+				spy=map.get("spy").toString();
+			}
+			for (int i = 0; i < list.size(); i++) {
+				Singledata sin=list.get(i);
+				sin.setrQ(startDate+"-"+endDate);
+				String jsy=sin.getSgh();
+				String line=sin.getxL();
+				String clzbh=sin.getClzbh();
+				List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+				List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
+
+				for (int j = 0; j < listReal.size(); j++) {
+					ScheduleRealInfo s=listReal.get(j);
+					if(s.getsGh().equals(jsy) && s.getClZbh().equals(clzbh)
+							&&s.getXlBm().equals(line)){
+						newList.add(s);
+						 Set<ChildTaskPlan> cts = s.getcTasks();
+				            if(cts != null && cts.size() > 0){
+				            	newList_.add(s);
+				            }else{
+					            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+					            	newList_.add(s);
+					            }
+				            }
+					}
+				}
+				double jhgl=culateMileageService.culateJhgl(newList);;
+				double jhjcc=culateMileageService.culateJhJccgl(newList);
+				double yygl=0.0;
+				double ljgl=0.0;
+				double zksgl=0.0;
+				if(spy.equals("zrw")){
+					yygl=culateMileageService.culateSjgl_spy(newList_);
+					ljgl=culateMileageService.culateLjgl_spy(newList_);
+					zksgl=culateMileageService.culateSjfyylc_spy(newList_);
+				}else{
+					yygl=culateMileageService.culateSjgl(newList_);
+					ljgl=culateMileageService.culateLjgl(newList_);
+					double ksgl=culateMileageService.culateKsgl(newList_);
+					double jcgl=culateMileageService.culateJccgl(newList_);
+					 zksgl=Arith.add(ksgl, jcgl);
+				}
+				double zyygl=Arith.add(yygl, ljgl);
+				sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
+				sin.setEmptMileage(String.valueOf(zksgl));
+				sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
+				if(newList.size()>0)
+					sin.setXlmc(newList.get(0).getXlName());
+				else
+					sin.setXlmc(BasicData.lineCodeAllNameMap.get(line));
+				sin.setClzbh(clzbh);
+				sin.setJsy("");
+				sin.setjName("");
+				sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+				sin.setHyl("");
+				sin.setJzl("");
+				sin.setUnyyyl("");
+				list_.add(sin);
+			}
+		}
+		
+		/*Map<String, Boolean> lineNature = lineService.lineNature();
+		List<Singledata> resList = new ArrayList<Singledata>();
+		for(Singledata s : list_){
+			String xlBm = s.getxL();
+			if(sfyy.length() != 0){
+				if(sfyy.equals("0")){
+					resList.add(s);
+				} else if(sfyy.equals("1")){
+					if(lineNature.containsKey(xlBm) && lineNature.get(xlBm)){
+						resList.add(s);
+					}
+				} else {
+					if(lineNature.containsKey(xlBm) && !lineNature.get(xlBm)){
+						resList.add(s);
+					}
+				}
+			} else {
+				resList.add(s);
+			}
+		}*/
+		
+		
+		 if (type.equals("export")) {
+		        List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		        ReportUtils ee = new ReportUtils();
+		        
+		        List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+				int i = 1;
+				for (Singledata l : list_) {
+					Map<String, Object> m = new HashMap<String, Object>();
+					m.put("i", i);
+					m.put("rQ", l.getrQ());
+					m.put("gS", l.getgS());
+					m.put("xL", l.getXlmc());
+					m.put("clzbh", l.getClzbh());
+					m.put("jsy", l.getJsy());
+					m.put("jName", l.getjName());
+					m.put("sgh", l.getSgh());
+					m.put("sName", l.getsName());
+					m.put("jhlc", l.getJhlc());
+					m.put("emptMileage", l.getEmptMileage());
+					m.put("hyl", l.getHyl());
+					m.put("jzl", l.getJzl());
+					m.put("unyyyl", l.getUnyyyl());
+					m.put("jhjl", l.getJhjl());
+					resList.add(m);
+					
+					i++;
+				}
+		        
+	            listI.add(resList.iterator());
+	            try {
+	            	String exportDate="";
+	  	            if(startDate.equals(endDate)){
+	  	            	exportDate =sdfSimple.format(sdfMonth.parse(startDate)) ;
+	  	            }else{
+	  	            	exportDate =sdfSimple.format(sdfMonth.parse(startDate))+"-"+sdfSimple.format(sdfMonth.parse(endDate)) ;
+	  	            }
+	  	          String  lineName = ""; 
+	  	          if(map.containsKey("lineName"))
+	  				lineName = map.get("lineName").toString();
+	  	          
+	  	          String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+	  	          ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls",
+	  					path + "export/" +exportDate
+	  					+ "-" + lineName + "-路单统计.xls");
+	            } catch (ParseException e) {
+	                e.printStackTrace();
+	            }
+	        }
+		return list_;
+	}
 }
@@ -385,9 +385,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 //			zgfEnd = sdf.parse(date + "08:30").getTime();
 //			wgfBegin = sdf.parse(date + "16:00").getTime();
 //			wgfEnd = sdf.parse(date + "18:00").getTime();
-			zgfBegin = 6l * 60l + 30l;
+			zgfBegin = 6l * 60l + 31l;
 			zgfEnd = 8l * 60l + 30l;
-			wgfBegin = 16l * 60l + 0l;
+			wgfBegin = 16l * 60l + 1l;
 			wgfEnd = 18l * 60l + 0l;
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
@@ -414,15 +414,23 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					subCompanyName = schedule.getFgsName();
 				//早晚高峰时段执行率
-				if(schedule.getFcsjT() >= zgfBegin && schedule.getFcsjT() <= zgfEnd){
-					jhzgf++;
-					if(schedule.getFcsjActual() != null)
+				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")){
+					if(schedule.getFcsjT() >= zgfBegin && schedule.getFcsjT() <= zgfEnd){
+						jhzgf++;
+					}
+					if(schedule.getFcsjActual() != null && !schedule.isDestroy()
+							&& schedule.getFcsjActualTime() >= zgfBegin
+							&& schedule.getFcsjActualTime() <= zgfEnd){
 						sjzgf++;
-				}
-				if(schedule.getFcsjT() >= wgfBegin && schedule.getFcsjT() <= wgfEnd){
-					jhwgf++;
-					if(schedule.getFcsjActual() != null)
+					}
+					if(schedule.getFcsjT() >= wgfBegin && schedule.getFcsjT() <= wgfEnd){
+						jhwgf++;
+					}
+					if(schedule.getFcsjActual() != null && !schedule.isDestroy()
+							&& schedule.getFcsjActualTime() >= wgfBegin
+							&& schedule.getFcsjActualTime() <= wgfEnd){
 						sjwgf++;
+					}
 				}
 				//班次数和出场数
@@ -1262,8 +1270,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		try {
 			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
-					+ " a.xl_bm, a.fgs_bm, a.cc_service, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
-					+ " where schedule_date_str = '"+date+"'"
+					+ " a.xl_bm, a.fgs_bm, a.cc_service, (select start_opt from bsth_c_line_config where id ="
+					+ " (select max(id) from bsth_c_line_config where line = (select id from bsth_c_line where line_code = a.xl_bm))) start_opt"
+					+ " from bsth_c_s_sp_info_real a where schedule_date_str = '"+date+"'"
 					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.trim().length() != 0)
 				sql += " and xl_bm = '"+line+"'";
@@ -1294,7 +1303,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setFgsBm(rs.getString("fgs_bm"));
 					schedule.setCcService(rs.getBoolean("cc_service"));
-					int startOpt = 0;
+					int startOpt = 120;
 					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
 						String[] split = rs.getString("start_opt").split(":");
 						startOpt = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
@@ -1533,9 +1542,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		try {
 			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_bm, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
-					+ " a.fgs_bm, a.cc_service, a.remarks, a.adjust_exps, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b "
-					+ " on a.xl_bm = b.line"
-					+ " where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"
+					+ " a.fgs_bm, a.cc_service, a.remarks, a.adjust_exps, (select start_opt from bsth_c_line_config where id = "
+					+ " (select max(id) from bsth_c_line_config where line = (select id from bsth_c_line where line_code = a.xl_bm))) start_opt"
+					+ " from bsth_c_s_sp_info_real a where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"
 					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.length() != 0)
 				sql += " and xl_bm = '"+line+"'";
@@ -1567,8 +1576,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setCcService(rs.getBoolean("cc_service"));
 					schedule.setRemarks(rs.getString("remarks")!=null?rs.getString("remarks"):"");
 					schedule.setAdjustExps(rs.getString("adjust_exps")!=null?rs.getString("adjust_exps"):"");
-					
-					int startOpt = 0;
+
+					int startOpt = 120;
 					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
 						String[] split = rs.getString("start_opt").split(":");
 						startOpt = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
@@ -632,6 +632,7 @@
 		data-exclude=1></script>
 <!-- echarts4 误删 -->
 <script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
 </body>
 </html>
 \ No newline at end of file
@@ -183,7 +183,11 @@
             {{obj.gsname}}
         </td>
         <td>
-            {{obj.xlname}}
+           {{if obj.linename=='' || obj.linename==null}}
+				{{obj.xlname}}
+			{{else}}
+				{{obj.linename}}
+			{{/if}}
         </td>
         <td>
 			<lable data-id="{{obj.id}}" class="in_carpark_nbbm">{{obj.nbbm}}</lable>
@@ -194,7 +198,11 @@
 			<input data-id="{{obj.id}}" style=" width:100%"  type="text"  class="in_carpark_jsy" ></input>
 			<button  class="btn btn-sm blue btn-jsyUpdate" style=" width:100%"   data-id="{{obj.id}}">填写工号</button>
 		{{else}}
-			{{obj.jsy}}/{{obj.name}}
+			{{if obj.jname=='' || obj.jname==null}}
+				{{obj.jsy}}/{{obj.name}}
+			{{else}}
+				{{obj.jsy}}/{{obj.jname}}
+			{{/if}}
 		{{/if}}
         </td>
         <td>
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid;
+	    text-align: center; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px;
+	    text-align: center; }
+	 
+	  .table > tbody + tbody {
+	   border-top: 1px solid; }
+</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; margin-left: 33px;" id="gsdmDiv_manth">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdmManth" style="width: 140px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_manth">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdmManth" style="width: 140px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 10px">
+                        <span class="item-label" style="width: 150px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 136px;"></select>
+                    </div>
+                    <div style="margin-top: 10px">
+                    
+                    </div>
+                    <div style="display: inline-block;margin-left: 5px;">
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
+                        <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 10px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 10px">
+                        <span class="item-label" style="width: 80px;">统计: </span>
+                        <select class="form-control" style="width: 136px;" id='empnames'>
+                        	<option value="驾驶员">驾驶员</option>
+                        	<option value="售票员">售票员</option>
+                        	<option value="车辆自编号">车辆自编号</option>
+                        </select>
+                    </div>
+					<div style="display: inline-block;margin-left: 0px">
+                        <span class="item-label" style="width: 150px;">：</span>
+                        <input class="form-control" name="cont" id="cont" style="width: 136px;"></input>
+                    </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" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th id='empname'>驾驶员</th>
+								<th>计划营运班次</th>
+								<th>实际营运班次</th>
+								<th>烂班班次</th>
+								<th>临加班次</th>
+								<th>计划总里程</th>
+								<th>计划营运里程</th>
+								<th>计划空驶里程</th>
+								<th>实际总里程</th>
+								<th>实际营运里程</th>
+								<th>实际空驶里程</th>
+								<th>烂班里程</th>
+								<th>临加营运里程</th>
+								<th>临加空驶里程</th>
+							</tr>
+						</thead>
+						<tbody>
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		var d = new Date();
+		d.setTime(d.getTime() - 1*1000*60*60*24);
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		var dateTime = year + "-" + month + "-" + day;
+		$("#startDate,#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#startDate,#endDate").val(year + "-" + month + "-" + day);
+		
+		var fage=false;
+		var obj = [];
+		var xlList;
+		$.get('/report/lineList',function(result){
+			xlList=result;
+		$.get('/user/companyData', function(result){
+			obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			
+			if(obj.length ==0){
+				 $("#gsdmDiv_manth").css('display','none');
+				 $('#fgsdmDiv_manth').css('display','none');
+			}else if(obj.length ==1){
+				 $("#gsdmDiv_manth").css('display','none');
+				if(obj[0].children.length == 1  || obj[0].children.length ==0)
+					$('#fgsdmDiv_manth').css('display','none');
+			}
+			$('#gsdmManth').html(options);
+			updateCompany();
+		});
+		})
+		$("#gsdmManth").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdmManth').val();
+			var options = '<option value="">全部分公司</option>';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdmManth').html(options);
+		}
+
+
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdmManth").attr("disabled", false);
+				$("#fgsdmManth").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdmManth").val(temp[0]);
+				updateCompany();
+				$("#fgsdmManth").val(temp[1]);
+				$("#gsdmManth").attr("disabled", true);
+// 				$("#fgsdmManth").attr("disabled", true);
+			}
+		});
+		
+		var cont = "驾驶员", cont1 = "", cont2 = "", cont3 = "";
+		$("#empnames").on("change",function(){
+			if(cont == "驾驶员"){
+				cont1 = $("#cont").val();
+			} else if(cont == "售票员"){
+				cont2 = $("#cont").val();
+			} else if(cont == "车辆自编号"){
+				cont3 = $("#cont").val();
+			}
+			cont = $("#empnames").val();
+			if($("#empnames").val() == "驾驶员"){
+				$("#cont").val(cont1);
+			} else if($("#empnames").val() == "售票员"){
+				$("#cont").val(cont2);
+			} else if($("#empnames").val() == "车辆自编号"){
+				$("#cont").val(cont3);
+			}
+		});
+		
+		$("#query").on("click",function(){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+			$("#empname").html($("#empnames").val())
+			var params={};
+			params.empnames=$("#empnames").val();
+			params.cont = $("#cont").val();
+			params.line = $("#line").val();
+			params.startDate = $("#startDate").val();
+			params.endDate = $("#endDate").val();
+			params.lpName = $("#lpName").val();
+			params.gsdmManth= $("#gsdmManth").val();
+			params.fgsdmManth= $("#fgsdmManth").val();
+			var i = layer.load(2);
+		   	$get("/calc_mix/calcjsyspy",params,function(result){
+		   		
+		        var list_calcjsyspy = template('list_calcjsyspy',{list:result});
+                // 把渲染好的模版html文本追加到表格中
+		        $('#forms tbody').html(list_calcjsyspy);
+				layer.close(i);
+                
+		    }); 
+		});
+		
+		$("#export").on("click",function(){
+			var lineName = $('#line option:selected').text();
+			var startDate = $("#startDate").val();
+			var endDate = $("#endDate").val();
+			var params={};
+			params.empnames=$("#empnames").val();
+			params.cont = $("#cont").val();
+			params.line = $("#line").val();
+			params.startDate = $("#startDate").val();
+			params.endDate = $("#endDate").val();
+			params.lpName = $("#lpName").val(); 
+			params.gsdmManth= $("#gsdmManth").val();
+			params.fgsdmManth= $("#fgsdmManth").val(); 
+			params.lineName = lineName;
+			params.type='export';
+			var i = layer.load(2);
+			$get('/calc_export/waybilldayExport',params,function(result){
+				var dateTime = "";
+				if(startDate == endDate){
+					dateTime = moment(startDate).format("YYYYMMDD");
+				} else {
+					dateTime = moment(startDate).format("YYYYMMDD")
+							+"-"+moment(endDate).format("YYYYMMDD");
+				}
+				window.open("/downloadFile/download?fileName="
+						+dateTime+"-"+lineName+"-人车班次公里统计");
+				layer.close(i);
+			});
+		});
+		
+	});
+	
+	
+</script>
+<script type="text/html" id="list_calcjsyspy">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.jName}}</td>
+			<td>{{obj.jhyybc}}</td>
+			<td>{{obj.sjyybc}}</td>
+			<td>{{obj.lbbc}}</td>
+			<td>{{obj.ljbc}}</td>
+			<td>{{obj.jhzlc}}</td>
+			<td>{{obj.jhyylc}}</td>
+			<td>{{obj.jhfyylc}}</td>
+			<td>{{obj.sjzlc}}</td>
+			<td>{{obj.sjyylc}}</td>
+			<td>{{obj.sjfyylc}}</td>
+			<td>{{obj.lblc}}</td>
+			<td>{{obj.ljyylc}}</td>
+			<td>{{obj.ljfyylc}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="10"><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;
+	    text-align: center; }
+	 
+	  .table > tbody + tbody {
+	   border-top: 1px solid; }
+</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; margin-left: 31px;" id="gsdmDiv_sing">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdmSing" style="width: 140px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 22px;" id="fgsdmDiv_sing">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdmSing" style="width: 140px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 31px;">
+                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 140px;"></select>
+                    </div>
+					<div style="margin-top: 10px"></div>
+                    <div style="display: inline-block;margin-left: 3px;">
+                        <span class="item-label" style="width: 140px;">开始时间: </span>
+                        <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 8px;">
+                        <span class="item-label" style="width: 140px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 31px">
+                        <span class="item-label" style="width: 150px;">统计: </span>
+                        <select class="form-control" name="tjtype" id="tjtype" style="width: 140px;">
+                        	<option value="驾驶员">驾驶员</option>
+                        	<option value="售票员">售票员</option>
+                        	<option value="车辆自编号">车辆自编号</option>
+                        </select>
+					<div style="display: inline-block;margin-left: 0px">
+                        <span class="item-label" style="width: 150px;">：</span>
+                        <input class="form-control" name="cont" id="cont" style="width: 136px;"></input>
+                    </div>
+                    </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" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>所属公司</th>
+								<th>线路</th>
+								<th id='empname'>驾驶员</th>
+								<th>行驶里程(包括空放)</th>
+								<th>空驶里程</th>
+								<th>耗油量</th>
+								<th>加注量</th>
+								<th>非营业用油</th>
+								<th>计划公里</th>
+							</tr>
+						</thead>
+						<tbody>
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#startDate,#endDate").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;
+		$("#startDate,#endDate").val(year + "-" + month + "-" + day);
+		
+		var fage=false;
+		var xlList;
+		var obj = [];
+		
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv_sing").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv_sing").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv_sing').css('display','none');
+				}
+				$('#gsdmSing').html(options);
+				updateCompany();
+			});
+		})
+		$("#gsdmSing").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdmSing').val();
+// 			var options = '<option value="">全部分公司</option>';
+			var options ='';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdmSing').html(options);
+		}
+
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdmSing").attr("disabled", false);
+				$("#fgsdmSing").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdmSing").val(temp[0]);
+				updateCompany();
+// 				$("#fgsdmSing").val(temp[1]);
+				$("#fgsdmSing").val("");
+				$("#gsdmSing").attr("disabled", true);
+// 				$("#fgsdmSing").attr("disabled", true);
+			}
+		});
+		
+		var cont = "驾驶员", cont1 = "", cont2 = "", cont3 = "";
+		$("#tjtype").on("change",function(){
+			if(cont == "驾驶员"){
+				cont1 = $("#cont").val();
+			} else if(cont == "售票员"){
+				cont2 = $("#cont").val();
+			} else if(cont == "车辆自编号"){
+				cont3 = $("#cont").val();
+			}
+			cont = $("#tjtype").val();
+			if($("#tjtype").val() == "驾驶员"){
+				$("#cont").val(cont1);
+			} else if($("#tjtype").val() == "售票员"){
+				$("#cont").val(cont2);
+			} else if($("#tjtype").val() == "车辆自编号"){
+				$("#cont").val(cont3);
+			}
+		});
+		
+		$("#query").on("click",function(){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
+			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
+			$("#empname").html($("#tjtype").val());
+		    var line = $("#line").val();
+		    var startDate = $("#startDate").val();
+		    var endDate = $("#endDate").val();
+		    var gsdmSing = $("#gsdmSing").val();
+		    var fgsdmSing = $("#fgsdmSing").val();
+		    var tjtype=$("#tjtype").val();
+		    var cont=$("#cont").val();
+		    var params = {};
+		    var i = layer.load(2);
+		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont},function(result){		        
+				layer.close(i);
+				var singledata = template('singledata',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms tbody').html(singledata);
+			}); 
+		});
+		
+		$("#export").on("click",function(){
+		    var line = $("#line").val();
+		    var startDate = $("#startDate").val();
+		    var endDate = $("#endDate").val();
+		    var gsdmSing = $("#gsdmSing").val();
+		    var fgsdmSing = $("#fgsdmSing").val();
+		    var tjtype=$("#tjtype").val();
+		    var cont=$("#cont").val();
+			var lineName = $('#line option:selected').text();
+			if(lineName == "全部线路")
+				lineName = $('#fgsdmSing option:selected').text();
+		    var i = layer.load(2);
+			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,type:'export',lineName:lineName},function(result){
+				var dateTime = "";
+				if(startDate == endDate){
+					dateTime = moment(startDate).format("YYYYMMDD");
+				} else {
+					dateTime = moment(startDate).format("YYYYMMDD")
+							+"-"+moment(endDate).format("YYYYMMDD");
+				}
+				window.open("/downloadFile/download?fileName="
+						+dateTime+"-"+lineName+"-路单数据(统计)");
+				layer.close(i);
+			});
+		});
+	});
+	
+</script>
+<script type="text/html" id="singledata">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.gS}}</td>
+ 			<td>{{obj.xlName}}</td>
+			<td>{{obj.jName}}</td>
+			<td>{{obj.sjzlc}}</td>
+			<td>{{obj.sjfyylc}}</td>
+ 			<td>{{obj.hyl}}</td>
+			<td>{{obj.jzl}}</td>
+			<td>{{obj.sh}}</td>
+			<td>{{obj.jhzlc}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
@@ -318,7 +318,14 @@
 <script type="text/html" id="ludan_2">
 	{{each list as obj i}}
 		<tr>
-			<td>{{i+1}}</td>
+			<td>
+				{{if obj.adjustExps == "子"}}
+					{{obj.adjustExps}}
+				{{/if}}
+				{{if obj.adjustExps != "子"}}
+					{{i+1}}
+				{{/if}}
+			</td>
 			<td>{{obj.lpName}}</td>
 			<td>{{obj.jGh}}{{obj.jName}}</td>
 			<td>
+<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;
+	    text-align: center; }
+	 
+	  .table > tbody + tbody {
+	   border-top: 1px solid; }
+</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; margin-left: 33px;" id="gsdmDiv_sing">
+						<span class="item-label" style="width: 140px;">&nbsp;&nbsp;&nbsp;&nbsp;
+						&nbsp;
+						公司: </span>
+						<select class="form-control" name="company" id="gsdmSing" style="width: 140px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 10px;" id="fgsdmDiv_sing">
+						<span class="item-label" style="width: 140px;">&nbsp;&nbsp;&nbsp;&nbsp;分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdmSing" style="width: 140px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 140px;"></select>
+                    </div>
+                    <div style="margin-top: 10px"></div>
+                    
+                    <div style="display: inline-block;margin-left: 33px;">
+                        <span class="item-label" style="width: 140px;">开始时间: </span>
+                        <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 140px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
+                    </div>
+                    
+                    <div style="display: inline-block;margin-left: 15px">
+                        <span class="item-label" style="width: 150px;">统计: </span>
+                        <select class="form-control" name="tjtype" id="tjtype" style="width: 140px;">
+                        	<option value="jsy">驾驶员</option>
+                        	<option value="spy">售票员</option>
+                        </select>
+
+                    </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" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>日期</th>
+								<th>所属公司</th>
+								<th>线路</th>
+								<th>车号</th>
+								<th>司机职号</th>
+								<th>司机姓名</th>
+								<th>售票员职号</th>
+								<th>售票员姓名</th>
+								<th>行驶里程(包括空放)</th>
+								<th>空驶里程</th>
+								<th>耗油量</th>
+								<th>加注量</th>
+								<th>非营业用油</th>
+								<th>计划公里</th>
+							</tr>
+						</thead>
+						<tbody>
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#startDate,#endDate").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;
+		$("#startDate").val(year + "-" + month + "-" + day);
+		$("#endDate").val(year + "-" + month + "-" + day);
+		
+		
+		var fage=false;
+		var xlList;
+		var obj = [];
+		
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv_sing").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv_sing").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv_sing').css('display','none');
+				}
+				$('#gsdmSing').html(options);
+				updateCompany();
+			});
+		})
+		$("#gsdmSing").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdmSing').val();
+			var options ='';
+// 			var options = '<option value="">全部分公司</option>';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdmSing').html(options);
+		}
+
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdmSing").attr("disabled", false);
+				$("#fgsdmSing").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdmSing").val(temp[0]);
+				updateCompany();
+				$("#fgsdmSing").val(temp[1]);
+// 				$("#fgsdmSing").val("");
+				$("#gsdmSing").attr("disabled", true);
+				$("#fgsdmSing").attr("disabled", true);
+			}
+		});
+		
+		
+		$("#query").on("click",function(){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
+		    var i = layer.load(2);
+		    var params = {};
+		    params['sfyy'] =  $("#sfyy").val();
+		    params['gsdmSing'] = $("#gsdmSing").val();
+		    params['fgsdmSing'] = $("#fgsdmSing").val();
+		    params['line'] = $("#line").val();
+		    params['startDate'] =  $("#startDate").val();
+		    params['endDate'] = $("#endDate").val();
+		    params['lpName'] = $("#lpName").val();
+		    params['tjtype'] = $("#tjtype").val();
+		    params['spy'] = "zrw";
+
+	    	$get("/report/singledatatj",params,function(result){		        
+		   		layer.close(i);
+		        var singledata = template('singledata',{list:result});
+                // 把渲染好的模版html文本追加到表格中
+		        $('#forms tbody').html(singledata);
+                
+		    }); 
+		   
+		});
+		
+		$("#export").on("click",function(){
+			var params = {};
+		    params['sfyy'] =  $("#sfyy").val();
+		    params['gsdmSing'] = $("#gsdmSing").val();
+		    params['fgsdmSing'] = $("#fgsdmSing").val();
+		    params['line'] = $("#line").val();
+		    params['startDate'] =  $("#startDate").val();
+		    params['endDate'] = $("#endDate").val();
+		    params['lpName'] = $("#lpName").val();
+		    params['tjtype'] = $("#tjtype").val();
+		    params['spy'] = "zrw";
+			var lineName = $('#line option:selected').text();
+			if(lineName == "全部线路")
+				lineName = $('#fgsdmSing option:selected').text();
+			
+			params['lineName'] =lineName;
+			params['type'] ='export';
+	    	var i = layer.load(2);
+	    	$get('/report/singledatatj',params,function(result){
+	    		var exportDate="";
+	    		if( $("#startDate").val()==$("#endDate").val()){
+	    			exportDate=moment($("#startDate").val()).format("YYYYMMDD");
+	    		}else{
+	    			exportDate=moment($("#startDate").val()).format("YYYYMMDD")
+	    			+"-"+moment($("#endDate").val()).format("YYYYMMDD");
+
+	    		}
+	    		console.log("exportDate:"+exportDate);
+				window.open("/downloadFile/download?fileName="
+						+exportDate
+						+"-"+lineName+"-路单统计");
+				layer.close(i);
+			});
+			
+		});
+	});
+</script>
+<script type="text/html" id="singledata">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.rQ}}</td>
+			<td>{{obj.gS}}</td>
+ 			<td>{{obj.xlmc}}</td>
+			<td>{{obj.clzbh}}</td>
+			<td>{{obj.jsy}}</td>
+			<td>{{obj.jName}}</td>
+			<td>{{obj.sgh}}</td>
+			<td>{{obj.sName}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.emptMileage}}</td>
+ 			<td>{{obj.hyl}}</td>
+			<td>{{obj.jzl}}</td>
+			<td>{{obj.unyyyl}}</td>
+			<td>{{obj.jhjl}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="singledata2">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.rQ}}</td>
+			<td>{{obj.gS}}</td>
+ 			<td>{{obj.xlmc}}</td>
+			<td>{{obj.clzbh}}</td>
+			<td></td>
+			<td></td>
+			<td>{{obj.sgh}}</td>
+			<td>{{obj.sName}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.emptMileage}}</td>
+ 			<td></td>
+			<td></td>
+			<td></td>
+			<td>{{obj.jhjl}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
@@ -242,7 +242,12 @@
             {{obj.fgsname}}
         </td>
         <td  width="8%">
-            {{obj.xlname}}
+			{{if obj.linename=='' || obj.linename==null}}
+				{{obj.xlname}}
+			{{else}}
+				{{obj.linename}}
+			{{/if}}
+            
         </td>
         <td width="5%">
 			<lable data-id="{{obj.id}}" class="in_carpark_nbbm">{{obj.nbbm}}</lable>
@@ -253,7 +258,11 @@
 			<input data-id="{{obj.id}}" style=" width:100%"  type="text"  class="in_carpark_jsy" ></input>
 			<button  class="btn btn-sm blue btn-jsyUpdate" style=" width:100%"   data-id="{{obj.id}}">填写工号</button>
 		{{else}}
-			{{obj.jsy}}/{{obj.name}}
+			{{if obj.jname=='' || obj.jname==null}}
+				{{obj.jsy}}/{{obj.name}}
+			{{else}}
+				{{obj.jsy}}/{{obj.jname}}
+			{{/if}}
 		{{/if}}
         </td>
@@ -374,7 +374,7 @@
                 $('[name=bcType]', f).trigger('change');
             }
-
+			
             function initScheduleTypeChange(f, cb) {
                 (function (f, cb) {
                     $('[name=bcType]', f).on('change', function () {
@@ -396,7 +396,8 @@
                         var time, mileage;
                         switch (bcType_e.val()) {
                             case 'out':
-                                qdz.html(park_opts).val(information.carPark);
+                            	if (gb_sch && gb_sch.qdzCode) qdz.html(park_opts).val(gb_sch.qdzCode);
+                            	else qdz.html(park_opts).val(information.carPark);
                                 zdz.html(opts);
                                 //出场结束时间
                                 time = updown == 0 ? information.upOutTimer : information.downOutTimer;
@@ -404,7 +405,8 @@
                                 break;
                             case 'in':
                                 qdz.html(opts);
-                                zdz.html(park_opts).val(information.carPark);
+                                if (gb_sch && gb_sch.zdzCode) zdz.html(park_opts).val(gb_sch.zdzCode);
+                                else zdz.html(park_opts).val(information.carPark);
                                 //进场结束时间
                                 time = updown == 0 ? information.upInTimer : information.downInTimer;
                                 mileage = updown == 0 ? information.upInMileage : information.downInMileage;