Merge branch 'pudong' into minhang

王通
2 parents c4f54d82 0c40ca83
Showing 33 changed files with 2382 additions and 476 deletions
src/main/java/com/bsth/controller/calc/CalcWaybillController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/report/CalcSheetController.java
src/main/java/com/bsth/controller/schedule/core/EmployeeConfigInfoController.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/entity/calc/CalcStatistics.java
src/main/java/com/bsth/entity/mcy_forms/Operationservice.java
src/main/java/com/bsth/entity/sheet/CalcSheet.java
src/main/java/com/bsth/repository/LsStationRouteRepository.java
src/main/java/com/bsth/repository/calc/CalcStatisticsRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/repository/sheet/CalcSheetRepository.java
src/main/java/com/bsth/service/LineService.java
src/main/java/com/bsth/service/calc/CalcWaybillService.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
@@ -147,7 +147,11 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 		if(map.get("type")!=null){
 			type=map.get("type").toString().trim();
 		}
-		return calcWaybillService.calcStatisticsDaily(gsdm,fgsdm,line,date,date2,xlName,type);
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		return calcWaybillService.calcStatisticsDaily(gsdm,fgsdm,line,date,date2,xlName,type,nature);
 	}
 	@RequestMapping(value="/calcStatisticsDaily2")
@@ -180,7 +184,11 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 		if(map.get("type")!=null){
 			type=map.get("type").toString().trim();
 		}
-		return calcWaybillService.calcStatisticsDaily2(gsdm,fgsdm,line,date,date2,xlName,type);
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		return calcWaybillService.calcStatisticsDaily2(gsdm,fgsdm,line,date,date2,xlName,type,nature);
 	}
 	@RequestMapping(value="/generateLineMileage")
@@ -469,12 +469,13 @@ public class ExportController {
 		for (Operationservice l : operationservice) {
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("i", i);
-			m.put("xlName", l.getXlName());
-			m.put("jzl", l.getJzl());
-			m.put("xhl", l.getXhl());
-			m.put("xsgl", l.getXsgl());
-			m.put("emptMileage", l.getEmptMileage());
-			m.put("sjbc", l.getSjbc());
+			m.put("fgs", l.getFgs()!=null?l.getFgs():"");
+			m.put("xlName", l.getXlName()!=null?l.getXlName():"");
+			m.put("jzl", l.getJzl()!=null?l.getJzl():"");
+			m.put("xhl", l.getXhl()!=null?l.getXhl():"");
+			m.put("xsgl", l.getXsgl()!=null?l.getXsgl():"");
+			m.put("emptMileage", l.getEmptMileage()!=null?l.getEmptMileage():"");
+			m.put("sjbc", l.getSjbc()!=null?l.getSjbc():"");
 			resList.add(m);
 			i++;
 		}
@@ -417,7 +417,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		if(map.get("type")!=null){
 			type=map.get("type").toString();
 		}
-		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type,nature);
 	}
 	/*
@@ -89,6 +89,8 @@ public class ServiceDataInterface {
             map.put("remarks", sch.getRemark());
             map.put("status", sch.getStatus());
+            //放站班次，放到的站点
+            map.put("majorStationName", sch.getMajorStationName());
             rs.add(map);
         }
         return rs;
+package com.bsth.controller.report;
+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.controller.BaseController;
+import com.bsth.entity.sheet.CalcSheet;
+import com.bsth.entity.sheet.Sheet;
+import com.bsth.service.report.CalcSheetService;
+
+@RestController
+@RequestMapping("calcSheet")
+public class CalcSheetController  extends BaseController<CalcSheet, Integer>{
+	@Autowired
+	CalcSheetService calcSheetService;
+	//发车到站准点率统计
+	@RequestMapping(value = "/countList",method = RequestMethod.GET)
+	public List<CalcSheet> countList(@RequestParam Map<String, Object> map){
+		List<CalcSheet> list=calcSheetService.countListCalcSheet(map);
+		return list;
+	}
+	//发车到站准点率列表
+	@RequestMapping(value = "/calcListSheet",method = RequestMethod.GET)
+	public List<CalcSheet> calcListSheet(@RequestParam Map<String, Object> map){
+		List<CalcSheet> list=calcSheetService.calcListSheet(map);
+		return list;
+	}
+	//发车站点准点率详细
+	@RequestMapping(value = "/calcSheet",method = RequestMethod.GET)
+	public List<Sheet> calcSheet(@RequestParam Map<String, Object> map){
+		List<Sheet> list=calcSheetService.calcSheet(map);
+		return list;
+	}
+	
+	//营运线路出车率统计
+	@RequestMapping(value = "/calcTurnoutrate",method = RequestMethod.GET)
+	public List<Map<String, Object>> calcTurnoutrate(@RequestParam Map<String, Object> map){
+		List<Map<String, Object>> list=calcSheetService.calcTurnoutrate(map);
+		return list;
+	}
+}
@@ -70,6 +70,27 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         return rtn;
     }
+    @RequestMapping(value = "/validate_jsy_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_jsy_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("jsy.id_eq"),
+                    null
+            );
+            employeeConfigInfoService.validate_jsy_config(employeeConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
     @RequestMapping(value = "/validate_spy", method = RequestMethod.GET)
     public Map<String, Object> validate_spy(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
@@ -89,4 +110,24 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         }
         return rtn;
     }
+
+    @RequestMapping(value = "/validate_spy_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_spy_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    null,
+                    param.get("spy.id_eq")
+            );
+            employeeConfigInfoService.validate_spy_config(employeeConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
 }
@@ -146,8 +146,8 @@ public class InStationProcess {
             dayOfSchedule.removeExecPlan(nbbm);
         //通知误点停靠程序，有车辆到站
-        //LateAdjustHandle.carArrive(gps, next);
-        LateAdjustHandle.carArrive(gps);
+        LateAdjustHandle.carArrive(gps, next);
+        //LateAdjustHandle.carArrive(gps);
         //路牌的下一个班次，页面显示起点实际到达时间
         ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
@@ -20,12 +20,12 @@ import java.util.List;
  * Created by panzhao on 2017/4/6.
  */
 @Component
-public class SafeDrivDataLoadThread extends Thread{
+public class SafeDrivDataLoadThread extends Thread {
     Logger logger = LoggerFactory.getLogger(this.getClass());
     static String url;
-    static CloseableHttpClient httpClient = null;
+    static CloseableHttpClient httpClient;
     static HttpGet get;
     static RequestConfig requestConfig;
     static CloseableHttpResponse response;
@@ -51,9 +51,7 @@ public class SafeDrivDataLoadThread extends Thread{
             int statusCode = response.getStatusLine().getStatusCode();
             if(statusCode != 200){
-                get.abort();
                 logger.error("http client status code: " + statusCode);
-                return;
             }
             entity = response.getEntity();
@@ -67,7 +65,7 @@ public class SafeDrivDataLoadThread extends Thread{
                 list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
-                for(SafeDriv sd : list){
+                for (SafeDriv sd : list) {
                     SafeDrivCenter.put(sd);
                 }
             }
@@ -75,7 +73,7 @@ public class SafeDrivDataLoadThread extends Thread{
             if (null != response)
                 response.close();
         } catch (Exception e) {
-            logger.error("安全驾驶接口报错了" , e.getMessage());
+            logger.error("安全驾驶接口报错了", e.getMessage());
         }
     }
 }
@@ -9,12 +9,10 @@ import java.util.HashMap;
 import java.util.Map;
 /**
- * 
- * @ClassName: ScheduleComparator 
- * @Description: TODO(实际班次排序器) 
  * @author PanZhao
- * @date 2016年8月15日 下午1:53:28 
- *
+ * @ClassName: ScheduleComparator
+ * @Description: TODO(实际班次排序器)
+ * @date 2016年8月15日 下午1:53:28
  */
 public class ScheduleComparator {
@@ -26,71 +24,62 @@ public class ScheduleComparator {
 	}*/
-	static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
+    static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
-	static{
-		bcTypeOrderMap.put("out", 0);
-		bcTypeOrderMap.put("normal", 1);
-		bcTypeOrderMap.put("region", 2);
-		bcTypeOrderMap.put("major", 3);
-		bcTypeOrderMap.put("venting", 4);
-		bcTypeOrderMap.put("ldks", 5);
-		bcTypeOrderMap.put("in", 6);
-	}
-	
-	public static class FCSJ  implements Comparator<ScheduleRealInfo>{
+    static {
+        bcTypeOrderMap.put("out", 0);
+        bcTypeOrderMap.put("normal", 1);
+        bcTypeOrderMap.put("region", 2);
+        bcTypeOrderMap.put("major", 3);
+        bcTypeOrderMap.put("venting", 4);
+        bcTypeOrderMap.put("ldks", 5);
+        bcTypeOrderMap.put("in", 6);
+    }
-		@Override
-		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			int diff = (int) (s1.getFcsjT() - s2.getFcsjT());
-			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
-		}
-	}
+    public static class FCSJ implements Comparator<ScheduleRealInfo> {
-	private static int typeOrder(String bcType){
-		return bcTypeOrderMap.get(bcType)!=null?bcTypeOrderMap.get(bcType):0;
-	}
+        @Override
+        public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
+            int diff = (int) (s1.getFcsjT() - s2.getFcsjT());
+            return diff != 0 ? diff : typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+        }
+    }
+
+    private static int typeOrder(String bcType) {
+        return bcTypeOrderMap.get(bcType) != null ? bcTypeOrderMap.get(bcType) : 0;
+    }
-	public static class DFSJ  implements Comparator<ScheduleRealInfo>{
+    public static class DFSJ implements Comparator<ScheduleRealInfo> {
         static Logger logger = LoggerFactory.getLogger(DFSJ.class);
-		@Override
-		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-            try{
+        @Override
+        public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
+            try {
+                int diff;
+                if (!s2.isSflj() && !s1.isSflj()) {
+                    diff = (int) (s1.getFcsjT() - s2.getFcsjT());
-                if(!s1.getXlBm().equals(s2.getXlBm()) || !s1.getLpName().equals(s2.getLpName())){
-                    int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
-                    return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
-                }
-                else{
-                    /**
-                     * 按时刻表发车顺序号
-                     */
-                    Integer fc1 = s1.getFcno();
-                    Integer fc2 = s2.getFcno();
-                    if(null != fc1 && null != fc2){
-                        return fc1.intValue()==fc2.intValue()?0:fc1.intValue()-fc2.intValue();
-                    }
-                    else{
-                        int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
-                        return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
-                    }
+                } else {
+                    diff = (int) (s1.getDfsjT() - s2.getDfsjT());
                 }
-            }catch (Exception e){
+
+                return diff != 0 ? diff : typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+
+            } catch (Exception e) {
                 logger.error("排序异常", e);
-                return s1.getDfsjT() - s2.getDfsjT() > 0?1:-1;
+                return s1.getDfsjT() - s2.getDfsjT() > 0 ? 1 : -1;
             }
-		}
-	}
+        }
+    }
-    public static class DFSJ2  implements Comparator<ScheduleRealInfo>{
+    public static class DFSJ2 implements Comparator<ScheduleRealInfo> {
         @Override
         public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
             int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
-            return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+            return diff != 0 ? diff : typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
         }
     }
 }
 package com.bsth.data.schedule.late_adjust;
-import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.util.Arith;
 import com.bsth.websocket.handler.SendUtils;
-import com.google.common.collect.ArrayListMultimap;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -18,7 +15,8 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 import java.util.Collection;
-import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 /**
  * 误点自动调整待发 处理程序
@@ -35,17 +33,11 @@ public class LateAdjustHandle implements ApplicationContextAware {
     static Logger logger = LoggerFactory.getLogger(LateAdjustHandle.class);
     /**
-     * 应发未到车辆 和 班次
-     * <p>
-     * 起点相同的，保留最后一个班次
+     * 应发未到的班次 key : id
      */
-    private static ArrayListMultimap lateSchMaps;
+    private static ConcurrentMap<Long, ScheduleRealInfo> lateSchMap = new ConcurrentHashMap<>();
-    static {
-        lateSchMaps = ArrayListMultimap.create();
-    }
-
     /**
      * 新增一个误点班次
      *
@@ -65,15 +57,14 @@ public class LateAdjustHandle implements ApplicationContextAware {
             if (sch.getDfsj().compareTo(config.getYjtkStart()) > 0
                     && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0) {
-                ScheduleRealInfo old = popLateSch(sch);
-
-                //班次被压入
-                if (lateSchMaps.containsEntry(sch.getClZbh(), sch)) {
+                //班次压入
+                if (!lateSchMap.containsKey(sch.getId())) {
+                    logger.info("29【应发未到 班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
-                    logger.info("21【应发未到 -多个(" + lateSchMaps.get(sch.getClZbh()).size() + ")】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
-                    //通知客户端
                     sch.setLate2(true);
-                    sendUtils.sendAutoWdtz(sch, old);
+                    lateSchMap.put(sch.getId(), sch);
+                    //通知客户端
+                    sendUtils.sendAutoWdtz(sch, null);
                 }
             }
@@ -82,51 +73,6 @@ public class LateAdjustHandle implements ApplicationContextAware {
         }
     }
-    /**
-     * 压入新的误点班次
-     *
-     * @param sch
-     * @return 返回被移除的误点班次
-     */
-    private static ScheduleRealInfo popLateSch(ScheduleRealInfo sch) {
-        List<ScheduleRealInfo> list = lateSchMaps.get(sch.getClZbh());
-
-        if (null == list || list.size() == 0)
-            lateSchMaps.put(sch.getClZbh(), sch);
-        else {
-            ScheduleRealInfo old = findExistQdz(list, sch.getQdzCode(), sch.getQdzName(), "");
-
-            if (null == old)
-                lateSchMaps.put(sch.getClZbh(), sch);
-            else if (old.getDfsjT() < sch.getDfsjT()) {
-                //同一个起点，保留时间最大的班次
-                lateSchMaps.remove(old.getClZbh(), old);
-                lateSchMaps.put(sch.getClZbh(), sch);
-
-                logger.info(sch.getClZbh() + "【应发未到】old 班次 " + old.getId() + " -被覆盖！");
-                return old;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * 搜索同样起点的班次
-     *
-     * @param list
-     * @return
-     */
-    private static ScheduleRealInfo findExistQdz(List<ScheduleRealInfo> list, String qdzCode, String nam1, String name2) {
-        for (ScheduleRealInfo item : list) {
-            if (item.getQdzCode().equals(qdzCode)
-                    || item.getQdzName().equals(nam1)
-                    || item.getQdzName().equals(name2))
-                return item;
-        }
-        return null;
-    }
-
     /**
      * 获取所有应发未到的班次
@@ -134,13 +80,13 @@ public class LateAdjustHandle implements ApplicationContextAware {
      * @return
      */
     public static Collection<ScheduleRealInfo> allLateSch() {
-        return lateSchMaps.values();
+        return lateSchMap.values();
     }
     public static void remove(ScheduleRealInfo sch) {
         try {
-            if (lateSchMaps.containsEntry(sch.getClZbh(), sch)) {
-                lateSchMaps.remove(sch.getClZbh(), sch);
+            if (lateSchMap.containsKey(sch.getId())) {
+                lateSchMap.remove(sch.getId());
                 sch.setLate2(false);
                 sch.setLateMinute(0);
@@ -154,61 +100,47 @@ public class LateAdjustHandle implements ApplicationContextAware {
     }
     /**
-     * 车辆到站
+     * 车辆到站 进站 进 的哪个班次，就调该车辆的下一个班次
      *
      * @param gps
      */
-    public static void carArrive(GpsEntity gps) {
+    public static void carArrive(GpsEntity gps, ScheduleRealInfo sch) {
         try {
-            if (gps.getInstation() <= 0) {
-                return;
-            }
-
-            List<ScheduleRealInfo> list = lateSchMaps.get(gps.getNbbm());
-
-            if (null == list || list.size() == 0)
+            if (gps.getInstation() <= 0 || null == sch)
                 return;
+            if (!lateSchMap.containsKey(sch.getId())) {
+                //班次是否误点（可能处于误点线程扫描的空隙，所以再判定一次）
+                if (sch.getDfsjT() <= gps.getTimestamp()) {
+                    putLate(sch);
-            String key = gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo(), name1 = BasicData.stationCode2NameMap.get(key)//站点名称
-                    , name2 = null;
-            if (StringUtils.isNotEmpty(gps.getCarparkNo())) {
-                name2 = BasicData.stationCode2NameMap.get(gps.getCarparkNo());
-            }
+                    if (!lateSchMap.containsKey(sch.getId()))
+                        return;
-            if (gps.getInstation() == 2) {
-                name1 = name2;//进场，没有站
+                    logger.info("线程空隙漏掉的误点，id: " + sch.getId());
+                } else
+                    return;
             }
-            gps.setStationName(name1);
-            //根据起点站获取误点班次
-            ScheduleRealInfo sch = findExistQdz(list, gps.getStopNo(), name1, name2);
-
-            if (null == sch)
-                return;
             //可能是延迟信号，gps时间没有误点
             if (gps.getTimestamp() <= sch.getDfsjT()) {
                 sch.setLate2(false);
-                lateSchMaps.remove(sch.getClZbh(), sch);
+                lateSchMap.remove(sch.getId());
                 return;
             }
-            if (gps.getStationName().equals(sch.getQdzName())
-                    || gps.getStopNo().equals(sch.getQdzCode())
-                    || sch.getQdzName().equals(name2)) {
-                //自动调整待发 到达时间 + 停靠时间
-                long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
+            //自动调整待发 到达时间 + 停靠时间
+            long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-                sch.setDfsjAll(dt);
-                sch.setDfAuto(true);
-                //取消应发未到标记
-                sch.setLate2(false);
+            sch.setDfsjAll(dt);
+            sch.setDfAuto(true);
+            //取消应发未到标记
+            sch.setLate2(false);
-                lateSchMaps.remove(sch.getClZbh(), sch);
-                logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
-            }
+            lateSchMap.remove(sch.getId());
+            logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt + " -id:" + sch.getId());
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("late2 car arrive", e);
@@ -216,47 +148,6 @@ public class LateAdjustHandle implements ApplicationContextAware {
     }
-    /**
-     * 车辆到站， 进站 进 的哪个班次，就调该车辆的下一个班次
-     *
-     * @param gps
-     * @param sch public static void carArrive(GpsEntity gps, ScheduleRealInfo sch) {
-     *            try {
-     *            if (gps.getInstation() <= 0 || null == sch) {
-     *            return;
-     *            }
-     *            <p>
-     *            List<ScheduleRealInfo> list = lateSchMaps.get(gps.getNbbm());
-     *            <p>
-     *            if (null == list || list.size() == 0 || !list.contains(sch)) {
-     *            return;
-     *            }
-     *            <p>
-     *            //可能是延迟信号，gps时间没有误点
-     *            if (gps.getTimestamp() <= sch.getDfsjT()) {
-     *            sch.setLate2(false);
-     *            lateSchMaps.remove(sch.getClZbh(), sch);
-     *            return;
-     *            }
-     *            <p>
-     *            <p>
-     *            //自动调整待发 到达时间 + 停靠时间
-     *            long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-     *            <p>
-     *            sch.setDfsjAll(dt);
-     *            sch.setDfAuto(true);
-     *            //取消应发未到标记
-     *            sch.setLate2(false);
-     *            <p>
-     *            lateSchMaps.remove(sch.getClZbh(), sch);
-     *            logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
-     *            } catch (Exception e) {
-     *            e.printStackTrace();
-     *            logger.error("late2 car arrive", e);
-     *            }
-     *            }
-     */
-
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         lineConfigData = applicationContext.getBean(LineConfigData.class);
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 @Entity
 @Table(name = "calc_statistics")
@@ -66,6 +67,8 @@ public class CalcStatistics {
 	private Double qtlc;
 	/* 临加公里*/
 	private Double ljlc;
+	/* 临加空驶公里*/
+	private Double ljkslc;
 	/* 计划班次*/
 	private int jhbcq;
 	/* 计划班次(早高峰)*/
@@ -106,8 +109,9 @@ public class CalcStatistics {
 	private int djgsj;
 	/* 备注*/
 	private String remark;
-	
-	
+	/*分公司名字*/
+	@Transient
+	private String fgsName;
 	public Long getId() {
 		return id;
 	}
@@ -270,6 +274,12 @@ public class CalcStatistics {
 	public void setLjlc(Double ljlc) {
 		this.ljlc = ljlc;
 	}
+	public Double getLjkslc() {
+		return ljkslc;
+	}
+	public void setLjkslc(Double ljkslc) {
+		this.ljkslc = ljkslc;
+	}
 	public int getJhbcq() {
 		return jhbcq;
 	}
@@ -390,5 +400,11 @@ public class CalcStatistics {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
+	public String getFgsName() {
+		return fgsName;
+	}
+	public void setFgsName(String fgsName) {
+		this.fgsName = fgsName;
+	}
 }
@@ -17,6 +17,10 @@ public class Operationservice {
 	private String jname;
 	private String clzbh;
+	
+	private String gs;
+	
+	private String fgs;
 	public String getJname() {
 		return jname;
@@ -89,6 +93,22 @@ public class Operationservice {
 	public void setXlBm(String xlBm) {
 		this.xlBm = xlBm;
 	}
+
+	public String getGs() {
+		return gs;
+	}
+
+	public void setGs(String gs) {
+		this.gs = gs;
+	}
+
+	public String getFgs() {
+		return fgs;
+	}
+
+	public void setFgs(String fgs) {
+		this.fgs = fgs;
+	}
 }
+package com.bsth.entity.sheet;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import com.bsth.data.BasicData;
+
+@Entity
+@Table(name = "bsth_c_calc_sheet")
+public class CalcSheet {
+	/* 主键*/
+	@Id
+	@GeneratedValue
+	private Integer id;
+	/* 公司代码*/
+	private String gsdm;
+	/* 分公司代码*/
+	private String fgsdm;
+	/* 日期字符串*/
+	private String date;
+	/* 线路编码*/
+	private String xl;
+	/* 线路名称*/
+	private String xlName;
+	/*计划首站发车数*/
+	private String jhszfcs;
+	/*实际首站发车正点数*/
+	private String sjszfczds;
+	/*首站发车正点率*/
+	private String szfczdl;
+	/*首站发车到达正点数*/
+	private String sjszddzds;
+	/*首站发车到达正点率*/
+	private String szddzdl;
+	/*计划出车数*/
+	private String jhcc;
+	/*实际出车数*/
+	private String sjcc;
+	/*早高峰实际出车*/
+	private String sjcczgf;
+	/*晚高峰实际出车*/
+	private String sjccwgf;
+	/*计划班次数*/
+	private String jhbcs;
+	/*实际班次数*/
+	private String sjbcs;
+	/*临加班次数*/
+	private String ljbcs;
+	/*公司名字*/
+	@Transient
+	private String gsname;
+	/*分公司名字*/
+	@Transient
+	private String fgsname;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getGsdm() {
+		return gsdm;
+	}
+	public void setGsdm(String gsdm) {
+		this.gsdm = gsdm;
+	}
+	public String getFgsdm() {
+		return fgsdm;
+	}
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+	public String getDate() {
+		return date;
+	}
+	public void setDate(String date) {
+		this.date = date;
+	}
+	public String getXl() {
+		return xl;
+	}
+	public void setXl(String xl) {
+		this.xl = xl;
+	}
+	public String getXlName() {
+		return xlName;
+	}
+	public void setXlName(String xlName) {
+		this.xlName = xlName;
+	}
+	public String getJhszfcs() {
+		return jhszfcs;
+	}
+	public void setJhszfcs(String jhszfcs) {
+		this.jhszfcs = jhszfcs;
+	}
+	public String getSjszfczds() {
+		return sjszfczds;
+	}
+	public void setSjszfczds(String sjszfczds) {
+		this.sjszfczds = sjszfczds;
+	}
+	public String getSzfczdl() {
+		return szfczdl;
+	}
+	public void setSzfczdl(String szfczdl) {
+		this.szfczdl = szfczdl;
+	}
+	public String getSjszddzds() {
+		return sjszddzds;
+	}
+	public void setSjszddzds(String sjszddzds) {
+		this.sjszddzds = sjszddzds;
+	}
+	public String getSzddzdl() {
+		return szddzdl;
+	}
+	public void setSzddzdl(String szddzdl) {
+		this.szddzdl = szddzdl;
+	}
+	public String getJhcc() {
+		return jhcc;
+	}
+	public void setJhcc(String jhcc) {
+		this.jhcc = jhcc;
+	}
+	public String getSjcc() {
+		return sjcc;
+	}
+	public void setSjcc(String sjcc) {
+		this.sjcc = sjcc;
+	}
+	public String getSjcczgf() {
+		return sjcczgf;
+	}
+	public void setSjcczgf(String sjcczgf) {
+		this.sjcczgf = sjcczgf;
+	}
+	public String getSjccwgf() {
+		return sjccwgf;
+	}
+	public void setSjccwgf(String sjccwgf) {
+		this.sjccwgf = sjccwgf;
+	}
+	public String getJhbcs() {
+		return jhbcs;
+	}
+	public void setJhbcs(String jhbcs) {
+		this.jhbcs = jhbcs;
+	}
+	public String getSjbcs() {
+		return sjbcs;
+	}
+	public void setSjbcs(String sjbcs) {
+		this.sjbcs = sjbcs;
+	}
+	public String getLjbcs() {
+		return ljbcs;
+	}
+	public void setLjbcs(String ljbcs) {
+		this.ljbcs = ljbcs;
+	}
+	
+	public String getGsname() {
+		return 	BasicData.businessCodeNameMap.get(this.gsdm);
+	}
+
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+	
+	
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+}
 package com.bsth.repository;
 import java.util.List;
+import java.util.Map;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
@@ -52,4 +53,21 @@ public interface LsStationRouteRepository extends BaseRepository&lt;LsStationRoute,
     @Modifying
     @Query(value="UPDATE bsth_c_ls_stationroute set destroy = 1 where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
     public void batchDestroy(Integer sectionRouteLine, Integer directions, Integer versions);
+
+    /**
+     * 按线路编码查询各站点的顺序号
+     * @param lineCode 线路编码
+     * @param lineVersion 版本号
+     * @return
+     */
+    @Query("SELECT new map(" +
+            "lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
+            "line.linePlayType as linePlayType,s.stationMark as stationMark) " +
+            "FROM " +
+            "LsStationRoute s " +
+            "WHERE " +
+            "s.destroy = 0 AND s.lineCode = ?1 AND s.versions = ?2 " +
+            "ORDER BY " +
+            "lineCode,directions,stationRouteCode")
+    List<Map<String, String>> findLineWithLineCode4Ygc(String lineCode,Integer lineVersion);
 }
@@ -6,8 +6,10 @@ import javax.transaction.Transactional;
 import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -19,11 +21,11 @@ import org.springframework.stereotype.Repository;
 public interface CalcStatisticsRepository extends BaseRepository<CalcStatistics, Integer>{
 	//按照时间段统计，公司下线路
-	@Query(value="select DISTINCT c from CalcStatistics c where c.xl like %?1%  and c.dateStr between ?2 and ?3  and c.gsdm like %?4% and c.fgsdm like %?5% order by c.xl")
+	@Query(value="select DISTINCT c from CalcStatistics c where c.xl like %?1%  and c.dateStr between ?2 and ?3  and c.gsdm like %?4% and c.fgsdm like %?5% order by c.fgsdm,c.xl")
 	List<CalcStatistics> selectByDateAndLineTj(String line,String date,String date2,String gsdm,String fgsdm);
 	//按照时间段统计，单条线路
-	@Query(value="select DISTINCT c from CalcStatistics c where c.xl = ?1  and c.dateStr between ?2 and ?3 order by c.xl")
+	@Query(value="select DISTINCT c from CalcStatistics c where c.xl = ?1  and c.dateStr between ?2 and ?3 order by c.fgsdm,c.xl")
 	List<CalcStatistics> selectByDateAndLineTj2(String line,String date,String date2);
 	//按照日期和线路删除数据
@@ -38,4 +40,8 @@ public interface CalcStatisticsRepository extends BaseRepository&lt;CalcStatistics,
 	@Query(value = "delete CalcStatistics c where c.dateStr=?1")
 	void deleteByDate(String date);
+	//按照时间段查询实际排班(分公司条件不可为空)
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and s.scheduleDateStr between ?2 and ?3 and gsBm = ?4 and fgsBm = ?5 order by s.fgsBm, s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date,String date2,String gsdm,String fgsdm);
 }
@@ -105,7 +105,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 //	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date,String gsbm,String fgsbm);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2  order by s.xlBm,s.clZbh,s.jGh,s.adjustExps,s.fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2  order by s.xlBm,s.clZbh,s.jGh,s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineTjrb(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -170,7 +170,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLineQp2(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 and s.bcType not in ('in','out','ldks') order by s.xlBm,s.adjustExps,s.fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 and s.bcType not in ('in','out','ldks') order by s.xlBm,s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLine2(String line,String date);
 	//按月统计
@@ -180,12 +180,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and s.scheduleDateStr between ?2 and ?3 and gsBm = ?4 and fgsBm = ?5 order by s.xlBm")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and s.scheduleDateStr between ?2 and ?3 and gsBm = ?4 and fgsBm like %?5% order by s.fgsBm, s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2,String gsdm,String fgsdm);
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and s.scheduleDateStr >= ?2  and s.scheduleDateStr<= ?3 order by s.xlBm")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and s.scheduleDateStr >= ?2  and s.scheduleDateStr<= ?3 order by s.fgsBm,s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj2(String line,String date,String date2);
 		//月报表
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+package com.bsth.repository.sheet;
+
+import com.bsth.entity.sheet.CalcSheet;
+import com.bsth.repository.BaseRepository;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ */
+@Repository
+public interface CalcSheetRepository extends BaseRepository<CalcSheet, Integer>{
+	
+}
@@ -37,4 +37,6 @@ public interface LineService extends BaseService&lt;Line, Integer&gt; {
 	Map<String, Object> update(Line l);
     Map<String,Object> remove(Integer id);
+    
+    Map<String, Boolean> lineNature();
 }
@@ -30,9 +30,9 @@ public interface CalcWaybillService extends BaseService&lt;CalcWaybill, Integer&gt; {
 	 */
 	String calcDaily(String rq, String line) throws Exception;
-	List<CalcStatistics> calcStatisticsDaily(String gsdm,String fgsdm, String line, String date, String date2, String xlName, String type);
+	List<CalcStatistics> calcStatisticsDaily(String gsdm,String fgsdm, String line, String date, String date2, String xlName, String type,String nature);
-	List<Map<String, Object>> calcStatisticsDaily2(String gsdm,String fgsdm, String line, String date, String date2, String xlName, String type);
+	List<Map<String, Object>> calcStatisticsDaily2(String gsdm,String fgsdm, String line, String date, String date2, String xlName, String type,String nature);
 	Map<String, Object> calcLineMileage(String date, String line);
@@ -20,6 +20,7 @@ import java.util.Set;
 import javax.transaction.Transactional;
 import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
 import com.bsth.entity.calc.CalcBusMileage;
 import com.bsth.entity.calc.CalcInterval;
@@ -36,6 +37,7 @@ import com.bsth.repository.calc.CalcLineMileageRepository;
 import com.bsth.repository.calc.CalcStatisticsRepository;
 import com.bsth.repository.calc.CalcWaybillRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.LineService;
 import com.bsth.service.calc.CalcToolService;
 import com.bsth.service.calc.CalcWaybillService;
 import com.bsth.service.impl.BaseServiceImpl;
@@ -91,7 +93,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
     @Autowired
     private LineRepository lineRepository;
-
+    @Autowired
+    private LineService lineService;
     @Autowired
     private ReportService reportService;
@@ -550,7 +553,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	        //查询所有线路
 			for(Map<String, String> m : gsList){
-				list.addAll(scheduleRealInfoRepository.scheduleByDateAndLineTj(line, rq, rq, m.get("gsdm"), m.get("fgsdm")));
+				list.addAll(calcStatisticsRepository.scheduleByDateAndLine(line, rq, rq, m.get("gsdm"), m.get("fgsdm")));
 			}
 	        for (int i = 0; i < list.size(); i++) {
@@ -641,6 +644,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	        double sjyygl= culateService.culateSjgl(lists);
 	        double zyygl= Arith.add(sjyygl,ljgl);
+	        double ljksgl= culateService.culateLjksgl(lists);
 	        double sjjccgl=culateService.culateJccgl(lists);
 	        double sjksgl=culateService.culateKsgl(lists);
 	        double zksgl=Arith.add(sjjccgl, sjksgl);
@@ -648,6 +652,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	        s.setSjkslc(zksgl);
 	        s.setSjzlc(Arith.add(zyygl, zksgl));
+	        s.setLjkslc(ljksgl);
+	        
 	        s.setSslc(culateService.culateLbgl(list));
 	        s.setSsbc(culateService.culateLbbc(list));
@@ -733,28 +739,51 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	@Override
 	public List<CalcStatistics> calcStatisticsDaily(String gsdm, String fgsdm,
-			String line, String date, String date2, String xlName, String type) {
+			String line, String date, String date2, String xlName, String type,String nature) {
 		// TODO Auto-generated method stub
-		List<CalcStatistics> list = new ArrayList<CalcStatistics>();
+		List<CalcStatistics> listAll = new ArrayList<CalcStatistics>();
 		if(line.length() > 0){
-			list = calcStatisticsRepository.selectByDateAndLineTj2(line, date, date2);
+			listAll = calcStatisticsRepository.selectByDateAndLineTj2(line, date, date2);
 		} else {
-			list = calcStatisticsRepository.selectByDateAndLineTj(line, date, date2, gsdm, fgsdm);
+			listAll = calcStatisticsRepository.selectByDateAndLineTj(line, date, date2, gsdm, fgsdm);
+		}
+		Map<String, Boolean> lineMap=lineService.lineNature();
+		List<CalcStatistics> list = new ArrayList<CalcStatistics>();
+		if(nature.equals("0")){
+			list=listAll;
+		}else{
+			for (int i = 0; i < listAll.size(); i++) {
+				CalcStatistics c=listAll.get(i);
+				if(nature.equals("1")){
+					if(lineMap.get(c.getXl())){
+						list.add(c);
+					}
+				}else{
+					if(!lineMap.get(c.getXl())){
+						list.add(c);
+					}
+				}
+			}
 		}
-		
 		List<CalcStatistics> resList = new ArrayList<CalcStatistics>();
 		Map<String, List<CalcStatistics>> keyMap = new HashMap<String, List<CalcStatistics>>();
 		List<String> keyList = new ArrayList<String>();
 		for(CalcStatistics s : list){
     		try {
-				String key = PinyinHelper.convertToPinyinString(s.getXlName(), "" , PinyinFormat.WITHOUT_TONE);
-				if(!keyMap.containsKey(key)){
+//				String key = PinyinHelper.convertToPinyinString(s.getXl(), "" , PinyinFormat.WITHOUT_TONE);
+				String key =s.getFgsdm()+s.getXl();
+//				if(line.equals("")){
+//					key =s.getFgsdm()+s.getXl();
+//				}else{
+//					key =s.getXl();
+//				}
+    			if(!keyMap.containsKey(key)){
 					keyMap.put(key, new ArrayList<CalcStatistics>());
 					keyList.add(key);
 				}
 				keyMap.get(key).add(s);
-			} catch (PinyinException e) {
+			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
@@ -769,6 +798,13 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 						CalcStatistics s_ = keyMap.get(key).get(i);
 						s = addStatistics(s, s_);
 					}
+//				if(line.equals("")){
+					s.setFgsName(BasicData.businessFgsCodeNameMap.get(s.getFgsdm()+"_"+s.getGsdm()));
+				/*}else{
+					List<Line> l=lineRepository.findLineByCode(line);
+		        	if(l.size()>0)
+		        		s.setFgsName(BasicData.businessFgsCodeNameMap.get(l.get(0).getBrancheCompany()+"_"+l.get(0).getCompany()));
+				}*/
 				resList.add(s);
 			}
 		}
@@ -776,6 +812,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		if(resList.size() > 0){
 			CalcStatistics temp = new CalcStatistics();
 			temp.setXlName("合计");
+			temp.setFgsName("");
 			for(CalcStatistics s : resList){
 				temp = addStatistics(temp, s);
 			}
@@ -785,6 +822,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 		for(CalcStatistics c : resList){
 			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("fgsName", c.getFgsName());
 			m.put("xlName", c.getXlName());
 			m.put("jhzlc", c.getJhzlc());
 			m.put("jhlc", c.getJhyylc());
@@ -806,6 +844,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			m.put("ssgl_yw", c.getYwlc());
 			m.put("ssgl_other", c.getQtlc());
 			m.put("ljgl", c.getLjlc());
+			m.put("ljks", c.getLjkslc());
 			m.put("jhbc", c.getJhbcq());
 			m.put("jhbc_m", c.getJhbcz());
 			m.put("jhbc_a", c.getJhbcw());
@@ -859,7 +898,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	@Override
 	public List<Map<String, Object>> calcStatisticsDaily2(String gsdm, String fgsdm,
-			String line, String date, String date2, String xlName, String type) {
+			String line, String date, String date2, String xlName, String type,String nature) {
 		// TODO Auto-generated method stub
 		SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
 		Date beginDate = new Date();
@@ -899,26 +938,48 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		}
-		List<CalcStatistics> list = new ArrayList<CalcStatistics>();
+		List<CalcStatistics> listAll = new ArrayList<CalcStatistics>();
 		if(line.length() > 0){
-			list = calcStatisticsRepository.selectByDateAndLineTj2(line, d1, d2);
+			listAll = calcStatisticsRepository.selectByDateAndLineTj2(line, d1, d2);
 		} else {
-			list = calcStatisticsRepository.selectByDateAndLineTj(line, d1, d2, gsdm, fgsdm);
+			listAll = calcStatisticsRepository.selectByDateAndLineTj(line, d1, d2, gsdm, fgsdm);
 		}
+		Map<String, Boolean> lineMap=lineService.lineNature();
+		List<CalcStatistics> list=new ArrayList<CalcStatistics>();
+		for (int i = 0; i < listAll.size(); i++) {
+			CalcStatistics s=listAll.get(i);
+			if(nature.equals("0")){
+				list.add(s);
+			}else if(nature.equals("1")){
+				if(lineMap.containsKey(s.getXl()) && lineMap.get(s.getXl())){
+					list.add(s);
+				}
+			}else{
+				if(lineMap.containsKey(s.getXl()) && !lineMap.get(s.getXl())){
+					list.add(s);
+				}
+			}
+		}
 		List<CalcStatistics> resList = new ArrayList<CalcStatistics>();
 		Map<String, List<CalcStatistics>> keyMap = new HashMap<String, List<CalcStatistics>>();
 		List<String> keyList = new ArrayList<String>();
 		for(CalcStatistics s : list){
     		try {
-				String key = PinyinHelper.convertToPinyinString(s.getXlName(), "" , PinyinFormat.WITHOUT_TONE);
-				if(!keyMap.containsKey(key)){
+//				String key = PinyinHelper.convertToPinyinString(s.getXlName(), "" , PinyinFormat.WITHOUT_TONE);
+    			String key =s.getFgsdm()+s.getXl();
+//    			if(line.equals("")){
+//    				key =s.getFgsdm()+s.getXl();
+//				}else{
+//					 key =s.getXl();
+//				}
+    			if(!keyMap.containsKey(key)){
 					keyMap.put(key, new ArrayList<CalcStatistics>());
 					keyList.add(key);
 				}
 				keyMap.get(key).add(s);
-			} catch (PinyinException e) {
+			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
@@ -950,6 +1011,13 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 		for(CalcStatistics c : resList){
 			Map<String, Object> m = new HashMap<String, Object>();
+			if(c.getXl().equals("hj")){
+				m.put("fgsName", "");
+				m.put("fgsBm", "");
+			}else{
+				m.put("fgsName", BasicData.businessFgsCodeNameMap.get(c.getFgsdm()+"_"+c.getGsdm()));
+				m.put("fgsBm", c.getFgsdm());
+			}
 			m.put("xlBm", c.getXl());
 			m.put("xlName", c.getXlName());
 			m.put("jhzlc", c.getJhzlc());
@@ -972,6 +1040,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			m.put("ssgl_yw", c.getYwlc());
 			m.put("ssgl_other", c.getQtlc());
 			m.put("ljgl", c.getLjlc());
+			m.put("ljks", c.getLjkslc());
 			m.put("jhbc", c.getJhbcq());
 			m.put("jhbc_m", c.getJhbcz());
 			m.put("jhbc_a", c.getJhbcw());
@@ -1003,7 +1072,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		//实时数据
 		List<Map<String, Object>>  tjlist=new ArrayList<Map<String, Object>>();
 		if(!d4.equals("")){
-			 tjlist= scheduleRealInfoService.statisticsDailyTjHb(gsdm, fgsdm, line, d3, d4, xlName, type);
+			 tjlist= scheduleRealInfoService.statisticsDailyTjHb(gsdm, fgsdm, line, d3, d4, xlName, type,nature);
 		}
 		List<Map<String, Object>> mapListHj = new ArrayList<Map<String, Object>>();
 //		List<String> lineList=new ArrayList<String>();
@@ -1011,24 +1080,37 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		mapList.addAll(tjlist);
 		for (int i = 0; i < mapList.size(); i++) {
 			Map<String, Object> m =mapList.get(i);
-			if(kMap.get(m.get("xlBm").toString())==null){
-				kMap.put(m.get("xlBm").toString(), m.get("xlBm").toString());
-			}
+//			if(line.equals("")){
+				if(kMap.get(m.get("fgsBm")+"_"+m.get("xlBm").toString())==null){
+					kMap.put(m.get("fgsBm")+"_"+m.get("xlBm").toString(), m.get("fgsBm")+"_"+m.get("xlBm").toString());
+				}
+//			}else{
+//				if(kMap.get(m.get("xlBm").toString())==null){
+//					kMap.put(m.get("xlBm").toString(), m.get("xlBm").toString());
+//				}
+//			}
+			
 		}
 		 for (Object xlbm : kMap.keySet()) {  
 				Map<String, Object> hjMap = new HashMap<String, Object>();
 				for (int i = 0; i < mapList.size(); i++) {
 					Map<String, Object> lsMap=mapList.get(i);
-					if (lsMap.get("xlBm").toString().equals(xlbm)) {
+					String xlbm_="";
+//					if(line.equals("")){
+						xlbm_=lsMap.get("fgsBm").toString()+"_"+lsMap.get("xlBm").toString();
+//					}else{
+//						xlbm_=lsMap.get("xlBm").toString();
+//					}
+					if (xlbm_.equals(xlbm)) {
 						if(hjMap.get("xlBm")==null){
 							hjMap.put("xlBm", lsMap.get("xlBm"));
 							hjMap.put("xlName", lsMap.get("xlName"));
+							hjMap.put("fgsName", lsMap.get("fgsName"));
 							 try {
 								 if(lsMap.get("xlBm").toString().equals("hj")){
 									 hjMap.put("xlNamePy", "zzzzz");
-
 								 }else{
-									 hjMap.put("xlNamePy", PinyinHelper.convertToPinyinString(lsMap.get("xlName").toString(), "", PinyinFormat.WITHOUT_TONE));
+									 hjMap.put("xlNamePy", PinyinHelper.convertToPinyinString(lsMap.get("fgsBm").toString()+lsMap.get("xlName").toString(), "", PinyinFormat.WITHOUT_TONE));
 								 }
 					         } catch (PinyinException e) {
 					                // TODO Auto-generated catch block
@@ -1055,6 +1137,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 						hjMap.put("ssgl_yw", Arith.add(lsMap.get("ssgl_yw"), hjMap.get("ssgl_yw")==null?"0":hjMap.get("ssgl_yw")));
 						hjMap.put("ssgl_other", Arith.add(lsMap.get("ssgl_other"), hjMap.get("ssgl_other")==null?"0":hjMap.get("ssgl_other")));
 						hjMap.put("ljgl", Arith.add(lsMap.get("ljgl"), hjMap.get("ljgl")==null?"0":hjMap.get("ljgl")));
+						hjMap.put("ljks", Arith.add(lsMap.get("ljks"), hjMap.get("ljks")==null?"0":hjMap.get("ljks")));
 						hjMap.put("jhbc", Integer.parseInt(lsMap.get("jhbc").toString())+ Integer.parseInt(hjMap.get("jhbc")==null?"0":hjMap.get("jhbc").toString()));
 						hjMap.put("jhbc_m", Integer.parseInt(lsMap.get("jhbc_m").toString())+Integer.parseInt(hjMap.get("jhbc_m")==null?"0":hjMap.get("jhbc_m").toString()));
 						hjMap.put("jhbc_a", Integer.parseInt(lsMap.get("jhbc_a").toString())+ Integer.parseInt(hjMap.get("jhbc_a")==null?"0":hjMap.get("jhbc_a").toString()));
@@ -1082,8 +1165,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 								hjMap.put("djg_time",hjMap.get("djg_time"));
 							}
 						}
-						
-						
 						double jl = Arith.sub(Arith.add(hjMap.get("jhlc"), hjMap.get("ljgl")), hjMap.get("ssgl"));
 			            if (jl == Double.parseDouble(hjMap.get("sjgl").toString())) {
 			            	hjMap.put("zt", 0);
@@ -1097,7 +1178,15 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	        Collections.sort(mapListHj, new AccountXlbmByping());
-		
+		/*if(!line.equals("")){
+			for (int i = 0; i < mapListHj.size(); i++) {
+				if(mapListHj.get(i).get("xlBm").equals(line)){
+		        	List<Line> l=lineRepository.findLineByCode(line);
+		        	if(l.size()>0)
+		        		mapListHj.get(i).put("fgsName", BasicData.businessFgsCodeNameMap.get(l.get(0).getBrancheCompany()+"_"+l.get(0).getCompany()));
+				}
+			}
+		}*/
 		if (type != null && type.length() != 0 && type.equals("export")) {
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
                     sdfSimple = new SimpleDateFormat("yyyyMMdd");
@@ -1115,7 +1204,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
             	}
                 listI.add(mapListHj.iterator());
                 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls",
                         path + "export/" + dateTime + "-" + xlName + "-统计日报.xls");
             } catch (Exception e) {
                 // TODO: handle exception
@@ -1148,6 +1237,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		s.setYwlc(Arith.add(s.getYwlc()!=null?s.getYwlc():0, s_.getYwlc()));
 		s.setQtlc(Arith.add(s.getQtlc()!=null?s.getQtlc():0, s_.getQtlc()));
 		s.setLjlc(Arith.add(s.getLjlc()!=null?s.getLjlc():0, s_.getLjlc()));
+		s.setLjkslc(Arith.add(s.getLjkslc()!=null?s.getLjkslc():0, s_.getLjkslc()));
 		s.setJhbcq(s.getJhbcq() + s_.getJhbcq());
 		s.setJhbcz(s.getJhbcz() + s_.getJhbcz());
 		s.setJhbcw(s.getJhbcw() + s_.getJhbcw());
@@ -28,7 +28,6 @@ import com.bsth.entity.mcy_forms.Operationservice;
 import com.bsth.entity.mcy_forms.Shifday;
 import com.bsth.entity.mcy_forms.Shiftuehiclemanth;
 import com.bsth.entity.mcy_forms.Singledata;
-import com.bsth.entity.mcy_forms.Turnoutrate;
 import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.oil.Dlb;
@@ -45,6 +44,7 @@ import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
 import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.mcy_forms.Executionrate;
+import com.bsth.service.LineService;
 import com.bsth.service.forms.CommonService;
 import com.bsth.service.forms.FormsService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
@@ -61,6 +61,9 @@ public class FormsServiceImpl implements FormsService {
 	ScheduleRealInfoService scheduleRealInfoService;
 	@Autowired
+	LineService lineService;
+	
+	@Autowired
 	CommonService commonService;
 	@Autowired
@@ -214,11 +217,11 @@ public class FormsServiceImpl implements FormsService {
 			sql+=" and l.line_code=" + map.get("line").toString();
 		}
 			sql+= " AND r.gs_bm is not null";
-		if(map.get("gsdmLine").toString()!=""){
+		if(map.get("gsdmLine") != null && map.get("gsdmLine").toString()!=""){
 			sql+=" and r.gs_bm='"+map.get("gsdmLine").toString()+"' ";
 		}
-		if(map.get("fgsdmLine").toString()!=""){
-			sql+=" and r.fgs_bm='"+map.get("fgsdmLine").toString()+"'";
+		if(map.get("fgsdmLine") != null && map.get("fgsdmLine").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmLine").toString()+"' ";
 		}	
 			sql	+= " GROUP BY s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
 		List<Linepasswengerflow> list = jdbcTemplate.query(sql, new RowMapper<Linepasswengerflow>() {
@@ -244,10 +247,10 @@ public class FormsServiceImpl implements FormsService {
 		final String empnames=map.get("empnames").toString();
 		String gsdmManth="";
 		String fgsdmManth="";
-		if(map.containsKey("gsdmManth")){
+		if(map.get("gsdmManth") != null){
 			gsdmManth=map.get("gsdmManth").toString();
 		}
-		if(map.containsKey("fgsdmManth")){
+		if(map.get("fgsdmManth") != null){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
 		String sql ="select ";
@@ -410,10 +413,10 @@ public class FormsServiceImpl implements FormsService {
 		final String empnames=map.get("empnames").toString();
 		String gsdmManth="";
 		String fgsdmManth="";
-		if(map.containsKey("gsdmManth")){
+		if(map.get("gsdmManth")!=null){
 			gsdmManth=map.get("gsdmManth").toString();
 		}
-		if(map.containsKey("fgsdmManth")){
+		if(map.get("fgsdmManth")!=null){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
 		String sql ="select ";
@@ -766,6 +769,10 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
+		String sfyy="";
+		if(map.get("sfyy")!=null){
+			sfyy=map.get("sfyy").toString();
+		}
 		String line="";
 		if(map.get("line")!=null){
 			line=map.get("line").toString().trim();
@@ -784,21 +791,23 @@ public class FormsServiceImpl implements FormsService {
 		if(!line.equals("")){
 			sql +=" and xl= '"+line+"'";
-		}else{
-			sql += " and gs= '"+gs+"' and fgs= '"+fgs+"'";
+		}
+		if(!gs.equals("")){
+			sql += " and gs= '"+gs+"'";
+		}
+		if(!fgs.equals("")){
+			sql += " and fgs= '"+fgs+"'";
 		}
 		sql +=" order by rq";
 		List<Changetochange> list = jdbcTemplate.query(sql, new RowMapper<Changetochange>() {
-
-			
 			@Override
 			public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Changetochange chan = new Changetochange();
 				chan.setRq(arg0.getString("rq"));
 				chan.setGs(BasicData.businessCodeNameMap.get(arg0.getString("gs")));
 				chan.setFgs(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs")+"_"+arg0.getString("gs")));
-				chan.setXl(BasicData.lineCode2NameMap.get(arg0.getString("xl")));
+				chan.setXl(arg0.getString("xl"));
 				chan.setLp(arg0.getString("lp"));
 				chan.setFssj(arg0.getString("fssj"));
 				chan.setXgsj(arg0.getString("xgsj"));
@@ -813,13 +822,42 @@ public class FormsServiceImpl implements FormsService {
 				return chan;
 			}
 		});
-		return list;
+		
+		Map<String, Boolean> lineNature = lineService.lineNature();
+		List<Changetochange> resList = new ArrayList<Changetochange>();
+		
+		for(Changetochange c : list){
+			String xl = c.getXl();
+			if(sfyy.length() != 0){
+				if(sfyy.equals("0")){
+					resList.add(c);
+				} else if(sfyy.equals("1")){
+					if(lineNature.containsKey(xl) && lineNature.get(xl)){
+						resList.add(c);
+					}
+				} else {
+					if(lineNature.containsKey(xl) && !lineNature.get(xl)){
+						resList.add(c);
+					}
+				}
+			} else {
+				resList.add(c);
+			}
+			
+			c.setXl(BasicData.lineCode2NameMap.get(xl));
+		}
+		
+		return resList;
 	}
 	// 路单数据
 		@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();
@@ -843,16 +881,20 @@ public class FormsServiceImpl implements FormsService {
 			List<Singledata> list_=new ArrayList<Singledata>();
 			if(tjtype.equals("jsy")){
 				//油统计
-				String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.j_name"
+				String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.j_name,r.fgs_bm"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'";
-				if(xlbm.equals("")){
-					sql +="and r.gs_bm='"+gsdm+"' "
-							+ " and r.fgs_bm='"+fgsdm+"'";
-				}else{
+				if(xlbm.length() != 0){
 					sql += " and r.xl_bm = '"+xlbm+"'";
 				}
-			       sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh,r.j_name order by r.xl_bm,r.cl_zbh";
+				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,r.j_name 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 {
@@ -861,20 +903,30 @@ public class FormsServiceImpl implements FormsService {
 						sin.setJsy(arg0.getString("j_gh"));
 						sin.setjName(arg0.getString("j_name"));
 						sin.setClzbh(arg0.getString("cl_zbh"));
+						sin.setgS(arg0.getString("fgs_bm"));
 						return sin;
 					}
 				});
+
+				Collections.sort(list,new SingledataByXlbm());
+			    
 			    String linesql="";
 			    if(!xlbm.equals("")){
 			    	linesql +=" and xlbm ='"+xlbm+"' ";
 			    }
-				String nysql="SELECT id,xlbm,nbbm, jsy,jzl as jzl,yh as yh,sh as sh FROM bsth_c_ylb "
+			    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 ssgsdm = '"+gsdm+"' AND fgsdm = '"+fgsdm+"'"  +linesql
+						+ linesql
 						+ " union"
-						+ "  SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh FROM bsth_c_dlb"
+						+ "  SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh,fgsdm FROM bsth_c_dlb"
 						+ " WHERE rq = '"+startDate+"'"
-						+ " AND ssgsdm = '"+gsdm+"' AND fgsdm = '"+fgsdm+"'"+linesql;
+						+ linesql;
 				List<Singledata> listNy = jdbcTemplate.query(nysql, new RowMapper<Singledata>() {
 					@Override
 					public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -885,6 +937,7 @@ public class FormsServiceImpl implements FormsService {
 						sin.setJzl(arg0.getString("jzl"));
 						sin.setHyl(arg0.getString("yh"));
 						sin.setUnyyyl(arg0.getString("sh"));
+						sin.setgS(arg0.getString("fgsdm"));
 						return sin;
 					}
 				});
@@ -913,7 +966,7 @@ public class FormsServiceImpl implements FormsService {
 						s.setClzbh(clzbh);
 						s.setSgh("");
 						s.setsName("");
-						s.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+						s.setgS(BasicData.businessFgsCodeNameMap.get(sin_.getgS()+"_"+gsdm));
 						s.setxL(line);
 						s.setXlmc(BasicData.lineCode2NameMap.get(line));
 						s.setJzl(sin_.getJzl());
@@ -983,27 +1036,29 @@ public class FormsServiceImpl implements FormsService {
 //					sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
 					sin.setSgh("");
 					sin.setsName("");
-					sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+					sin.setgS(BasicData.businessFgsCodeNameMap.get(sin.getgS()+"_"+gsdm));
 					list_.add(sin);
 				}
-				Collections.sort(list_,new SingledataByXlbm());
 			}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+"'"
 								+ " and r.s_gh !='' and r.s_gh is not null ";
-				if(xlbm.equals("")){
-					sql +="and r.gs_bm='"+gsdm+"' "
-							+ " and r.fgs_bm='"+fgsdm+"'";
-				}else{
+				if(!xlbm.equals("")){
 					sql += " and r.xl_bm = '"+xlbm+"'";
 				}
-			       sql += " group  by  r.s_gh,r.s_name,"
+				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>() {
+				list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 					//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 					@Override
 					public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -1013,10 +1068,13 @@ public class FormsServiceImpl implements FormsService {
 						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;
 					}
 				});
+				Collections.sort(list,new SingledataByXlbm());
+				
 				for (int i = 0; i < list.size(); i++) {
 					Singledata sin=list.get(i);
 					String jsy=sin.getSgh();
@@ -1058,15 +1116,36 @@ public class FormsServiceImpl implements FormsService {
 					sin.setClzbh(clzbh);
 					sin.setJsy("");
 					sin.setjName("");
-					sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+					sin.setgS(BasicData.businessFgsCodeNameMap.get(sin.getgS()+"_"+gsdm));
 					sin.setHyl("");
 					sin.setJzl("");
 					sin.setUnyyyl("");
 					list_.add(sin);
 				}
-				Collections.sort(list_,new SingledataByXlbm());
 			}
-			return list_;
+			
+			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);
+				}
+			}
+			
+			return resList;
 		}
@@ -1098,12 +1177,15 @@ public class FormsServiceImpl implements FormsService {
 				String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.j_name"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'";
-				if(xlbm.equals("")){
-					sql +="and r.gs_bm='"+gsdm+"' "
-							+ " and r.fgs_bm='"+fgsdm+"'";
-				}else{
+				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.j_gh,r.xl_bm,r.cl_zbh,r.j_name order by r.xl_bm,r.cl_zbh";
 			    list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 					@Override
@@ -1118,15 +1200,21 @@ public class FormsServiceImpl implements FormsService {
 				});
 			    String linesql="";
 			    if(!xlbm.equals("")){
-			    	linesql +=" and xlbm ='"+xlbm+"' ";
+			    	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 FROM bsth_c_ylb "
 						+ " WHERE rq = '"+startDate+"'"
-						+ " AND ssgsdm = '"+gsdm+"' AND fgsdm = '"+fgsdm+"'"  +linesql
+						+ linesql
 						+ " union"
 						+ "  SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh FROM bsth_c_dlb"
 						+ " WHERE rq = '"+startDate+"'"
-						+ " AND ssgsdm = '"+gsdm+"' AND fgsdm = '"+fgsdm+"'"+linesql;
+						+ linesql;
 				List<Singledata> listNy = jdbcTemplate.query(nysql, new RowMapper<Singledata>() {
 					@Override
 					public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -1246,14 +1334,17 @@ public class FormsServiceImpl implements FormsService {
 						+ " 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 ";
-				if(xlbm.equals("")){
-					sql +="and r.gs_bm='"+gsdm+"' "
-							+ " and r.fgs_bm='"+fgsdm+"'";
-				}else{
+				if(!xlbm.equals("")){
 					sql += " and r.xl_bm = '"+xlbm+"'";
 				}
-			       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";
+				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");
@@ -1635,14 +1726,17 @@ public class FormsServiceImpl implements FormsService {
 		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"
 				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
-		if(xlbm.equals("")){
-			sql +="and r.gs_bm='"+gsdm+"' "
-					+ " and r.fgs_bm='"+fgsdm+"'";
-		}else{
+		if(!xlbm.equals("")){
 			sql += " and r.xl_bm = '"+xlbm+"'";
 		}
-	       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";
+		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.j_gh,r.j_name,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1929,14 +2023,17 @@ public class FormsServiceImpl implements FormsService {
 						+ " 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 ";
-				if(xlbm.equals("")){
-					sql +="and r.gs_bm='"+gsdm+"' "
-							+ " and r.fgs_bm='"+fgsdm+"'";
-				}else{
+				if(!xlbm.equals("")){
 					sql += " and r.xl_bm = '"+xlbm+"'";
 				}
-			       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";
+				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");
@@ -2205,13 +2302,16 @@ public class FormsServiceImpl implements FormsService {
 					+ " 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+"'"
-							+ " and r.s_gh !='' and r.s_gh is not null ";
-			if(xlbm.equals("")){
-				sql +="and r.gs_bm='"+gsdm+"' "
-						+ " and r.fgs_bm='"+fgsdm+"'";
-			}else{
+					+ " 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";
@@ -2285,7 +2385,10 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Operationservice> operationservice(Map<String, Object> map) {
-		String xlbm=map.get("line").toString().trim();
+		String sfyy="";
+		if(map.get("sfyy")!=null){
+			sfyy=map.get("sfyy").toString();
+		}
 		String gsdm="";
 		if(map.get("gsdmOperat")!=null){
 			gsdm=map.get("gsdmOperat").toString();
@@ -2294,37 +2397,72 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("fgsdmOperat")!=null){
 			fgsdm=map.get("fgsdmOperat").toString();
 		}
-		startDate=map.get("startDate").toString();
-		endDate =map.get("endDate").toString();
-		String sql="select r.xl_bm"
+		String xlbm=map.get("line").toString().trim();
+		String startDate=map.get("startDate").toString();
+		String endDate =map.get("endDate").toString();
+		
+		String sql="select r.xl_bm, r.gs_bm, r.fgs_bm"
 				+ " from bsth_c_s_sp_info_real r where"
 				+ " r.schedule_date_str BETWEEN  '"+startDate+"' and '"+endDate+"'";
-		if(xlbm.equals("")){
-			sql +="and r.gs_bm='"+gsdm+"' "
-					+ " and r.fgs_bm='"+fgsdm+"'";
-		}else{
+		if(xlbm.length() != 0){
 			sql += " and r.xl_bm = '"+xlbm+"'";
 		}
-	       sql += " group  by  r.xl_bm";
-		
+		if(gsdm.length() != 0){
+			sql += " and r.gs_bm='"+gsdm+"'";
+		}
+		if(fgsdm.length() != 0){
+			sql += " and r.fgs_bm='"+fgsdm+"'";
+		}
+	    sql += " group by r.gs_bm, r.fgs_bm, r.xl_bm " +
+	    		"order by r.gs_bm, r.fgs_bm, r.xl_bm";
+	    
+	    System.out.println(sql);
-	       List<Operationservice> list= jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
-				@Override
-				public Operationservice mapRow(ResultSet arg0, int arg1) throws SQLException {
-					Operationservice ve = new Operationservice();
-					ve.setXlBm(arg0.getString("xl_bm"));
-					return ve;
+	    List<Operationservice> query = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
+			@Override
+			public Operationservice mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Operationservice ve = new Operationservice();
+				ve.setXlBm(arg0.getString("xl_bm"));
+				ve.setGs(arg0.getString("gs_bm"));
+				ve.setFgs(arg0.getString("fgs_bm"));
+				return ve;
+			}
+		});
+	    
+	    List<Operationservice> list = new ArrayList<Operationservice>();
+	    Map<String, Boolean> lineNature = lineService.lineNature();
+	    for(Operationservice o : query){
+	    	o.setFgs(BasicData.businessFgsCodeNameMap.get(o.getFgs()+"_"+o.getGs()));
+	    	
+	    	String xl = o.getXlBm();
+			if(sfyy.length() != 0){
+				if(sfyy.equals("0")){
+					list.add(o);
+				} else if(sfyy.equals("1")){
+					if(lineNature.containsKey(xl) && lineNature.get(xl)){
+						list.add(o);
+					}
+				} else {
+					if(lineNature.containsKey(xl) && !lineNature.get(xl)){
+						list.add(o);
+					}
 				}
-			});
-	       
-	       String ylbSql=" select * from bsth_c_ylb where rq BETWEEN '"+startDate+"' and '"+endDate+"'";
-	       if(xlbm.equals("")){
-	    	   ylbSql +="and ssgsdm='"+gsdm+"' "
-						+ " and fgsdm='"+fgsdm+"'";
-			}else{
+			} else {
+				list.add(o);
+			}
+	    }
+
+	    	String ylbSql=" select * from bsth_c_ylb where rq BETWEEN '"+startDate+"' and '"+endDate+"'";
+	    	if(!xlbm.equals("")){
 				ylbSql += " and xlbm = '"+xlbm+"'";
 			}
-	       List<Ylb> ylbList= jdbcTemplate.query(ylbSql, new RowMapper<Ylb>() {
+	    	if(!gsdm.equals("")){
+		    	ylbSql += " and ssgsdm='"+gsdm+"'";
+			}
+	    	if(!fgsdm.equals("")){
+		    	ylbSql += " and fgsdm='"+fgsdm+"'";
+			}
+	    	List<Ylb> ylbList= jdbcTemplate.query(ylbSql, new RowMapper<Ylb>() {
 				@Override
 				public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
 					Ylb y = new Ylb();
@@ -2333,16 +2471,19 @@ public class FormsServiceImpl implements FormsService {
 					y.setYh(arg0.getDouble("yh"));
 					return y;
 				}
-			});
+	    	});
-	       String dlbSql=" select * from bsth_c_dlb where rq BETWEEN '"+startDate+"' and '"+endDate+"'";
-	       if(xlbm.equals("")){
-	    	   ylbSql +="and ssgsdm='"+gsdm+"' "
-						+ " and fgsdm='"+fgsdm+"'";
-			}else{
+	    	String dlbSql=" select * from bsth_c_dlb where rq BETWEEN '"+startDate+"' and '"+endDate+"'";
+	    	if(!xlbm.equals("")){
 				ylbSql += " and xlbm = '"+xlbm+"'";
 			}
-	       List<Dlb> dlbList= jdbcTemplate.query(dlbSql, new RowMapper<Dlb>() {
+	    	if(!gsdm.equals("")){
+	    		ylbSql += " and ssgsdm='"+gsdm+"'";
+			}
+	    	if(!fgsdm.equals("")){
+	    		ylbSql += " and fgsdm='"+fgsdm+"'";
+			}
+	    	List<Dlb> dlbList= jdbcTemplate.query(dlbSql, new RowMapper<Dlb>() {
 				@Override
 				public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
 					Dlb d = new Dlb();
@@ -2544,8 +2685,13 @@ public class FormsServiceImpl implements FormsService {
 		}
 		String rq2 = sdf1.format(d);
 		String rq3 = sdf1.format(d1);
-		String company = map.get("gsdmTurn").toString();
-		String subCompany = map.get("fgsdmTurn").toString();
+		String company = "", subCompany = "";
+		if(map.get("gsdmTurn") != null){
+			company = map.get("gsdmTurn").toString();
+		}
+		if(map.get("fgsdmTurn") != null){
+			subCompany = map.get("fgsdmTurn").toString();
+		}
 		String line = map.get("line").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
@@ -2559,12 +2705,17 @@ public class FormsServiceImpl implements FormsService {
 		List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line.length()==0?"%"+line+"%":line);
 		String sql = "select gs_name, fgs_name, cl_zbh, fcsj, bc_type, xl_bm, xl_name, schedule_date"
-				+ " from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
-				+ "and schedule_date >= '"+startDate+"' "
-				+ "and schedule_date <= '"+endDate+"' ";
+				+ " from bsth_c_s_sp_info where "
+				+ "schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"' ";
 		if(line.trim().length() != 0){
 			sql += "and xl_bm = '"+line+"' ";
 		}
+		if(company.trim().length() != 0){
+			sql += "and gs_bm = '"+company+"' ";
+		}
+		if(subCompany.trim().length() != 0){
+			sql += "and fgs_bm = '"+subCompany+"' ";
+		}
 		List<SchedulePlanInfo> planList = jdbcTemplate.query(sql, new RowMapper<SchedulePlanInfo>() {
 			@Override
@@ -2711,18 +2862,34 @@ public class FormsServiceImpl implements FormsService {
 			e.printStackTrace();
 		}
+		
+		String gsbm = "", fgsbm = "";
+		if(map.get("gsdmEcecut")!=null){
+			gsbm = map.get("gsdmEcecut").toString();
+		}
+		if(map.get("fgsdmEcecut")!=null){
+			fgsbm = map.get("fgsdmEcecut").toString();
+		}
+		
 		String rq2 = sdf1.format(d);
 		String rq3 = sdf1.format(d1);
 		rq = rq2 + "-" + rq3;
+		String where = "";
+		if(gsbm.trim().length() != 0){
+			where += " and gs_bm = '" + gsbm + "'";
+		}
+		if(fgsbm.trim().length() != 0){
+			where += " and fgs_bm = '" + fgsbm + "'";
+		}
+		
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
 				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
 				+ " from bsth_c_s_sp_info" + "  where schedule_date >= '"
 				+ map.get("startDate").toString() + "'  and  schedule_date <= '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
-				+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"
+				+ where
 //				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
 				+ " ) a left JOIN ("
 				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl  "
@@ -2899,14 +3066,17 @@ public class FormsServiceImpl implements FormsService {
 				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
 				+ " from bsth_c_s_sp_info_real r where "
 				+ "r.schedule_date_str = '"+map.get("date").toString()+"'";
-		if(xlbm.equals("")){
-			sql +="and r.gs_bm='"+gsbm+"' "
-					+ " and r.fgs_bm='"+fgsbm+"'";
-		}else{
+		if(!xlbm.equals("")){
 			sql += " and r.xl_bm = '"+xlbm+"'";
 		}
-	       sql += " group  by r.schedule_date_str,"
-	       		+ " 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";
+		if(!gsbm.equals("")){
+			sql += " and r.gs_bm='"+gsbm+"'";
+		}
+		if(!fgsbm.equals("")){
+			sql += " and r.fgs_bm='"+fgsbm+"'";
+		}
+		sql += " group  by r.schedule_date_str,"
+				+ " 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";
 		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
 			@Override
@@ -2972,10 +3142,10 @@ public class FormsServiceImpl implements FormsService {
 	}
 	class SingledataByXlbm implements Comparator<Singledata>{
-		 @Override
-			public int compare(Singledata o1, Singledata o2) {
-				// TODO Auto-generated method stub
-				return  (o2.getxL()+o2.getClzbh()).compareTo((o1.getxL()+o1.getClzbh()));
-			}
+		@Override
+		public int compare(Singledata o1, Singledata o2) {
+			// TODO Auto-generated method stub
+			return (o1.getgS()+o1.getxL()+o1.getClzbh()).compareTo((o2.getgS()+o2.getxL()+o2.getClzbh()));
+		}
 	}
 }
@@ -150,9 +150,9 @@ public class GpsServiceImpl implements GpsService {
      * @return -1无效 0上行 1下行
      */
     public static byte getUpOrDown(long serviceState) {
-        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+        /*if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
                 || (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
-            return -1;
+            return -1;*/
         return (byte) (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
     }
@@ -162,8 +162,8 @@ public class GpsServiceImpl implements GpsService {
      * @return -1无效 0运营 1未运营
      */
     public static byte getService(long serviceState) {
-        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
-            return -1;
+        /*if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
+            return -1;*/
         return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
     }
@@ -359,6 +359,10 @@ public class GpsServiceImpl implements GpsService {
         return (byte)(((serviceState & 0x80000000) == 0x80000000) ? 1 : 0);
     }
+    public static void main(String[] args){
+        System.out.println(getGpsValid(-2147483648));
+    }
+
     public Map<String, ArrivalEntity> findArrivalByTs(Long st, Long et, List<DeviceChange> dcs) {
         Map<String, ArrivalEntity> map = new HashMap<>();
@@ -743,11 +747,12 @@ public class GpsServiceImpl implements GpsService {
         row.setHeight((short) (1.5 * 256));
         row.createCell(0).setCellValue("序号");
         row.createCell(1).setCellValue("车辆");
-        row.createCell(2).setCellValue("所在道路");
-        row.createCell(3).setCellValue("经度");
-        row.createCell(4).setCellValue("纬度");
-        row.createCell(5).setCellValue("时间");
-        row.createCell(6).setCellValue("速度");
+        row.createCell(2).setCellValue("牌照号");
+        row.createCell(3).setCellValue("所在道路");
+        row.createCell(4).setCellValue("经度");
+        row.createCell(5).setCellValue("纬度");
+        row.createCell(6).setCellValue("时间");
+        row.createCell(7).setCellValue("速度");
         //数据
         DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HH:mm.ss"),
                 fmt = DateTimeFormat.forPattern("yyyyMMddHHmm");
@@ -756,12 +761,13 @@ public class GpsServiceImpl implements GpsService {
             gps = list.get(i);
             row = sheet.createRow(i + 1);
             row.createCell(0).setCellValue(i + 1);
-            row.createCell(1).setCellValue(gps.getNbbm());
-            row.createCell(2).setCellValue(gps.getSection_name());
-            row.createCell(3).setCellValue(gps.getLon());
-            row.createCell(4).setCellValue(gps.getLat());
-            row.createCell(5).setCellValue(fmtHHmmss.print(gps.getTimestamp()));
-            row.createCell(6).setCellValue(gps.getSpeed());
+            row.createCell(1).setCellValue(nbbm);
+            row.createCell(2).setCellValue(BasicData.nbbmCompanyPlateMap.get(nbbm));
+            row.createCell(3).setCellValue(gps.getSection_name());
+            row.createCell(4).setCellValue(gps.getLon());
+            row.createCell(5).setCellValue(gps.getLat());
+            row.createCell(6).setCellValue(fmtHHmmss.print(gps.getTimestamp()));
+            row.createCell(7).setCellValue(gps.getSpeed());
         }
         st = st * 1000;
@@ -44,6 +44,7 @@ import com.bsth.repository.oil.DlbRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.BusIntervalService;
+import com.bsth.service.LineService;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.schedule.PeopleCarPlanService;
 import com.bsth.service.sys.DutyEmployeeService;
@@ -60,8 +61,11 @@ import com.google.gson.Gson;
 public class BusIntervalServiceImpl implements BusIntervalService {
     @Autowired
-    CulateMileageService culateService;
+    LineService lineService;
+    @Autowired
+    CulateMileageService culateService;
+    
 	@Autowired
 	private PeopleCarPlanService peopleCarPlanService;
@@ -113,7 +117,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
 			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+				sql += " and gs_bm = '"+company+"'";
+			}
+			if(subCompany.length() != 0){
+				sql += " and fgs_bm = '"+subCompany+"'";
 			}
 			if(normal){
 				sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
@@ -147,6 +154,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setAdjustExps(rs.getString("adjust_exps"));
 					schedule.setJhlcOrig(rs.getDouble("jhlc_orig"));
 					schedule.setRemarks(rs.getString("remarks"));
+					schedule.setFgsBm(rs.getString("fgs_bm"));
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
 					schedule.setDfAuto(rs.getBoolean("df_auto"));
@@ -419,8 +427,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
-		String company = map.get("company").toString();
-		String subCompany = map.get("subCompany").toString();
+		String company = "", subCompany = "";
+		if(map.get("company")!=null)
+			company = map.get("company").toString();
+		if(map.get("subCompany")!=null)
+			subCompany = map.get("subCompany").toString();
 		String line = map.get("line").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
@@ -429,6 +440,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String times1 = map.get("times1").toString();
 		String times2 = map.get("times2").toString();
 		String type = map.get("type").toString();
+		String sfyy = map.get("sfyy").toString();
 		int sfqr = Integer.valueOf(map.get("sfqr").toString());
 		if(startDate.length() == 0){
@@ -467,6 +479,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //		int startTime = Integer.valueOf(split[0].split(":")[0])*60 + Integer.valueOf(split[0].split(":")[1]);
 //		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
+		Map<String, Boolean> lineNature = lineService.lineNature();
+		
 		for(ScheduleRealInfo schedule : list){
 			if(schedule.isCcService())
 				continue;
@@ -479,7 +493,19 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			}
 			if(schedule.getXlName() == null || schedule.getXlName().trim().length() == 0)
 				continue;
-			String key = schedule.getXlBm() + "/" + schedule.getXlName() + "/" + schedule.getQdzName();
+			
+			if(lineNature.containsKey(schedule.getXlBm()) && lineNature.get(schedule.getXlBm()) != null){
+				if(sfyy.equals("1") && !lineNature.get(schedule.getXlBm())){
+					continue;
+				} else if(sfyy.equals("2") && lineNature.get(schedule.getXlBm())){
+					continue;
+				}
+			} else if(sfyy.equals("2")){
+				continue;
+			}
+			
+			String key = schedule.getXlBm() + "/" + schedule.getXlName() + "/" + schedule.getQdzName()
+					+ "/" + schedule.getFgsName() + "/" + schedule.getFgsBm();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 			keyMap.get(key).add(schedule);
@@ -592,7 +618,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					tempMap.put("line", split[1]);
 					tempMap.put("qdz", split[2]);
 					tempMap.put("company", companyName);
-					tempMap.put("subCompany", subCompanyName);
+					tempMap.put("subCompany", split[3]);
+					tempMap.put("fgsbm", split[4]);
 					long jhInterval = 0l;
 					long sjInterval = 0l;
 					for(Long i : fcsjs)
@@ -622,7 +649,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			Map<Long, List<Map<String, Object>>> sortMap = new HashMap<Long, List<Map<String, Object>>>();
 			for(Map<String, Object> m : tempList){
 				String times = m.get("times").toString();
-				Long sort = Long.valueOf(times.substring(0, 2));
+				Long sort = Long.valueOf(times.substring(0, 2)) * 1000l
+						+ Long.valueOf(m.get("fgsbm").toString());
 				if(!sortMap.containsKey(sort)){
 					sortMap.put(sort, new ArrayList<Map<String, Object>>());
 					sortList.add(sort);
@@ -649,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("/")[0]);
+				long xlBm = Long.valueOf(key.split("/")[4]) * 1000000l + Long.valueOf(key.split("/")[0]);
 				if(!longList.contains(xlBm))
 					longList.add(xlBm);
 				Collections.sort(longList);
@@ -657,7 +685,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(long xlBm : longList){
 				for(String key : keyList){
 					String[] split = key.split("/");
-					if((long)Long.valueOf(split[0]) == xlBm){
+					long kl = Long.valueOf(split[4]) * 1000000l + Long.valueOf(split[0]);
+					if(kl == xlBm){
 						Map<String, Object> tempMap = new HashMap<String, Object>();
 						List<Long> fcsjs = new ArrayList<Long>();
 						List<Long> fcsjAs = new ArrayList<Long>();
@@ -683,7 +712,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						tempMap.put("line", split[1]);
 						tempMap.put("qdz", split[2]);
 						tempMap.put("company", companyName);
-						tempMap.put("subCompany", subCompanyName);
+						tempMap.put("subCompany", split[3]);
+						tempMap.put("fgsbm", split[4]);
 						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):"/");
@@ -745,9 +775,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		Set<Long> tsSet = new HashSet<Long>();
 		Set<Long> ttSet = new HashSet<Long>();
-		String company = map.get("company").toString();
-		String subCompany = map.get("subCompany").toString();
+		String company = "", subCompany = "";
+		if(map.get("company")!=null)
+			company = map.get("company").toString();
+		if(map.get("subCompany")!=null)
+			subCompany = map.get("subCompany").toString();
 		String lp = map.get("lp").toString();
+		String sfyy = map.get("sfyy").toString();
 		String line = map.get("line").toString();
 		String statu = map.get("statu").toString();
 		String startDate = map.get("startDate").toString();
@@ -775,7 +809,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				where += " and lp_name = '"+lp+"'";
 			}
 			if(company.length() != 0){
-				where += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+				where += " and gs_bm = '"+company+"'";
+			}
+			if(subCompany.length() != 0){
+				where += " and fgs_bm = '"+subCompany+"'";
 			}
 			if(sfqr == 1){
 				where += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
@@ -783,7 +820,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 			where += " and bc_type != 'ldks'";
-			String sql = "select id, schedule_date_str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type,"
+			String sql = "select id, schedule_date_str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type, xl_bm, fgs_bm,"
 					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
 					+ " ,cc_service from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"'"
 					+ " and schedule_date_str <= '"+endDate+"'"+where+"";
@@ -796,6 +833,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setId(rs.getLong("id"));
 					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
+					schedule.setXlBm(rs.getString("xl_bm"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
 					schedule.setBcs(rs.getInt("bcs"));
@@ -813,6 +851,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setRemarks(rs.getString("remarks"));
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
+					schedule.setFgsBm(rs.getString("fgs_bm"));
 					schedule.setSpId(rs.getLong("sp_id"));
 					schedule.setCcService(rs.getBoolean("cc_service"));
@@ -877,7 +916,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					sql += " and xl_bm = '"+line+"'";
 				}
 				if(company.length() != 0){
-					sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+					sql += " and gs_bm = '"+company+"'";
+				}
+				if(subCompany.length() != 0){
+					sql += " and fgs_bm = '"+subCompany+"'";
 				}
 				temp1 = jdbcTemplate.query(sql,
 						new RowMapper<Map<String, String>>(){
@@ -1002,13 +1044,26 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			cMap.get(key).add(cTask);
 		}
+		Map<String, Boolean> lineNature = lineService.lineNature();
+		
 		for(ScheduleRealInfo schedule : list){
 			if(schedule.getXlName()==null || schedule.getXlName().trim().length()==0
 					|| schedule.isCcService())
 				continue;
+			String xlBm = schedule.getXlBm();
+			if(lineNature.containsKey(xlBm) && lineNature.get(xlBm) != null){
+				if(sfyy.equals("1") && !lineNature.get(xlBm)){
+					continue;
+				} else if(sfyy.equals("2") && lineNature.get(xlBm)){
+					continue;
+				}
+			} else if(sfyy.equals("2")){
+				continue;
+			}
+			String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/"
+					+ schedule.getLpName() + "/" + schedule.getFgsName();
 			if(model.length() != 0){
 				if(ttSet.contains(schedule.getSpId())){
-					String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
 					if(!keyMap.containsKey(key))
 						keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 					keyMap.get(key).add(schedule);
@@ -1023,7 +1078,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //					}
 //				}
 			}else{
-				String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
 				if(!keyMap.containsKey(key))
 					keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 				keyMap.get(key).add(schedule);
@@ -1081,9 +1135,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					}else{
 						jhyysj += fcsj2 - fcsj1;
 					}
-					if(jhyysj < 0){
-						System.out.println(fcsj2 + " - " + fcsj1 + " = " + (fcsj2 - fcsj1));
-					}
 					jhyysj1 += fcsj2 - fcsj1;
 				}
 				if(i == 1 && schedule1.getBcType().toString().equals("normal")){
@@ -1220,9 +1271,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					sjlc += Double.valueOf(m.get("lc").toString());
 				}
 			}
-			tempMap.put("company", companyName);
-			tempMap.put("subCompany", subCompanyName);
 			String[] split = key.split("/");
+			tempMap.put("company", companyName);
+			tempMap.put("subCompany", split[3]);
 			tempMap.put("date", split[0]);
 			tempMap.put("line", split[1]);
 			tempMap.put("lp", split[2]);
@@ -1272,7 +1323,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		Map<String, List<Map<String, Object>>> keyMap2 = new HashMap<String, List<Map<String, Object>>>();
 		for(Map<String, Object> m : resList){
-			String key = m.get("line").toString() + "/" + m.get("lp").toString();
+			String key = m.get("line").toString() + "/" + m.get("lp").toString()
+					+ "/" + m.get("subCompany").toString();
 			if(!keyMap2.containsKey(key))
 				keyMap2.put(key, new ArrayList<Map<String, Object>>());
 			keyMap2.get(key).add(m);
@@ -1333,6 +1385,32 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				return a.compareTo(b);
 			}
 		});
+		Collections.sort(list3, new Comparator<String>() {
+			 
+			public int compare(String o1, String o2) {
+
+				Long a = 0l;
+				Long b = 0l;
+				String[] split1 = o1.split("/");
+				String[] split2 = o2.split("/");
+				char[] charArray1 = split1[2].toCharArray();
+				char[] charArray2 = split2[2].toCharArray();
+				for(int i = 0; i < charArray1.length; i++){
+					long temp = 1l;
+					for(int j = 0; j < i; j++)
+						temp *= 10;
+					a += (long)charArray1[charArray1.length - 1 - i] * temp;
+				}
+				for(int i = 0; i < charArray2.length; i++){
+					long temp = 1l;
+					for(int j = 0; j < i; j++)
+						temp *= 10;
+					b += (long)charArray2[charArray2.length - 1 - i] * temp;
+				}
+ 
+				return a.compareTo(b);
+			}
+		});
 		for(String key : list3){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			BigDecimal jhyysj = new BigDecimal(0), jhyssj = new BigDecimal(0);
@@ -1362,7 +1440,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("line", split[0]);
 			tempMap.put("lp", split[1]);
 			tempMap.put("company", companyName);
-			tempMap.put("subCompany", subCompanyName);
+			tempMap.put("subCompany", split[2]);
 			tempMap.put("date", date);
 			list4.add(tempMap);
 		}
@@ -1373,7 +1451,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			List<Map<String, Object>> list5 = new ArrayList<Map<String, Object>>();
 			List<String> keyList = new ArrayList<String>();
 			for(Map<String, Object> m : list4){
-				String key = m.get("line").toString();
+				String key = m.get("line").toString() + "/" + m.get("subCompany").toString();
 				if(!keyMap4.containsKey(key)){
 					keyList.add(key);
 					keyMap4.put(key, new ArrayList<Map<String, Object>>());
@@ -1405,10 +1483,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				tempMap.put("sjyssj", sjyssj.equals(0)?0:sjyssj.divide(size, 2, RoundingMode.HALF_UP));
 				tempMap.put("sjyycs", sjyycs.equals(0)?0:sjyycs.divide(size, 2, RoundingMode.HALF_UP));
 				tempMap.put("sjyscs", sjyscs.equals(0)?0:sjyscs.divide(size, 2, RoundingMode.HALF_UP));
-				tempMap.put("line", key);
+				String[] split = key.split("/");
+				tempMap.put("line", split[0]);
 				tempMap.put("lp", keyMap4.get(key).size());
 				tempMap.put("company", companyName);
-				tempMap.put("subCompany", subCompanyName);
+				tempMap.put("subCompany", split[1]);
 				tempMap.put("date", date);
 				tempMap.put("work", keyMap4.get(key));
 				list5.add(tempMap);
@@ -1491,8 +1570,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		Map<String, List<Map<String, Object>>> keyMap0 = new HashMap<String, List<Map<String, Object>>>();
 		Map<String, List<Map<String, Object>>> keyMap1 = new HashMap<String, List<Map<String, Object>>>();
-		String company = map.get("company").toString();
-		String subCompany = map.get("subCompany").toString();
+		String sfqr = "", company = "", subCompany = "";
+		if(map.get("sfqr")!=null)
+			sfqr = map.get("sfqr").toString();
+		if(map.get("company")!=null)
+			company = map.get("company").toString();
+		if(map.get("subCompany")!=null)
+			subCompany = map.get("subCompany").toString();
 		String line = map.get("line").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
@@ -1510,6 +1594,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		if(times.length() == 0){
 			times = "05:00-23:00";
 		}
+		if(sfqr.equals("0")){
+			times = "";
+		}
 		list = getSchedule(company, subCompany, line, startDate, endDate, model, times, false);
@@ -1522,9 +1609,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			date = startDate;
 		}
-		String[] split = times.split("-");
-		int startTime = Integer.valueOf(split[0].split(":")[0])*60 + Integer.valueOf(split[0].split(":")[1]);
-		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
+//		String[] split = times.split("-");
+//		int startTime = Integer.valueOf(split[0].split(":")[0])*60 + Integer.valueOf(split[0].split(":")[1]);
+//		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
 		for(ScheduleRealInfo s : list){
 			if(s.isCcService()){
@@ -1708,7 +1795,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				Map<String, Object> m = mapList.get(0);
 				tempMap.put("dates", date);
-				tempMap.put("times", times);
+				tempMap.put("times", times.length()==0?"全日":times);
 				tempMap.put("line", m.get("line"));
 				tempMap.put("lp", m.get("lp"));
 				tempMap.put("station", m.get("station"));
@@ -1730,10 +1817,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
-		
-		String company = map.get("company").toString();
-		String subCompany = map.get("subCompany").toString();
+
+		String company = "", subCompany = "";
+		String sfyy = map.get("sfyy").toString();
 		String line = map.get("line").toString();
+		if(map.get("company")!=null)
+			company = map.get("company").toString();
+		if(map.get("subCompany")!=null)
+			subCompany = map.get("subCompany").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
 		String model = map.get("model").toString();
@@ -1777,17 +1868,86 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		int startTime = Integer.valueOf(split[0].split(":")[0])*60 + Integer.valueOf(split[0].split(":")[1]);
 		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
+		Map<String, Boolean> lineNature = lineService.lineNature();
+		
 		for(ScheduleRealInfo schedule : list){
 			Long fcsj = schedule.getFcsjT();
 			if(sfqr == 1 && !(endTime!=0?fcsj>=startTime&&fcsj<endTime:fcsj>=startTime)){
 				continue;
 			}
-			String key = schedule.getXlName();
+			
+			String xlBm = schedule.getXlBm();
+			if(lineNature.containsKey(xlBm) && lineNature.get(xlBm) != null){
+				if(sfyy.equals("1") && !lineNature.get(xlBm)){
+					continue;
+				} else if(sfyy.equals("2") && lineNature.get(xlBm)){
+					continue;
+				}
+			} else if(sfyy.equals("2")){
+				continue;
+			}
+			
+			String key = schedule.getXlName() + "/" + schedule.getFgsName();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 			keyMap.get(key).add(schedule);
 		}
+		List<String> keyList = new ArrayList<String>();
+		keyList.addAll(keyMap.keySet());
+		Collections.sort(keyList, new Comparator<String>() {
+			 
+			public int compare(String o1, String o2) {
+
+				Long a = 0l;
+				Long b = 0l;
+				String[] split1 = o1.split("/");
+				String[] split2 = o2.split("/");
+				char[] charArray1 = split1[0].toCharArray();
+				char[] charArray2 = split2[0].toCharArray();
+				for(int i = 0; i < charArray1.length; i++){
+					long temp = 1l;
+					for(int j = 0; j < i; j++)
+						temp *= 10;
+					a += (long)charArray1[charArray1.length - 1 - i] * temp;
+				}
+				for(int i = 0; i < charArray2.length; i++){
+					long temp = 1l;
+					for(int j = 0; j < i; j++)
+						temp *= 10;
+					b += (long)charArray2[charArray2.length - 1 - i] * temp;
+				}
+ 
+				return a.compareTo(b);
+			}
+		});
+		Collections.sort(keyList, new Comparator<String>() {
+			 
+			public int compare(String o1, String o2) {
+
+				Long a = 0l;
+				Long b = 0l;
+				String[] split1 = o1.split("/");
+				String[] split2 = o2.split("/");
+				char[] charArray1 = split1[1].toCharArray();
+				char[] charArray2 = split2[1].toCharArray();
+				for(int i = 0; i < charArray1.length; i++){
+					long temp = 1l;
+					for(int j = 0; j < i; j++)
+						temp *= 10;
+					a += (long)charArray1[charArray1.length - 1 - i] * temp;
+				}
+				for(int i = 0; i < charArray2.length; i++){
+					long temp = 1l;
+					for(int j = 0; j < i; j++)
+						temp *= 10;
+					b += (long)charArray2[charArray2.length - 1 - i] * temp;
+				}
+
+				return a.compareTo(b);
+			}
+		});
+		
 		Map<String, Object> temp = new HashMap<String, Object>();
 		int jhbc_ = 0, sjbc_ = 0,
 				lzbc_ = 0, dmbc_ = 0,
@@ -1801,7 +1961,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				qclc_ = new BigDecimal("0"), kxlc_ = new BigDecimal("0"),
 				qhlc_ = new BigDecimal("0"), wylc_ = new BigDecimal("0"),
 				qtlc_ = new BigDecimal("0");
-		for(String key : keyMap.keySet()){
+//		for(String key : keyMap.keySet()){
+		for(String key : keyList){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			int jhbc = 0, sjbc = 0,
 					lzbc = 0, dmbc = 0,
@@ -1907,11 +2068,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(jhlc.doubleValue() == 0d){
 				flag = false;
 			}
+			String[] keys = key.split("/");
 			tempMap.put("date", Date);
 			tempMap.put("company", companyName);
-			tempMap.put("subCompany", subCompanyName);
+			tempMap.put("subCompany", keys[1]);
 			tempMap.put("times", sfqr == 1 ? times : "全日");
-			tempMap.put("line", key);
+			tempMap.put("line", keys[0]);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
 			tempMap.put("bcbfb", df.format(jhbc>0?(double)sjbc/jhbc*100:0)+"%");
@@ -2055,10 +2217,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
 		Map<String, List<Map<String, Object>>> keyMap0 = new HashMap<String, List<Map<String, Object>>>();
 		Map<String, List<Map<String, Object>>> keyMap1 = new HashMap<String, List<Map<String, Object>>>();
-		
-		String company = map.get("company").toString();
-		String subCompany = map.get("subCompany").toString();
+
+		String company = "", subCompany = "";
+		String sfyy = map.get("sfyy").toString();
 		String line = map.get("line").toString();
+		if(map.get("company")!=null)
+			company = map.get("company").toString();
+		if(map.get("subCompany")!=null)
+			subCompany = map.get("subCompany").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
 		String times = map.get("times").toString();
@@ -2091,7 +2257,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
 			if(company.length() != 0){
-				sql += " and (gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"')";
+				sql += " and gs_bm = '"+company+"'";
+			}
+			if(subCompany.length() != 0){
+				sql += " and fgs_bm = '"+subCompany+"'";
 			}
 			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
@@ -2152,10 +2321,23 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			date = startDate;
 		else
 			date = startDate + "--" + endDate;
+
+		Map<String, Boolean> lineNature = lineService.lineNature();
 		for(ScheduleRealInfo schedule : list){
 			if(schedule.getXlName() == null || schedule.getXlName().trim().length() == 0)
 				continue;
+			String xlBm = schedule.getXlBm();
+			if(lineNature.containsKey(xlBm) && lineNature.get(xlBm) != null){
+				if(sfyy.equals("1") && !lineNature.get(xlBm)){
+					continue;
+				} else if(sfyy.equals("2") && lineNature.get(xlBm)){
+					continue;
+				}
+			} else if(sfyy.equals("2")){
+				continue;
+			}
+			
 			String key = schedule.getGsName() + "/" + schedule.getFgsName() + "/" + schedule.getXlBm();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
@@ -2339,13 +2521,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 			resList.add(tempMap);
 		}
+		
 		//计算掉线调整
 		String sqldot = "select * from "
-        		+ "logger_sch_modify where gsbm =? and fgsbm=? and rq BETWEEN ? and  ?  order by line_code,sch_id";
-        		
-		;
+        		+ "logger_sch_modify where gsbm = ? and fgsbm like ? and rq BETWEEN ? and  ?  order by line_code,sch_id";
+        
+		
         List<SchEditInfoDto> listDot = jdbcTemplate.query(sqldot, 
-       		 new BeanPropertyRowMapper(SchEditInfoDto.class),company,subCompany,map.get("startDate").toString(),map.get("endDate").toString());
+       		 new BeanPropertyRowMapper(SchEditInfoDto.class),company,"%"+subCompany+"%",map.get("startDate").toString(),map.get("endDate").toString());
         int dxtzz=0;
         Map<String, Object> mapSchId=new HashMap<String,Object>();
         for (int i = 0; i < resList.size(); i++) {
@@ -2604,7 +2787,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Map.put("xlName", s.getXlName());
 		        Map.put("clZbh", s.getClZbh());
 		        Map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
-		        Map.put("fcsjActual", s.getFcsjActual());
+		        Map.put("fcsjActual", s.getFcsjActual()==null?"":s.getFcsjActual());
 		        Map.put("zdzName", s.getZdzName());
 		        Map.put("scheduleDate", s.getScheduleDateStr());
 		        Map.put("lpName", s.getLpName());
@@ -2860,21 +3043,28 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String startDate = map.get("startDate").toString().trim();
 		String endDate = map.get("endDate").toString().trim();
 		String line = map.get("line").toString().trim();
-		String company = map.get("gs").toString().trim();
-		String subCompany = map.get("fgs").toString().trim();
+		String company = "", subCompany = "";
+		if(map.get("gs")!=null)
+			company = map.get("gs").toString().trim();
+		if(map.get("fgs")!=null)
+			subCompany = map.get("fgs").toString().trim();
+		String sfyy = "";
+		if(map.get("sfyy")!=null)
+			sfyy = map.get("sfyy").toString().trim();
 		String sql = "select id, cl_zbh, fcsj, fcsj_actual, j_gh, j_name, lp_name, qdz_name, " +
-				"schedule_date_str, xl_name, zdsj, zdsj_actual, fgs_name, gs_name, xl_dir, xl_bm " +
+				"schedule_date_str, xl_name, zdsj, zdsj_actual, fgs_bm, fgs_name, gs_name, xl_dir, xl_bm " +
 				"from bsth_c_s_sp_info_real " +
 				"where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"' " +
 				"and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and cc_service = 0";
 		if(company.length() != 0)
-			sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+			sql += " and gs_bm = '"+company+"'";
+		if(subCompany.length() != 0)
+			sql += " and fgs_bm = '"+subCompany+"'";
 		if(line.length() != 0)
 			sql += " and xl_bm = '"+line+"'";
-		System.out.println(sql);
 		List<ScheduleRealInfo> list = jdbcTemplate.query(sql,
 				new RowMapper<ScheduleRealInfo>(){
 			@Override
@@ -2893,6 +3083,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				schedule.setQdzName(rs.getString("qdz_name"));
 				schedule.setGsName(rs.getString("gs_name"));
 				schedule.setFgsName(rs.getString("fgs_name"));
+				schedule.setFgsBm(rs.getString("fgs_bm"));
 				schedule.setClZbh(rs.getString("cl_zbh"));
 				schedule.setjGh(rs.getString("j_gh"));
 				schedule.setjName(rs.getString("j_name"));
@@ -2903,8 +3094,21 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		Map<String, Map<String, List<ScheduleRealInfo>>> sches = new HashMap<String, Map<String, List<ScheduleRealInfo>>>();
 		Map<String, List<List<Map<String, Object>>>> keyMap = new HashMap<String, List<List<Map<String, Object>>>>();
+		Map<String, Boolean> lineNature = lineService.lineNature();
+		
 		for(ScheduleRealInfo s : list){
-			String xl = s.getXlName();
+			String xlBm = s.getXlBm();
+			if(lineNature.containsKey(xlBm) && lineNature.get(xlBm) != null){
+				if(sfyy.equals("1") && !lineNature.get(xlBm)){
+					continue;
+				} else if(sfyy.equals("2") && lineNature.get(xlBm)){
+					continue;
+				}
+			} else if(sfyy.equals("2")){
+				continue;
+			}
+			
+			String xl = s.getXlName() + "/" + s.getFgsName();
 			String dateStr = s.getScheduleDateStr();
 			if(!sches.containsKey(xl)){
 				sches.put(xl, new HashMap<String, List<ScheduleRealInfo>>());
@@ -2956,6 +3160,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					Map<String, Object> temp = new HashMap<String, Object>();
 					temp.put("gs", s.getGsName());
 					temp.put("fgs", s.getFgsName());
+					temp.put("fgsBm", s.getFgsBm());
 					temp.put("date", date);
 					temp.put("xlbm", s.getXlBm());
 					temp.put("line", s.getXlName());
@@ -3020,6 +3225,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 				tempMap.put("gs", list1.get(0).get(0).get("gs"));
 				tempMap.put("fgs", list1.get(0).get(0).get("fgs"));
+				tempMap.put("fgsBm", list1.get(0).get(0).get("fgsBm"));
 				tempMap.put("line", list1.get(0).get(0).get("line"));
 				tempMap.put("date", list1.get(0).get(0).get("date"));
 				tempMap.put("xlbm", list1.get(0).get(0).get("xlbm"));
@@ -3077,6 +3283,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					}
 					tempMap.put("gs", list2.get(0).get("gs"));
 					tempMap.put("fgs", list2.get(0).get("fgs"));
+					tempMap.put("fgsBm", list2.get(0).get("fgsBm"));
 					tempMap.put("line", list2.get(0).get("line"));
 					tempMap.put("date", list2.get(0).get("date"));
 					tempMap.put("xl_date", list2.get(0).get("date") + "_" + list2.get(0).get("xlbm") + "_" + list2.get(0).get("line"));
@@ -6,10 +6,14 @@ import com.bsth.repository.LineRepository;
 import com.bsth.service.LineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 /**
@@ -117,4 +121,34 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
 		}
 		return map;
 	}
+
+	/*获取线路性质*/
+	@Override
+	public Map<String, Boolean> lineNature() {
+		// TODO Auto-generated method stub
+//		List<Line> lineList=repository.findLineBygsBm(gsBm, fgsBm, line);
+		String sql="select * from bsth_c_line ";
+		List<Line> lineList=jdbcTemplate.query(sql, 
+				 new RowMapper<Line>(){
+			 @Override 
+			 public Line mapRow(ResultSet rs, int rowNum) throws SQLException {
+				 Line l=new Line();
+				 l.setLineCode(rs.getString("line_code"));
+				 l.setNature(rs.getString("nature"));
+				 return l;
+			 }
+		});
+		Map<String, Boolean> map=new HashMap<String,Boolean>();
+		for (int i = 0; i < lineList.size(); i++) {
+			Line t=lineList.get(i);
+			String nature=t.getNature()==null?"":t.getNature();
+			if(nature.equals("yxl")||nature.equals("cgxl")||nature.equals("gjxl")
+			  ||nature.equals("csbs")||nature.equals("cctxl")){
+				map.put(t.getLineCode(), true);
+			}else{
+				map.put(t.getLineCode(), false);
+			}
+		}
+		return map;
+	}
 }
@@ -743,6 +743,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		try {
 			// 获取线路ID
 			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+			Integer fileVersions = map.get("fileVersions").equals("") ? 2 : Integer.parseInt(map.get("fileVersions").toString());// 没有输入就默认2
 			/** 查询线路信息 @param：<lineId：线路ID> */
 			Line line = lineRepository.findOne(lineId);
 			/** 查询线路信息下的站点路由信息 @param：<lineId：线路ID> */
@@ -778,7 +779,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					textStr = newTextFileToFTP(objects,lineId);/** 双向行单文件内容 @param：<objects：站点路由；lineId：线路ID>*/
 				else
 					resultMap.put("status","NOLinePlayType");// 线路无线路规划类型
-				textStr = line.getName() + " " + "2" + "\r" + textStr;
+				textStr = line.getName() + " " + fileVersions + "\r" + textStr;
 				InputStream input = new ByteArrayInputStream(textStr.getBytes("gbk"));
 				/** 生成txt文件，上传ftp */
 				clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
@@ -77,6 +77,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private StationRouteRepository stationRouteRepository;
+	// 历史站点路由repository
+	@Autowired
+	private LsStationRouteRepository lsStationRouteRepository;
+
 	@Autowired
 	private SectionRepository sectionRepository;
@@ -944,6 +948,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		String result = "failure";
 		StringBuffer sBuffer = new StringBuffer();
 		DecimalFormat df = new DecimalFormat("######0.000");
+		Map<String,String> lsStationCode2NameMap;
+		Map<String, Integer> lsStationName2YgcNumber;
 		try {
 			String[] idArray = ids.split(",");
 			StringBuffer sBufferA ,sBufferB ,sBufferC ;
@@ -960,10 +966,17 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			HashMap<String,String> paramMap;
 			HashMap<String,String> otherMap = new HashMap<>();
 			for (int i = 0; i < idArray.length; i++) {
-				ttInfo = ttInfoRepository.findOne(Long.valueOf(idArray[i]));
+				long ttinfoId = Long.valueOf(idArray[i]);
+				ttInfo = ttInfoRepository.findOne(ttinfoId);
 				if(ttInfo == null)
 					continue;
 				ttinfoList.add(ttInfo); // 保存时刻表
+				// 得到时刻表版本号
+				int lineVersion = ttInfo.getLineVersion();
+				// 查询历史站点路由
+				lsStationCode2NameMap = getLsStationCode(ttInfo.getXl().getLineCode(),lineVersion);
+				// 查询历史站点路由
+				lsStationName2YgcNumber = getLsStationRoute(ttInfo.getXl().getLineCode(),lineVersion);
 				zlc = 0.0f;
 				yylc = 0.0f;
 				// 获得时刻表
@@ -992,7 +1005,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						ttInfoDetail = ttInfoDetailIterator.next();
 						bcType = ttInfoDetail.getBcType();
 						sxx = ttInfoDetail.getXlDir();
-						// 进出场班次
+						// 进出场班次的里程，加入总里程
 						if(bcType.equals("in") || bcType.equals("out")){
 							// 进出班次的计划里程，算空驶里程
 							emptyLc = ttInfoDetail.getJhlc();
@@ -1000,6 +1013,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							zlc += emptyLc;
 							continue;
 						}
+						// 不是正常班次，不传到运管处
+						if(!bcType.equals("normal")){
+							continue;
+						}
 						// 如果发车时间格式错误，忽略此条
 						if(changeTimeFormat(ttInfoDetail) == null){
 							continue;
@@ -1007,19 +1024,19 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBufferC.append("<BC>");
 						sBufferC.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
 						sBufferC.append("<SXX>").append(sxx).append("</SXX>");
-						sBufferC.append("<FCZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
+						sBufferC.append("<FCZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
 								+"_"+ttInfoDetail.getQdzCode())).append("</FCZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBufferC.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>");
+						sBufferC.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</ZDXH>");
 						sBufferC.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
-						sBufferC.append("<DDZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
+						sBufferC.append("<DDZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
 								+"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBufferC.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>");
+						sBufferC.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</DDXH>");
 						sBufferC.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBufferC.append("</BC>");
 						// 0：上行；1：下行
@@ -1520,4 +1537,51 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		map.put("stationMark",stationMark); // 站点类型
 		return map;
 	}
+
+	/**
+	 * 取得历史站点编码和站点名称的对应关系
+	 * @return
+	 */
+	private Map<String, String> getLsStationCode(String lineCode,int lineVersion){
+		Map<String,Object> map = new HashMap<>();
+		map.put("lineCode_eq", lineCode);
+		map.put("versions_eq",lineVersion);
+		LsStationRoute lsroute;
+		Iterator<LsStationRoute> iterator = lsStationRouteRepository.findAll(new CustomerSpecs<LsStationRoute>(map)).iterator();
+		Map<String, String> stationCode2Name = new HashMap<>();
+		while (iterator.hasNext()) {
+			lsroute = iterator.next();
+			stationCode2Name.put(lsroute.getLineCode() + "_" + lsroute.getDirections() + "_" + lsroute.getStationCode(), lsroute.getStationName());
+		}
+		return stationCode2Name;
+	}
+
+	private Map<String, Integer> getLsStationRoute(String xlbm,int lineVersion){
+		Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
+		/**
+		 * 加载运管处的站点及序号
+		 * 上行从1开始，下行顺序续编
+		 */
+		List<Map<String, String>> ygcLines = lsStationRouteRepository.findLineWithLineCode4Ygc(xlbm,lineVersion);
+		if(ygcLines != null && ygcLines.size() > 0){
+			int size = ygcLines.size();
+			Map<String, String> tempMap ;
+			int num = 1;
+			String key;
+			String lineCode = "";
+			for (int i = 0; i < size; i ++){
+				tempMap = ygcLines.get(i);
+				if(lineCode.equals("")){
+					lineCode = tempMap.get("lineCode");
+				}else if(!lineCode.equals(tempMap.get("lineCode"))){
+					num = 1;
+					lineCode = tempMap.get("lineCode");
+				}
+				key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
+						+ "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
+				tempStationName2YgcNumber.put(key,num++);
+			}
+		}
+		return tempStationName2YgcNumber;
+	}
 }
@@ -117,10 +117,10 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> statisticsDaily(String line, String date, String xlName, String type);
-	List<Map<String,Object>> statisticsDailyTj(String gsdm,String fgsdm,String line, String date,String date2, String xlName, String type);
+	List<Map<String,Object>> statisticsDailyTj(String gsdm,String fgsdm,String line, String date,String date2, String xlName, String type,String nature);
 	//用于实时数据与统计数据合并查询
-	List<Map<String,Object>> statisticsDailyTjHb(String gsdm,String fgsdm,String line, String date,String date2, String xlName, String type);
+	List<Map<String,Object>> statisticsDailyTjHb(String gsdm,String fgsdm,String line, String date,String date2, String xlName, String type,String nature);
 	//List<Object> scheduleDaily(String line,String date);
@@ -53,6 +53,7 @@ import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.repository.schedule.GuideboardInfoRepository;
 import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.LineService;
 import com.bsth.service.SectionRouteService;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.service.impl.BaseServiceImpl;
@@ -114,7 +115,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     LineRepository lineRepository;
-
+    @Autowired
+	LineService lineService;
     @Autowired
     GuideboardInfoRepository guideboardInfoRepository;
@@ -2666,10 +2668,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         Map<String, Object> map = new HashMap<String, Object>();
         if (list.size() > 0) {
+        	map.put("fgsBm", list.get(0).getFgsBm());
         	map.put("xlBm", list.get(0).getXlBm());
             map.put("xlName", list.get(0).getXlName());
+            map.put("fgsName", list.get(0).getFgsName());
             try {
-                map.put("xlNamePy", PinyinHelper.convertToPinyinString(list.get(0).getXlName(), "", PinyinFormat.WITHOUT_TONE));
+                map.put("xlNamePy", PinyinHelper.convertToPinyinString(list.get(0).getFgsBm()+list.get(0).getXlName(), "", PinyinFormat.WITHOUT_TONE));
             } catch (PinyinException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
@@ -2679,7 +2683,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             map.put("jhlc", jhyygl);
             map.put("jcclc", jhjcclc);
             map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
-
+            double ljks=culateService.culateLjksgl(lists);
+            map.put("ljks", ljks);
             double ljgl = culateService.culateLjgl(lists);
             double sjyygl = culateService.culateSjgl(lists);
             double zyygl = Arith.add(sjyygl, ljgl);
@@ -2744,18 +2749,34 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public List<Map<String, Object>> statisticsDailyTj(String gsdm, String fgsdm, String line, String date, String date2,
-                                                       String xlName, String type) {
-        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+                                                       String xlName, String type,String nature) {
+        List<ScheduleRealInfo> listAll = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
         line = line.trim();
         if (line.equals("")) {
             //查询所有线路
-            list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date, date2, gsdm, fgsdm);
+        	listAll = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date, date2, gsdm, fgsdm);
         } else {
             //查询单条线路
-            list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date, date2);
-        }
+        	listAll = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date, date2);
+        }
+    	Map<String, Boolean> lineMap=lineService.lineNature();
+        List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
+        for (int i = 0; i < listAll.size(); i++) {
+			ScheduleRealInfo s=listAll.get(i);
+			if (nature.equals("0")) {
+				list.add(s);
+			}else if(nature.equals("1")){
+				if(lineMap.get(s.getXlBm())){
+					list.add(s);
+				}
+			}else{
+				if(!lineMap.get(s.getXlBm())){
+					list.add(s);
+				}
+			}
+		}
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s = list.get(i);
             Set<ChildTaskPlan> cts = s.getcTasks();
@@ -2770,7 +2791,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         for (int i = 0; i < list.size(); i++) {
             if (i < list.size() - 1) {
-                if (list.get(i + 1).getXlBm().equals(list.get(i).getXlBm())) {
+                if ((list.get(i+1).getFgsBm()+list.get(i + 1).getXlBm()).equals(list.get(i).getFgsBm()+list.get(i).getXlBm())) {
                     lists.add(list.get(i));
                 } else {
                     lists.add(list.get(i));
@@ -2779,7 +2800,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     lists = new ArrayList<ScheduleRealInfo>();
                 }
             } else {
-                if (list.get(i).getXlBm().equals(list.get(i - 1).getXlBm())) {
+                if ((list.get(i).getFgsBm()+list.get(i).getXlBm()).equals(list.get(i - 1).getFgsBm()+list.get(i - 1).getXlBm())) {
                     lists.add(list.get(i));
                     Map<String, Object> map = staticTj(lists);
                     lMap.add(map);
@@ -2791,10 +2812,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
-
+        /*if(!line.equals("")){
+        	List<Line> l=lineRepository.findLineByCode(line);
+        	if(l.size()>0)
+        	lMap.get(0).put("fgsName", BasicData.businessFgsCodeNameMap.get(l.get(0).getBrancheCompany()+"_"+l.get(0).getCompany()));
+        }*/
         Collections.sort(lMap, new AccountXlbm());
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("xlName", "合计");
+        map.put("fgsName", "");
         double jhyygl = culateService.culateJhgl(list);//计划营运公里
         double jhjcclc = culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
         map.put("jhlc", jhyygl);
@@ -2804,7 +2830,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double ljgl = culateService.culateLjgl(list_s);
         double sjyygl = culateService.culateSjgl(list_s);
         double zyygl = Arith.add(sjyygl, ljgl);
-
+        double ljks=culateService.culateLjksgl(list_s);
+        map.put("ljks", ljks);
         double sjjccgl = culateService.culateJccgl(list_s);
         double sjksgl = culateService.culateKsgl(list_s);
         double zksgl = Arith.add(sjjccgl, sjksgl);
@@ -2902,7 +2929,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
                 listI.add(lMap.iterator());
                 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls",
                         path + "export/" + dateTime + "-" + xlName + "-统计日报.xls");
             } catch (Exception e) {
                 // TODO: handle exception
@@ -2916,18 +2943,35 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public List<Map<String, Object>> statisticsDailyTjHb(String gsdm, String fgsdm, String line, String date, String date2,
-                                                       String xlName, String type) {
-        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+                                                       String xlName, String type,String nature) {
+        List<ScheduleRealInfo> listAll = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
         line = line.trim();
         if (line.equals("")) {
             //查询所有线路
-            list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date, date2, gsdm, fgsdm);
+        	listAll = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date, date2, gsdm, fgsdm);
         } else {
             //查询单条线路
-            list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date, date2);
-        }
+        	listAll = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date, date2);
+        }
+        
+        Map<String, Boolean> lineMap=lineService.lineNature();
+        List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
+        for (int i = 0; i < listAll.size(); i++) {
+			ScheduleRealInfo s=listAll.get(i);
+			if (nature.equals("0")) {
+				list.add(s);
+			}else if(nature.equals("1")){
+				if(lineMap.get(s.getXlBm())){
+					list.add(s);
+				}
+			}else{
+				if(!lineMap.get(s.getXlBm())){
+					list.add(s);
+				}
+			}
+		}
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s = list.get(i);
             Set<ChildTaskPlan> cts = s.getcTasks();
@@ -2942,7 +2986,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         for (int i = 0; i < list.size(); i++) {
             if (i < list.size() - 1) {
-                if (list.get(i + 1).getXlBm().equals(list.get(i).getXlBm())) {
+                if ((list.get(i + 1).getFgsBm()+list.get(i + 1).getXlBm()).equals(list.get(i).getFgsBm()+list.get(i).getXlBm())) {
                     lists.add(list.get(i));
                 } else {
                     lists.add(list.get(i));
@@ -2951,7 +2995,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     lists = new ArrayList<ScheduleRealInfo>();
                 }
             } else {
-                if (list.get(i).getXlBm().equals(list.get(i - 1).getXlBm())) {
+                if ((list.get(i).getFgsBm()+list.get(i).getXlBm()).equals(list.get(i - 1).getFgsBm()+list.get(i - 1).getXlBm())) {
                     lists.add(list.get(i));
                     Map<String, Object> map = staticTj(lists);
                     lMap.add(map);
@@ -2968,6 +3012,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("xlBm", "hj");
         map.put("xlName", "合计");
+        map.put("fgsBm", "");
+        map.put("fgsName", "");
+        map.put("gsBm", "");
         double jhyygl = culateService.culateJhgl(list);//计划营运公里
         double jhjcclc = culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
         map.put("jhlc", jhyygl);
@@ -2977,7 +3024,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double ljgl = culateService.culateLjgl(list_s);
         double sjyygl = culateService.culateSjgl(list_s);
         double zyygl = Arith.add(sjyygl, ljgl);
-
+        double ljks=culateService.culateLjksgl(list_s);
+        map.put("ljks", ljks);
         double sjjccgl = culateService.culateJccgl(list_s);
         double sjksgl = culateService.culateKsgl(list_s);
         double zksgl = Arith.add(sjjccgl, sjksgl);
+package com.bsth.service.report;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.sheet.CalcSheet;
+import com.bsth.entity.sheet.Sheet;
+import com.bsth.service.BaseService;
+
+public interface CalcSheetService extends BaseService<CalcSheet, Integer>{
+	public List<CalcSheet> countListCalcSheet(Map<String, Object> map);
+	public List<CalcSheet> calcListSheet(Map<String, Object> map);
+	public List<Sheet>  calcSheet(Map<String, Object> map);
+	public List<Map<String, Object>> calcTurnoutrate(Map<String, Object> map);
+}
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
 public interface CulateMileageService {
@@ -12,6 +13,7 @@ public interface CulateMileageService {
 	 int culateLbbc(List<ScheduleRealInfo> lists);
 	 List<Map<String,Object>> jobLjqk(List<ScheduleRealInfo> lists);
+	 double culateLjksgl(List<ScheduleRealInfo> lists);
 	 double culateLjgl(List<ScheduleRealInfo> lists);
 	 double culateLjgl_(List<ScheduleRealInfo> lists,String item);
 	 double culateLjgl_spy(List<ScheduleRealInfo> lists);
@@ -43,7 +45,7 @@ public interface CulateMileageService {
 	 int culateDtfzbc(List<ScheduleRealInfo> lists,String type,String status,String item);
-
+	 
 	 //以下计算方法供新报表使用
 	 Map<String, Double> culateSjlcMap(List<ScheduleRealInfo> lists);//计划内营运and计划外营运
+package com.bsth.service.report.impl;
+
+
+import java.lang.reflect.InvocationTargetException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.Line;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sheet.CalcSheet;
+import com.bsth.entity.sheet.Sheet;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.LineService;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.report.CalcSheetService;
+import com.bsth.util.ComparableReal;
+import com.bsth.util.ReportRelatedUtils;
+import com.bsth.util.ReportUtils;
+
+
+@Service
+public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> implements CalcSheetService {
+	@Autowired
+    JdbcTemplate jdbcTemplate;
+	@Autowired
+	ScheduleRealInfoRepository scheduleRealInfoRepository;
+	@Autowired
+	LineRepository  lineRepository;
+	@Autowired
+	LineService lineService;
+	@Override
+	public List<CalcSheet> countListCalcSheet(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+    	final DecimalFormat df = new DecimalFormat("0.00");
+		String line="";
+		if(map.get("line")!=null){
+			line =map.get("line").toString().trim();
+		}
+		String gs="";
+		if(map.get("gs")!=null){
+			gs=map.get("gs").toString().trim();
+		}
+		String fgs="";
+		if(map.get("fgs")!=null){
+			fgs=map.get("fgs").toString().trim();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+    	Map<String, Boolean> lineMap=lineService.lineNature();
+
+		String date=map.get("date").toString();
+		String endDate=map.get("endDate").toString();
+		String sql="select gsdm,fgsdm,xl,xl_name,max(id) as id,sum(jhszfcs) as jhszfcs ,"
+				+ " sum(sjszfczds) as sjszfczds,sum(sjszddzds) as sjszddzds"
+				+ " from bsth_c_calc_sheet where date >= '"+date+"' and  date <= '"+endDate+"'";
+		if(line.trim().equals("")){
+			sql +=" and gsdm = '"+gs+"' and fgsdm like '%"+fgs+"%'";
+		}else{
+			sql +=" and xl ='"+line+"'";
+		}
+		sql +=" group by gsdm,fgsdm,xl,xl_name";
+		List<CalcSheet> lists=jdbcTemplate.query(sql, 
+				 new RowMapper<CalcSheet>(){
+			 @Override 
+			 public CalcSheet mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 CalcSheet s=new CalcSheet();
+				 s.setGsdm(rs.getString("gsdm"));
+				 s.setFgsdm(rs.getString("fgsdm"));
+				 s.setXl(rs.getString("xl"));
+				 s.setXlName(rs.getString("xl_name"));
+				 s.setId(rs.getInt("id"));
+				 s.setJhszfcs(rs.getString("jhszfcs"));
+				 s.setSjszfczds(rs.getString("sjszfczds"));
+				 s.setSjszddzds(rs.getString("sjszddzds"));
+				 int jhfc=Integer.parseInt(rs.getString("jhszfcs"));
+				 int zdfc=Integer.parseInt(rs.getString("sjszfczds"));
+				 int zddd=Integer.parseInt(rs.getString("sjszddzds"));
+				 if(jhfc>0){
+					 double  zdl=(zdfc*1.0)/(jhfc*1.0)*100;
+					 s.setSzfczdl(df.format(zdl)+"%");
+					 zdl=(zddd*1.0)/(jhfc*1.0)*100;
+					 s.setSzddzdl(df.format(zdl)+"%");
+				 }else{
+					 s.setSzfczdl("0.0%");
+					 s.setSzddzdl("0.0%");
+				 }
+				 return s;
+			 }
+		});
+		List<CalcSheet> list=new ArrayList<CalcSheet>();
+		for (int i = 0; i < lists.size(); i++) {
+			if (nature.equals("0")) {
+				list.add(lists.get(i));
+			}else if(nature.equals("1")){
+				if(lineMap.get(lists.get(i).getXl())){
+					list.add(lists.get(i));
+				}
+			}else{
+				if(!lineMap.get(lists.get(i).getXl())){
+					list.add(lists.get(i));
+				}
+			}
+		}
+		if(map.get("type").equals("export")){
+			String lineName="";
+			if(!line.equals("")){
+				lineName=list.get(0).getXlName();
+			}else if(!fgs.equals("")){
+				lineName=list.get(0).getFgsname();
+			}else{
+				lineName=list.get(0).getGsname();
+			}
+			List<Map<String, Object>> listmap=new ArrayList<Map<String, Object>>();
+			for (int i = 0; i < list.size(); i++) {
+				CalcSheet c=list.get(i);
+				Map<String, Object> m=new HashMap<String,Object>();
+				m.put("gs", c.getGsname());
+				m.put("fgs", c.getFgsname());
+				m.put("line", c.getXlName());
+				m.put("bcs", c.getJhszfcs());
+				m.put("zdbcs", c.getSjszfczds());
+				m.put("zdlv", c.getSzfczdl());
+				m.put("ddzdbcs", c.getSjszddzds());
+				m.put("ddzdlv", c.getSzddzdl());
+				listmap.add(m);
+			}
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			m.put("endDate", endDate);
+			ReportUtils ee = new ReportUtils();
+			try {
+				String dateTime = "";
+				if(date.equals(endDate)){
+					dateTime = date.replaceAll("-", "");
+				} else {
+					dateTime = date.replaceAll("-", "")+"-"+
+							endDate.replaceAll("-", "");
+				}
+				listI.add(listmap.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "calcSheetList.xls",
+						path + "export/"+dateTime+"-"+lineName+"-发车到站准点率.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		return list;
+	}
+	@Override
+	public List<CalcSheet> calcListSheet(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		String line=map.get("line").toString();
+		String date=map.get("date").toString();
+		String endDate=map.get("endDate").toString();
+		String sql="select * from bsth_c_calc_sheet where date >= '"+date+"' and  "
+				+ " date <= '"+endDate+"' and xl = '"+line+"' order by date";
+		List<CalcSheet> list=jdbcTemplate.query(sql, 
+				 new RowMapper<CalcSheet>(){
+			 @Override 
+			 public CalcSheet mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 CalcSheet s=new CalcSheet();
+				 s.setGsdm(rs.getString("gsdm"));
+				 s.setFgsdm(rs.getString("fgsdm"));
+				 s.setXl(rs.getString("xl"));
+				 s.setXlName(rs.getString("xl_name"));
+				 s.setId(rs.getInt("id"));
+				 s.setDate(rs.getString("date"));
+				 s.setJhszfcs(rs.getString("jhszfcs"));
+				 s.setSjszfczds(rs.getString("sjszfczds"));
+				 s.setSzfczdl(rs.getString("szfczdl"));
+				 s.setSjszddzds(rs.getString("sjszddzds"));
+				 s.setSzddzdl(rs.getString("szddzdl"));
+				 return s;
+			 }
+		});
+		if(map.get("type").equals("export")){
+			List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+			for (int i = 0; i < list.size(); i++) {
+				Map<String, Object> m = new HashMap<String, Object>();
+				CalcSheet c = list.get(i);
+				m.put("gs", c.getGsname());
+				m.put("fgs", c.getFgsname());
+				m.put("date", c.getDate());
+				m.put("line", c.getXlName());
+				m.put("bcs", c.getJhszfcs());
+				m.put("zdbcs", c.getSjszfczds());
+				m.put("zdlv", c.getSzfczdl()+"%");
+				m.put("ddzdbcs", c.getSjszddzds());
+				m.put("ddzdlv", c.getSzddzdl()+"%");
+				tempList.add(m);
+			}
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			m.put("endDate", endDate);
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(tempList.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "calcSheetList1.xls",
+						path + "export/发车到站准点率"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		return list;
+	}
+	@Override
+	public List<Sheet> calcSheet(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		System.out.println();
+		String line=map.get("line").toString();
+		String date=map.get("date").toString();
+		String dir =map.get("dir").toString();
+		List<ScheduleRealInfo> list=scheduleRealInfoRepository.scheduleDaily(line, date);
+		Line l =lineRepository.findByLineCode(line);
+		List<Sheet> listSheet=new ArrayList<Sheet>();
+		if(list.size()>0){
+			if(dir.equals("1")){
+				listSheet=calcSheetFcZdl(list, list.get(0).getXlBm(),l.getStartStationName(),l.getEndStationName());
+			}else{
+				listSheet=calcSheetDdZdl(list, list.get(0).getXlBm(),l.getStartStationName(),l.getEndStationName());
+			}
+			if(map.get("type").equals("export")){
+				List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+				Map<String, Object> m = new HashMap<String, Object>();
+				ReportUtils ee = new ReportUtils();
+				try {
+					List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+					for(int i = 0; i < listSheet.size(); i++){
+						Map<String, Object> temp = new HashMap<String, Object>();
+						Sheet s = listSheet.get(i);
+						temp.put("id", i+1);
+						temp.put("date", s.getDate());
+						temp.put("line", s.getLine());
+						temp.put("zdname", s.getZdname());
+						temp.put("jhsj", s.getJhsj());
+						temp.put("sjsj", s.getSjsj());
+						temp.put("sfzd", s.getSfzd());
+						tempList.add(temp);
+					}
+					listI.add(tempList.iterator());
+					m.put("date", date);
+					String fileName="";
+					if(dir.equals("1")){
+						fileName="发车准点率"+date;
+					}else{
+						fileName="到站准点率"+date;
+					}
+					String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+					ee.excelReplace(listI, new Object[]{m}, path + "mould/sheetList2.xls",
+							path + "export/"+fileName+".xls");
+				} catch (Exception e) {
+					// TODO: handle exception
+					e.printStackTrace();
+				}
+				
+			}
+		}
+		return listSheet;
+	}
+	
+	private List<Sheet> calcSheetFcZdl(List<ScheduleRealInfo> lists,String line,String qdz,String zdz) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		SimpleDateFormat sdf_ = new SimpleDateFormat("yyyy-MM-dd");
+		DecimalFormat df = new DecimalFormat("0.00");
+		List<Sheet> listSheet=new ArrayList<Sheet>();
+		List<ScheduleRealInfo> listjh0 = new ArrayList<ScheduleRealInfo>();
+		List<ScheduleRealInfo> listjh1 = new ArrayList<ScheduleRealInfo>();
+		List<ScheduleRealInfo> listsj0 = new ArrayList<ScheduleRealInfo>();
+		List<ScheduleRealInfo> listsj1 = new ArrayList<ScheduleRealInfo>();
+		long minFcsj = minFcsj(line);
+		for (int j = 0; j < lists.size(); j++) {
+			ScheduleRealInfo s = lists.get(j);
+			boolean fage=true;
+			if(s.getBcType().equals("region")){
+				if(s.getXlDir().equals("0")){
+					if(!s.getQdzName().equals(qdz))
+						fage=false;
+				}else{
+					if(!s.getQdzName().equals(zdz))
+						fage=false;
+				}
+			}
+			if (!isInOut(s) && fage) {
+				String[] fcsj = s.getFcsj().split(":");
+				Long fcsjL = Long.parseLong(fcsj[0]) * 60 + Long.parseLong(fcsj[1]);
+				Long fcsjT = 0L;
+				if (fcsjL < minFcsj) {
+					Calendar calendar = new GregorianCalendar();
+					calendar.setTime(s.getScheduleDate());
+					calendar.add(calendar.DATE, 1);
+					Date date = calendar.getTime();
+					try {
+						fcsjT = sdf.parse(sdf_.format(date) + " " + s.getFcsj()).getTime();
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				} else {
+					try {
+						fcsjT = sdf.parse(s.getScheduleDateStr() + " " + s.getFcsj()).getTime();
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				Long fcsjAcual = 0L;
+				if (StringUtils.isEmpty(s.getFcsjActual())) {
+					s.setFcsjActualTime(0L);
+					s.setFcsjT(fcsjT);
+				} else {
+					try {
+						fcsjAcual = sdf.parse(s.getRealExecDate() + " " + s.getFcsjActual()).getTime();
+						s.setFcsjActualTime(fcsjAcual);
+						s.setFcsjT(fcsjT);
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				if (s.isSflj()) {
+					if (s.getXlDir().equals("0")) {
+						listsj0.add(s);
+					} else {
+						listsj1.add(s);
+					}
+				} else {
+					if (s.getXlDir().equals("0")) {
+						listsj0.add(s);
+						listjh0.add(s);
+					} else {
+						listsj1.add(s);
+						listjh1.add(s);
+					}
+				}
+			}
+		}
+		Collections.sort(listjh0, new ComparableReal());
+		Collections.sort(listjh1, new ComparableReal());
+		Collections.sort(listsj0, new ComparableAcual());
+		Collections.sort(listsj1, new ComparableAcual());
+		Map<String, Object> mjh = new HashMap<String, Object>();
+		Map<String, Object> msj = new HashMap<String, Object>();
+		Sheet sheet;
+		//获取上行所有准点班次
+		for (int k = 0; k < listjh0.size(); k++) {
+			ScheduleRealInfo sJh = listjh0.get(k);
+			for (int j = 0; j < listsj0.size(); j++) {
+				ScheduleRealInfo sSj = listsj0.get(j);
+				long sjc = sSj.getFcsjActualTime() - sJh.getFcsjT();
+				if (sjc >= -1 * 60 * 1000 && sjc <= 3 * 60 * 1000) {
+					if (mjh.get(String.valueOf(sJh.getId())) == null && msj.get(String.valueOf(sSj.getId())) == null) {
+						sheet = new Sheet();
+						sheet.setDate(sJh.getScheduleDateStr());
+						sheet.setRealDate(sSj.getRealExecDate());
+						sheet.setLine(sJh.getXlName());
+						sheet.setZdname(sJh.getQdzName());
+						sheet.setJhsj(sJh.getFcsj());
+						sheet.setSjsj(sSj.getFcsjActual());
+						sheet.setSfzd("准点");
+						sheet.setXlDir("0");
+						listSheet.add(sheet);
+						mjh.put(String.valueOf(sJh.getId()), sJh.getId());
+						msj.put(String.valueOf(sSj.getId()), sSj.getId());
+					}
+				}
+			}
+		}
+		// 获取上行所有不准点班次
+
+		for (int k = 0; k < listjh0.size(); k++) {
+			ScheduleRealInfo sJh = listjh0.get(k);
+			for (int j = 0; j < listsj0.size(); j++) {
+				ScheduleRealInfo sSj = listsj0.get(j);
+				if (mjh.get(String.valueOf(sJh.getId())) == null&&msj.get(String.valueOf(sSj.getId())) == null) {
+					sheet = new Sheet();
+					sheet.setDate(sJh.getScheduleDateStr());
+					sheet.setRealDate(sSj.getRealExecDate());
+					sheet.setLine(sJh.getXlName());
+					sheet.setZdname(sJh.getQdzName());
+					sheet.setJhsj(sJh.getFcsj());
+					sheet.setSjsj(sSj.getFcsjActual()==null?"烂班":sSj.getFcsjActual());
+					sheet.setSfzd("不准点");
+					sheet.setXlDir("0");
+					listSheet.add(sheet);
+					mjh.put(String.valueOf(sJh.getId()), sJh.getId());
+					msj.put(String.valueOf(sSj.getId()), sSj.getId());
+				}
+
+			}
+		}
+		// 获取下行所有准点班次
+		for (int k = 0; k < listjh1.size(); k++) {
+			ScheduleRealInfo sJh = listjh1.get(k);
+			for (int j = 0; j < listsj1.size(); j++) {
+				ScheduleRealInfo sSj = listsj1.get(j);
+				long sjc = sSj.getFcsjActualTime() - sJh.getFcsjT();
+				if (sjc >= -1 * 60 * 1000 && sjc <= 3 * 60 * 1000) {
+					if (mjh.get(String.valueOf(sJh.getId())) == null && msj.get(String.valueOf(sSj.getId())) == null) {
+						sheet = new Sheet();
+						sheet.setDate(sJh.getScheduleDateStr());
+						sheet.setRealDate(sSj.getRealExecDate());
+						sheet.setLine(sJh.getXlName());
+						sheet.setZdname(sJh.getQdzName());
+						sheet.setJhsj(sJh.getFcsj());
+						sheet.setSjsj(sSj.getFcsjActual());
+						sheet.setSfzd("准点");
+						sheet.setXlDir("1");
+						listSheet.add(sheet);
+						mjh.put(String.valueOf(sJh.getId()), sJh.getId());
+						msj.put(String.valueOf(sSj.getId()), sSj.getId());
+					}
+				}
+			}
+		}
+
+		// 获取下行所有不准点班次
+
+		for (int k = 0; k < listjh1.size(); k++) {
+			ScheduleRealInfo sJh = listjh1.get(k);
+			for (int j = 0; j < listsj1.size(); j++) {
+				ScheduleRealInfo sSj = listsj1.get(j);
+				if (mjh.get(String.valueOf(sJh.getId())) == null&&msj.get(String.valueOf(sSj.getId())) == null) {
+					sheet = new Sheet();
+					sheet.setDate(sJh.getScheduleDateStr());
+					sheet.setRealDate(sSj.getRealExecDate());
+					sheet.setLine(sJh.getXlName());
+					sheet.setZdname(sJh.getQdzName());
+					sheet.setJhsj(sJh.getFcsj());
+					sheet.setSjsj(sSj.getFcsjActual()==null?"烂班":sSj.getFcsjActual());
+					sheet.setSfzd("不准点");
+					sheet.setXlDir("1");
+					listSheet.add(sheet);
+					mjh.put(String.valueOf(sJh.getId()), sJh.getId());
+					msj.put(String.valueOf(sSj.getId()), sSj.getId());
+				}
+
+			}
+		}
+		
+		Collections.sort(listSheet, new ComparableSheet());
+		return listSheet;
+	}
+	
+	
+	private List<Sheet> calcSheetDdZdl(List<ScheduleRealInfo> lists,String line,String qdz,String zdz) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		SimpleDateFormat sdf_ = new SimpleDateFormat("yyyy-MM-dd");
+		DecimalFormat df = new DecimalFormat("0.00");
+		List<Sheet> listSheet=new ArrayList<Sheet>();
+		List<ScheduleRealInfo> listjh0 = new ArrayList<ScheduleRealInfo>();
+		List<ScheduleRealInfo> listjh1 = new ArrayList<ScheduleRealInfo>();
+		List<ScheduleRealInfo> listsj0 = new ArrayList<ScheduleRealInfo>();
+		List<ScheduleRealInfo> listsj1 = new ArrayList<ScheduleRealInfo>();
+		long minFcsj = minFcsj(line);
+		for (int j = 0; j < lists.size(); j++) {
+			ScheduleRealInfo s = lists.get(j);
+			boolean fage=true;
+			if(s.getBcType().equals("region")){
+				if(s.getXlDir().equals("0")){
+					if(!s.getQdzName().equals(qdz))
+						fage=false;
+				}else{
+					if(!s.getQdzName().equals(zdz))
+						fage=false;
+				}
+			}
+			if (!isInOut(s) && fage) {
+				String[] fcsj = s.getFcsj().split(":");
+				Long fcsjL = Long.parseLong(fcsj[0]) * 60 + Long.parseLong(fcsj[1]);
+				Long fcsjT = 0L;
+				if (fcsjL < minFcsj) {
+					Calendar calendar = new GregorianCalendar();
+					calendar.setTime(s.getScheduleDate());
+					calendar.add(calendar.DATE, 1);
+					Date date = calendar.getTime();
+					try {
+						fcsjT = sdf.parse(sdf_.format(date) + " " + s.getFcsj()).getTime();
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				} else {
+					try {
+						fcsjT = sdf.parse(s.getScheduleDateStr() + " " + s.getFcsj()).getTime();
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				//计划达到时间
+				Long ddsjT=0L;
+				try {
+					ddsjT = sdf.parse(s.getRealExecDate()+" "+s.getZdsj()).getTime();
+				} catch (ParseException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
+				
+				Long fcsjAcual = 0L;
+				if (StringUtils.isEmpty(s.getFcsjActual())) {
+					s.setFcsjActualTime(0L);
+					s.setFcsjT(fcsjT);
+				} else {
+					try {
+						fcsjAcual = sdf.parse(s.getRealExecDate() + " " + s.getFcsjActual()).getTime();
+						s.setFcsjActualTime(fcsjAcual);
+						s.setFcsjT(fcsjT);
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				if(fcsjT.longValue()>ddsjT.longValue()){
+					ddsjT=ddsjT+24*60*60*1000;
+				}
+				s.setZdsjT(ddsjT);
+				if(StringUtils.isEmpty(s.getZdsjActual())){
+					s.setZdsjActualTime(0L);
+				}else{
+					try {
+						Long ddsjActualT = sdf.parse(s.getRealExecDate()+" "+s.getZdsjActual()).getTime();
+						if(Math.abs(ddsjActualT-ddsjT)/60000>1000){
+							if(ddsjActualT.longValue()>ddsjT.longValue()){
+								ddsjActualT=ddsjActualT-24*60*60*1000;
+							}else{
+								ddsjActualT=ddsjActualT+24*60*60*1000;
+							}
+						}
+						s.setZdsjActualTime(ddsjActualT);
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+				if (s.isSflj()) {
+					if (s.getXlDir().equals("0")) {
+						listsj0.add(s);
+					} else {
+						listsj1.add(s);
+					}
+				} else {
+					if (s.getXlDir().equals("0")) {
+						listsj0.add(s);
+						listjh0.add(s);
+					} else {
+						listsj1.add(s);
+						listjh1.add(s);
+					}
+				}
+			}
+		}
+		Collections.sort(listjh0, new ComparableJhZd());
+		Collections.sort(listjh1, new ComparableJhZd());
+		Collections.sort(listsj0, new ComparableZdAcual());
+		Collections.sort(listsj1, new ComparableZdAcual());
+		Map<String, Object> mjh = new HashMap<String, Object>();
+		Map<String, Object> msj = new HashMap<String, Object>();
+		Sheet sheet;
+		//获取上行所有准点班次
+		for (int k = 0; k < listjh0.size(); k++) {
+			ScheduleRealInfo sJh = listjh0.get(k);
+			for (int j = 0; j < listsj0.size(); j++) {
+				ScheduleRealInfo sSj = listsj0.get(j);
+				long sjc = sSj.getZdsjActualTime() - sJh.getZdsjT();
+				if (sjc >= -1 * 60 * 1000 && sjc <= 3 * 60 * 1000) {
+					if (mjh.get(String.valueOf(sJh.getId())) == null && msj.get(String.valueOf(sSj.getId())) == null) {
+						sheet = new Sheet();
+						sheet.setDate(sJh.getScheduleDateStr());
+						try {
+							long abs=Math.abs(sdf.parse(sJh.getRealExecDate()+" "+sJh.getFcsj()).getTime()-
+									sdf.parse(sJh.getRealExecDate()+" "+sJh.getZdsj()).getTime())/60000;
+							 if(abs>1000){
+									Calendar calendar = new GregorianCalendar();
+									calendar.setTime(sdf_.parse(sJh.getRealExecDate()));
+									calendar.add(calendar.DATE, 1);
+									Date date = calendar.getTime();
+									sheet.setRealDate(sdf_.format(date));
+								}else{
+									sheet.setRealDate(sJh.getRealExecDate());
+								}
+						} catch (ParseException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+						sheet.setLine(sJh.getXlName());
+						sheet.setZdname(sJh.getQdzName());
+						sheet.setJhsj(sJh.getZdsj());
+						sheet.setSjsj(sSj.getZdsjActual());
+						sheet.setSfzd("准点");
+						sheet.setXlDir("0");
+						listSheet.add(sheet);
+						mjh.put(String.valueOf(sJh.getId()), sJh.getId());
+						msj.put(String.valueOf(sSj.getId()), sSj.getId());
+					}
+				}
+			}
+		}
+		// 获取上行所有不准点班次
+		for (int k = 0; k < listjh0.size(); k++) {
+			ScheduleRealInfo sJh = listjh0.get(k);
+			for (int j = 0; j < listsj0.size(); j++) {
+				ScheduleRealInfo sSj = listsj0.get(j);
+				if (mjh.get(String.valueOf(sJh.getId())) == null&&msj.get(String.valueOf(sSj.getId())) == null) {
+					sheet = new Sheet();
+					sheet.setDate(sJh.getScheduleDateStr());
+					try {
+						long abs=Math.abs(sdf.parse(sJh.getRealExecDate()+" "+sJh.getFcsj()).getTime()-
+								sdf.parse(sJh.getRealExecDate()+" "+sJh.getZdsj()).getTime())/60000;
+						 if(abs>1000){
+								Calendar calendar = new GregorianCalendar();
+								calendar.setTime(sdf_.parse(sJh.getRealExecDate()));
+								calendar.add(calendar.DATE, 1);
+								Date date = calendar.getTime();
+								sheet.setRealDate(sdf_.format(date));
+							}else{
+								sheet.setRealDate(sJh.getRealExecDate());
+							}
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+					sheet.setLine(sJh.getXlName());
+					sheet.setZdname(sJh.getQdzName());
+					sheet.setJhsj(sJh.getZdsj());
+					sheet.setSjsj(sSj.getZdsjActual()==null?"烂班":sSj.getZdsjActual());
+					sheet.setSfzd("不准点");
+					sheet.setXlDir("0");
+					listSheet.add(sheet);
+					mjh.put(String.valueOf(sJh.getId()), sJh.getId());
+					msj.put(String.valueOf(sSj.getId()), sSj.getId());
+				}
+
+			}
+		}
+		// 获取下行所有准点班次
+		for (int k = 0; k < listjh1.size(); k++) {
+			ScheduleRealInfo sJh = listjh1.get(k);
+			for (int j = 0; j < listsj1.size(); j++) {
+				ScheduleRealInfo sSj = listsj1.get(j);
+				long sjc = sSj.getZdsjActualTime() - sJh.getZdsjT();
+				if (sjc >= -1 * 60 * 1000 && sjc <= 3 * 60 * 1000) {
+					if (mjh.get(String.valueOf(sJh.getId())) == null && msj.get(String.valueOf(sSj.getId())) == null) {
+						sheet = new Sheet();
+						sheet.setDate(sJh.getScheduleDateStr());
+						try {
+							long abs=Math.abs(sdf.parse(sJh.getRealExecDate()+" "+sJh.getFcsj()).getTime()-
+									sdf.parse(sJh.getRealExecDate()+" "+sJh.getZdsj()).getTime())/60000;
+							 if(abs>1000){
+									Calendar calendar = new GregorianCalendar();
+									calendar.setTime(sdf_.parse(sJh.getRealExecDate()));
+									calendar.add(calendar.DATE, 1);
+									Date date = calendar.getTime();
+									sheet.setRealDate(sdf_.format(date));
+								}else{
+									sheet.setRealDate(sJh.getRealExecDate());
+								}
+						} catch (ParseException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+						
+						sheet.setLine(sJh.getXlName());
+						sheet.setZdname(sJh.getQdzName());
+						sheet.setJhsj(sJh.getZdsj());
+						sheet.setSjsj(sSj.getZdsjActual());
+						sheet.setSfzd("准点");
+						sheet.setXlDir("1");
+						listSheet.add(sheet);
+						mjh.put(String.valueOf(sJh.getId()), sJh.getId());
+						msj.put(String.valueOf(sSj.getId()), sSj.getId());
+					}
+				}
+			}
+		}
+
+		// 获取下行所有不准点班次
+		for (int k = 0; k < listjh1.size(); k++) {
+			ScheduleRealInfo sJh = listjh1.get(k);
+			for (int j = 0; j < listsj1.size(); j++) {
+				ScheduleRealInfo sSj = listsj1.get(j);
+				if (mjh.get(String.valueOf(sJh.getId())) == null&&msj.get(String.valueOf(sSj.getId())) == null) {
+					sheet = new Sheet();
+					sheet.setDate(sJh.getScheduleDateStr());
+					try {
+						long abs=Math.abs(sdf.parse(sJh.getRealExecDate()+" "+sJh.getFcsj()).getTime()-
+								sdf.parse(sJh.getRealExecDate()+" "+sJh.getZdsj()).getTime())/60000;
+						 if(abs>1000){
+								Calendar calendar = new GregorianCalendar();
+								calendar.setTime(sdf_.parse(sJh.getRealExecDate()));
+								calendar.add(calendar.DATE, 1);
+								Date date = calendar.getTime();
+								sheet.setRealDate(sdf_.format(date));
+							}else{
+								sheet.setRealDate(sJh.getRealExecDate());
+							}
+					} catch (ParseException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+					sheet.setLine(sJh.getXlName());
+					sheet.setZdname(sJh.getQdzName());
+					sheet.setJhsj(sJh.getZdsj());
+					sheet.setSjsj(sSj.getZdsjActual()==null?"烂班":sSj.getZdsjActual());
+					sheet.setSfzd("不准点");
+					sheet.setXlDir("1");
+					listSheet.add(sheet);
+					mjh.put(String.valueOf(sJh.getId()), sJh.getId());
+					msj.put(String.valueOf(sSj.getId()), sSj.getId());
+				}
+
+			}
+		}
+		
+		Collections.sort(listSheet, new ComparableSheet());
+		return listSheet;
+	}
+	private Long minFcsj(String line){
+    	String minfcsj="02:00";
+        List<Line> lineList=lineRepository.findLineByCode(line);
+        if(lineList.size()>0){
+	        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	         		+ " id = ("
+	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+	         		+ ")";
+	        minfcsj= jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
+		String[] minSjs = minfcsj.split(":");
+		//车辆最早发车时间 用了过滤超第二天0点的数据
+		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
+    	return minSj;
+    }
+	
+	 private static boolean isInOut(ScheduleRealInfo s){
+		boolean fage=false;
+		if(s.getBcType().equals("in")){
+			fage=true;
+		}
+		if(s.getBcType().equals("out")){
+			fage=true;
+		}
+		if(s.getBcType().equals("ldks")){
+			fage=true;
+		}
+		if(s.isCcService()){
+			fage=true;
+		}
+		return fage;
+	}
+	@Override
+	public List<Map<String, Object>> calcTurnoutrate(Map<String, Object> map) {
+    	final DecimalFormat df = new DecimalFormat("0.00");
+		String line="";
+		if(map.get("line")!=null){
+			line =map.get("line").toString().trim();
+		}
+		String gs="";
+		if(map.get("gsdmTurn")!=null){
+			gs=map.get("gsdmTurn").toString().trim();
+		}
+		String fgs="";
+		if(map.get("fgsdmTurn")!=null){
+			fgs=map.get("fgsdmTurn").toString().trim();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+    	Map<String, Boolean> lineMap=lineService.lineNature();
+
+		String startDate=map.get("startDate").toString();
+		String endDate=map.get("endDate").toString();
+		String date=startDate+"-"+endDate;
+		if(startDate.equals(endDate)){
+			date=startDate;
+		}else{
+			date=startDate+"-"+endDate;
+		}
+		String type=map.get("type").toString();
+		final String dates=date;
+		String sql_="";
+		if(line.equals("")){
+			sql_= " and gsdm ='"+gs+"' and fgsdm like '%"+fgs+"%'";
+		}else{
+			sql_=" and xl='"+line+"'";
+		}
+		String sql="select t.*,y.warrant_car as qzpcs from ("
+				+ " select gsdm,fgsdm,xl,xl_name,sum(jhcc) as jhcc,sum(sjcc) as sjcc,"
+				+ " sum(sjcczgf) as sjcczgf,sum(jhbcs) as jhbcs,sum(sjbcs) as sjbcs "
+				+ " from bsth_c_calc_sheet where date >='"+startDate+"' and date <='"+endDate+"'"
+				+ sql_
+				+ " group by gsdm,fgsdm,xl,xl_name ) "
+				+ " t LEFT JOIN bsth_c_line y "
+				+ " on t.xl=y.line_code order by fgsdm,xl_name";
+		List<Map<String, Object>> lists=jdbcTemplate.query(sql, 
+				 new RowMapper<Map<String, Object>>(){
+			 @Override 
+			 public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 Map<String, Object> s=new HashMap<String,Object>();
+				 s.put("rq",dates);
+				 s.put("gsdm", rs.getString("gsdm"));
+				 s.put("fgsdm", rs.getString("fgsdm"));
+				 s.put("gsName", BasicData.businessCodeNameMap.get(rs.getString("gsdm")));
+				 s.put("fgsName", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsdm")+"_"+rs.getString("gsdm")));
+				 s.put("xl", rs.getString("xl"));
+				 s.put("xlName", rs.getString("xl_name"));
+				 s.put("jhcc", rs.getInt("jhcc"));
+				 s.put("sjcc", rs.getInt("sjcc"));
+				 s.put("qzpcs",rs.getInt("qzpcs"));
+				 s.put("sjcczgf", rs.getInt("sjcczgf"));
+				 if(rs.getInt("jhcc")>0){
+					 s.put("ccl",df.format((float)rs.getInt("sjcc")/rs.getInt("jhcc")*100)+"%");
+					 s.put("cclzgf", df.format((float)rs.getInt("sjcczgf")/rs.getInt("jhcc")*100)+"%");
+				 }else{
+					 s.put("ccl", "0.00%");
+					 s.put("cclzgf","0.00%");
+				 }
+				 s.put("jhbc", rs.getInt("jhbcs"));
+				 s.put("sjbc", rs.getInt("sjbcs"));
+				 if(rs.getInt("jhbcs")>0){
+					 s.put("zxl", df.format((float)rs.getInt("sjbcs")/rs.getInt("jhbcs")*100)+"%");
+				 }else{
+					 s.put("zxl", "0.00%");
+				 }
+				 s.put("sm", "");
+				 return s;
+			 }
+		});
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		
+		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
+		int jhcc = 0, sjcc = 0,sjcczgf=0;;
+		int jhbc = 0, sjbc = 0;
+		int qz = 0;
+		int count=0;
+		Map<String, String> xlMap=new HashMap<String,String>();
+		for(Map<String, Object> m : lists){
+			if(nature.equals("0")){
+				list.add(m);
+				jhcc += Integer.valueOf(m.get("jhcc").toString());
+				sjcc += Integer.valueOf(m.get("sjcc").toString());
+				jhbc += Integer.valueOf(m.get("jhbc").toString());
+				sjbc += Integer.valueOf(m.get("sjbc").toString());
+				sjcczgf +=Integer.valueOf(m.get("sjcczgf").toString());
+				qz += Integer.valueOf(m.get("qzpcs").toString());
+				if(xlMap.get(m.get("xl").toString())==null){
+					count++;
+					xlMap.put(m.get("xl").toString(), m.get("xl").toString());
+				}
+			}else if(nature.equals("1")){
+				if(lineMap.get(m.get("xl").toString())){
+					list.add(m);
+					jhcc += Integer.valueOf(m.get("jhcc").toString());
+					sjcc += Integer.valueOf(m.get("sjcc").toString());
+					jhbc += Integer.valueOf(m.get("jhbc").toString());
+					sjbc += Integer.valueOf(m.get("sjbc").toString());
+					sjcczgf +=Integer.valueOf(m.get("sjcczgf").toString());
+					qz += Integer.valueOf(m.get("qzpcs").toString());
+					if(xlMap.get(m.get("xl").toString())==null){
+						count++;
+						xlMap.put(m.get("xl").toString(), m.get("xl").toString());
+					}
+				}
+			}else{
+				if(!lineMap.get(m.get("xl").toString())){
+					list.add(m);
+					jhcc += Integer.valueOf(m.get("jhcc").toString());
+					sjcc += Integer.valueOf(m.get("sjcc").toString());
+					jhbc += Integer.valueOf(m.get("jhbc").toString());
+					sjbc += Integer.valueOf(m.get("sjbc").toString());
+					sjcczgf +=Integer.valueOf(m.get("sjcczgf").toString());
+					qz += Integer.valueOf(m.get("qzpcs").toString());
+					if(xlMap.get(m.get("xl").toString())==null){
+						count++;
+						xlMap.put(m.get("xl").toString(), m.get("xl").toString());
+					}
+				}
+			}
+			
+		}
+		
+		Map<String, Object> tempMap=new HashMap<String,Object>();
+		tempMap.put("rq", "分类汇总");
+		tempMap.put("line_", "共" + list.size() + "条线路");
+		tempMap.put("xlName", "共" +count + "条线路");
+		tempMap.put("jhcc", jhcc);
+		tempMap.put("sjcc", sjcc);
+		tempMap.put("sjcczgf", sjcczgf);
+		tempMap.put("jhbc", jhbc);
+		tempMap.put("sjbc", sjbc);
+		tempMap.put("qzpcs", qz);
+		tempMap.put("sm", "");
+		if(jhcc != 0 && sjcc != 0){
+			tempMap.put("ccl", df.format(((float)sjcc / jhcc)*100)+"%");
+			tempMap.put("cclzgf", df.format(((float)sjcczgf / jhcc)*100)+"%");
+		}else{
+			tempMap.put("ccl", "0.00%");
+			tempMap.put("cclzgf", "0.00%");
+		}
+		if(jhbc != 0 && sjbc != 0){
+			tempMap.put("zxl", df.format(((float)sjbc / jhbc)*100)+"%");
+		}else{
+			tempMap.put("zxl", "0.00%");
+		}
+		if (type.equals("export")) {
+			String lineName=map.get("lineName").toString();
+			ReportUtils ee = new ReportUtils();
+			listI.add(list.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { tempMap }, path + "mould/calcTurnoutrate.xls", path + "export/"
+					+ dates + "-" + lineName + "-营运线路出车率统计表.xls");
+		}
+		list.add(tempMap);
+		return list;
+	}
+}
+
+class ComparableSheet implements Comparator<Sheet>{
+	 @Override
+		public int compare(Sheet o1, Sheet o2) {
+			// TODO Auto-generated method stub
+		 return (o1.getXlDir()+o1.getRealDate()+o1.getJhsj()).compareTo((o2.getXlDir()+o2.getRealDate()+o2.getJhsj()));
+		}
+}
+
+class ComparableZdAcual implements Comparator<ScheduleRealInfo>{
+	@Override
+	public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+		// TODO Auto-generated method stub
+		return o1.getZdsjActualTime().compareTo(o2.getZdsjActualTime());
+	}
+}
+
+class ComparableJhZd implements Comparator<ScheduleRealInfo>{
+	@Override
+	public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+		// TODO Auto-generated method stub
+		return o1.getZdsjT().compareTo(o2.getZdsjT());
+	}
+}
@@ -1084,14 +1084,21 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		                while (it.hasNext()) {
 		                    ChildTaskPlan childTaskPlan = it.next();
 		                    if(!childTaskPlan.isDestroy()){
-		                    	 if(childTaskPlan.getMileageType().equals("service")){
-		                    		 ljyy =Arith.add(ljyy,childTaskPlan.getMileage());
-		                    	 }
-		                    	 if(childTaskPlan.getMileageType().equals("empty")){
-		                    		 if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
-		                    			 ljjcc =Arith.add(ljjcc, childTaskPlan.getMileage());
-		                    		 }
-		                    	 }
+			                    if(childTaskPlan.getCcId()==null){
+			                    	 if(childTaskPlan.getMileageType().equals("service")){
+			                    		 ljyy =Arith.add(ljyy,childTaskPlan.getMileage());
+			                    	 }
+			                    	 if(childTaskPlan.getMileageType().equals("empty")){
+			                    		 if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
+			                    			 ljjcc =Arith.add(ljjcc, childTaskPlan.getMileage());
+			                    		 }
+			                    	 }
+			                    	 if(childTaskPlan.getMileageType().equals("empty")){
+			                    		 if(childTaskPlan.getType2().equals("1")){
+			                    			 ljkfks =Arith.add(ljkfks, childTaskPlan.getMileage());
+			                    		 }
+			                    	 }
+			                    }
 		                    }
 		                }
 					}
@@ -1211,7 +1218,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 //		                    }else{
 			                    if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
 				                    if (!childTaskPlan.isDestroy()) {
-				                    	if(childTaskPlan.getReason().equals(item)){
+				                    	String reason=childTaskPlan.getReason()==null?"":childTaskPlan.getReason();
+				                    	if(reason.equals(item)){
 					                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
 				                    	}
 				                    } 
@@ -1607,5 +1615,55 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		}
 		return ljgl;
 	}
+
+	@Override
+	public double culateLjksgl(List<ScheduleRealInfo> lists) {
+		double ljks=0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo t=lists.get(i);
+			if(t.isSflj()){
+				if(isInOut(t)){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						if(!t.isDestroy()){
+							ljks =Arith.add(ljks, t.getJhlc());
+						}
+						
+					}
+				}else{
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(!childTaskPlans.isEmpty()){
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if(!childTaskPlan.isDestroy()){
+		                    	 if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
+		                    		 ljks =Arith.add(ljks, childTaskPlan.getMileage());
+		                    	 }
+		                    }
+		                }
+					}
+				}
+			}else{
+				Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+				if(!childTaskPlans.isEmpty()){
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getCcId()==null){
+		                    if("empty".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
+		                    	 if (!childTaskPlan.isDestroy()) {
+		 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+		 	                    	ljks=Arith.add(ljks,jhgl);
+		 	                    } 
+		                    }
+	                    }
+	                }
+				}
+			
+			}
+		}
+		return ljks;
+	}
 }
@@ -7,8 +7,14 @@ import com.bsth.service.schedule.exception.ScheduleException;
  * Created by xu on 16/5/10.
  */
 public interface EmployeeConfigInfoService extends BService<EmployeeConfigInfo, Long> {
+    // 验证驾驶员配置是否重复配置
     void validate_jsy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
+    // 验证售票员配置是否重复配置
     void validate_spy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
+    // 验证驾驶员是否配置在指定线路
+    void validate_jsy_config(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
+    // 验证售票员是否配置在指定线路
+    void validate_spy_config(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
     void toggleCancel(Long id) throws ScheduleException;
     Long getMaxDbbm(Integer xlId);
 }