Update 2017_10_27

徐烜
2 parents 32956ff6 325cff18
Showing 41 changed files with 2470 additions and 807 deletions
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/realcontrol/summary/FastAndSlowController.java
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/summary/entity/FastAndSlow.java
src/main/java/com/bsth/data/summary/repository/FastAndSlowRepository.java
src/main/java/com/bsth/data/summary/service/FastAndSlowService.java
src/main/java/com/bsth/data/summary/service/impl/FastAndSlowServiceImpl.java
src/main/java/com/bsth/data/utils/ConvertUtil.java
src/main/java/com/bsth/entity/mcy_forms/Singledata.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/TrafficManageService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -77,6 +77,22 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 		return service.save(t);
 	} 
+	/**
+	 * 
+	 * 更改
+	 * 
+	 */
+	@RequestMapping(value="/update", method = RequestMethod.POST)
+	public Map<String, Object> update(Line l){
+		Map<String, Object> map = new HashMap<>();
+		if((l.getId().toString().length()) > 6 || service.lineCodeVerification(l.getLineCode()).equals("true") ) {
+			
+			map.put("status", ResponseCode.ERROR); 
+			return map;
+		}
+		return service.save(l);
+	} 
+	
 	@RequestMapping(value ="/findById" , method = RequestMethod.GET)
 	Line findByID(@RequestParam(defaultValue = "id") Integer id){
 		return service.findById(id);
@@ -186,7 +186,7 @@ public class ExportController {
 			m.put("i", i);
 			m.put("rQ", l.getrQ());
 			m.put("gS", l.getgS());
-			m.put("xL", l.getxL());
+			m.put("xL", l.getXlmc());
 			m.put("clzbh", l.getClzbh());
 			m.put("jsy", l.getJsy());
 			m.put("jName", l.getjName());
+package com.bsth.controller.realcontrol.summary;
+
+import com.bsth.controller.BaseController;
+import com.bsth.data.summary.entity.FastAndSlow;
+import com.bsth.data.summary.service.FastAndSlowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 快慢误点统计
+ * Created by panzhao on 2017/10/24.
+ */
+@RestController
+@RequestMapping("/summary/fastAndSlow")
+public class FastAndSlowController extends BaseController<FastAndSlow, Long> {
+
+    @Autowired
+    FastAndSlowService fastAndSlowService;
+
+    @RequestMapping("/excel/{lineCode}")
+    public void excel(@PathVariable("lineCode") String lineCode, @RequestParam String st
+            , @RequestParam String et, @RequestParam int type, HttpServletRequest request, HttpServletResponse response) {
+        fastAndSlowService.excel(lineCode, st, et, type, request, response);
+    }
+}
 \ No newline at end of file
@@ -51,7 +51,16 @@ public class TrafficManageController {
     @RequestMapping(value = "/setLD", method = RequestMethod.GET)
     public String setLD() throws Exception {
         try {
-            return trManageService.setLD();
+            return trManageService.setLD(null);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLDByDate", method = RequestMethod.GET)
+    public String setLDByDate(@RequestParam("theDate") String theDate) throws Exception {
+        try {
+            return trManageService.setLD(theDate);
         } catch (Exception exp) {
             throw new Exception(exp.getCause());
         }
@@ -221,7 +221,8 @@ public class SchAttrCalculator {
         for (ScheduleRealInfo sch : list) {
             //如果是出站既出场，忽略出场班次
             if (outConfig == 2 && sch.getBcType().equals("out")
-                    && (!limitPark || park.equals(sch.getQdzCode())))
+                    && (!limitPark || park.equals(sch.getQdzCode()))
+                    && (sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0))
                 continue;
             //忽略烂班
@@ -259,7 +260,8 @@ public class SchAttrCalculator {
         for (ScheduleRealInfo sch : list) {
             //如果是出站既出场，忽略出场班次
             if (outConfig == 2 && isInout(sch)
-                    && (!limitPark || park.equals(sch.getQdzCode()) || park.equals(sch.getZdzCode())))
+                    && (!limitPark || park.equals(sch.getQdzCode()) || park.equals(sch.getZdzCode()))
+                    && (sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0))
                 continue;
             //忽略烂班
@@ -135,6 +135,12 @@ public class LateAdjustHandle implements ApplicationContextAware{
             if(sch == null)
                 return;
+            //可能是延迟信号，gps时间没有误点
+            if(gps.getTimestamp() <= sch.getDfsjT()){
+                sch.setLate2(false);
+                lateSchMap.remove(sch.getClZbh());
+                return;
+            }
             //进的是班次起点（名称一样即可）
             gps.setStationName(BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo()));
             if(gps.getStationName().equals(sch.getQdzName())
+package com.bsth.data.summary.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ *  快慢误点
+ * Created by panzhao on 2017/10/24.
+ */
+@Entity
+@Table(name = "z_calc_fast_slow")
+public class FastAndSlow {
+
+    /**
+     * 班次ID
+     */
+    @Id
+    @Column(name = "s_id")
+    private Long id;
+
+    /**
+     * 发车站点
+     */
+    private String stationName;
+
+    /**
+     * 日期
+     */
+    @Column(name = "rq")
+    private String rq;
+
+    /**
+     * 上下行
+     */
+    private int upDown;
+
+    /**
+     * 计发时间
+     * HH:mm
+     */
+    private String fcsj;
+
+    /**
+     * 待发时间
+     * HH:mm
+     */
+    private String dfsj;
+
+    /**
+     * 实际发车时间
+     * HH:mm
+     */
+    private String fcsjActual;
+
+    /**
+     * 计发快误点
+     */
+    private int fcsjFast;
+
+    /**
+     * 计发慢误点
+     */
+    private int fcsjSlow;
+
+    /**
+     * 待发快误点
+     */
+    private int dfsjFast;
+
+    /**
+     * 待发慢误点
+     */
+    private int dfsjSlow;
+
+    /**
+     * 计划终点时间
+     */
+    private String zdsj;
+
+    /**
+     * 待发终点时间
+     */
+    private String zdsjDf;
+
+    /**
+     * 实际终点时间
+     */
+    private String zdsjActual;
+
+    /**
+     * 计发终点快误点
+     */
+    private int zdsjFast;
+
+    /**
+     * 计发终点慢误点
+     */
+    private int zdsjSlow;
+
+    /**
+     * 待发终点快误点
+     */
+    private int zdsjDfFast;
+
+    /**
+     * 待发终点慢误点
+     */
+    private int zdsjDfSlow;
+
+    @Column(name = "line_code")
+    private String lineCode;
+
+    private Long t;
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public String getDfsj() {
+        return dfsj;
+    }
+
+    public void setDfsj(String dfsj) {
+        this.dfsj = dfsj;
+    }
+
+    public String getFcsjActual() {
+        return fcsjActual;
+    }
+
+    public void setFcsjActual(String fcsjActual) {
+        this.fcsjActual = fcsjActual;
+    }
+
+    public int getFcsjFast() {
+        return fcsjFast;
+    }
+
+    public void setFcsjFast(int fcsjFast) {
+        this.fcsjFast = fcsjFast;
+    }
+
+    public int getFcsjSlow() {
+        return fcsjSlow;
+    }
+
+    public void setFcsjSlow(int fcsjSlow) {
+        this.fcsjSlow = fcsjSlow;
+    }
+
+    public int getDfsjFast() {
+        return dfsjFast;
+    }
+
+    public void setDfsjFast(int dfsjFast) {
+        this.dfsjFast = dfsjFast;
+    }
+
+    public int getDfsjSlow() {
+        return dfsjSlow;
+    }
+
+    public void setDfsjSlow(int dfsjSlow) {
+        this.dfsjSlow = dfsjSlow;
+    }
+
+    public String getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(String zdsj) {
+        this.zdsj = zdsj;
+    }
+
+    public String getZdsjDf() {
+        return zdsjDf;
+    }
+
+    public void setZdsjDf(String zdsjDf) {
+        this.zdsjDf = zdsjDf;
+    }
+
+    public String getZdsjActual() {
+        return zdsjActual;
+    }
+
+    public void setZdsjActual(String zdsjActual) {
+        this.zdsjActual = zdsjActual;
+    }
+
+    public int getZdsjFast() {
+        return zdsjFast;
+    }
+
+    public void setZdsjFast(int zdsjFast) {
+        this.zdsjFast = zdsjFast;
+    }
+
+    public int getZdsjSlow() {
+        return zdsjSlow;
+    }
+
+    public void setZdsjSlow(int zdsjSlow) {
+        this.zdsjSlow = zdsjSlow;
+    }
+
+    public int getZdsjDfFast() {
+        return zdsjDfFast;
+    }
+
+    public void setZdsjDfFast(int zdsjDfFast) {
+        this.zdsjDfFast = zdsjDfFast;
+    }
+
+    public int getZdsjDfSlow() {
+        return zdsjDfSlow;
+    }
+
+    public void setZdsjDfSlow(int zdsjDfSlow) {
+        this.zdsjDfSlow = zdsjDfSlow;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getT() {
+        return t;
+    }
+
+    public void setT(Long t) {
+        this.t = t;
+    }
+
+    public boolean isSlow() {
+        return this.fcsjSlow>0 || this.dfsjSlow>0 || this.zdsjSlow>0 || this.zdsjDfSlow>0;
+    }
+
+    public boolean isFast() {
+        return this.fcsjFast>0 || this.dfsjFast>0 || this.zdsjFast>0 || this.zdsjDfFast>0;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.summary.repository;
+
+import com.bsth.data.summary.entity.FastAndSlow;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/10/24.
+ */
+@Repository
+public interface FastAndSlowRepository extends BaseRepository<FastAndSlow, Long> {
+}
+package com.bsth.data.summary.service;
+
+import com.bsth.data.summary.entity.FastAndSlow;
+import com.bsth.service.BaseService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Created by panzhao on 2017/10/24.
+ */
+public interface FastAndSlowService extends BaseService<FastAndSlow, Long>{
+    void excel(String lineCode, String st, String et, int type, HttpServletRequest request, HttpServletResponse response);
+}
 \ No newline at end of file
+package com.bsth.data.summary.service.impl;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.summary.entity.FastAndSlow;
+import com.bsth.data.summary.service.FastAndSlowService;
+import com.bsth.data.utils.ConvertUtil;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.google.common.collect.ArrayListMultimap;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * Created by panzhao on 2017/10/24.
+ */
+@Service
+public class FastAndSlowServiceImpl extends BaseServiceImpl<FastAndSlow, Long> implements FastAndSlowService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+
+    @Override
+    public Iterable<FastAndSlow> list(Map<String, Object> map) {
+        try {
+            //最多5天
+            map.put("rq_le", maxEndTime(map.get("rq_ge").toString()
+                    , map.get("rq_le").toString(), 5));
+
+            List<FastAndSlow> list = (List) super.list(map);
+            String type = String.valueOf(map.get("type"));
+
+            return filterByType(list, type);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return null;
+    }
+
+    @Override
+    public void excel(String lineCode, String st, String et, int type, HttpServletRequest request, HttpServletResponse response) {
+        try {
+            Map<String, Object> params = new HashMap();
+            //最多31天
+            et = maxEndTime(st, et, 31);
+            params.put("rq_ge", st);
+            params.put("rq_le", et);
+            params.put("lineCode_eq", lineCode);
+            List<FastAndSlow> list = filterByType((List) super.list(params), type + "");
+
+            if(list.size() == 0){
+                response.setHeader("Content-type", "text/html;charset=UTF-8");
+                response.getWriter().print("<span style='color:red;font-size:24px;'>根据查询条件没有搜索到数据，别导了！</span>");
+                return ;
+            }
+            //排序
+            Collections.sort(list, new Comparator<FastAndSlow>() {
+                @Override
+                public int compare(FastAndSlow fas1, FastAndSlow fas2) {
+                    return (int) (fas1.getT() - fas2.getT());
+                }
+            });
+            //按日期分组
+            ArrayListMultimap<String, FastAndSlow> multimap =
+                    new ConvertUtil<FastAndSlow>().groupMultiList(list, "_", FastAndSlow.class.getDeclaredField("rq"));
+            //输出excel
+            String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
+            String filePath = basePath + "/static/pages/summary/excel/快慢误点报表.xls";
+            POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath));
+            HSSFWorkbook wb = new HSSFWorkbook(fs);
+
+            //写入数据
+            List<String> ks = new ArrayList<>(multimap.keySet());
+            Collections.sort(ks);
+            for(int i = 0; i < ks.size(); i++){
+                Sheet sheet = wb.getSheetAt(i);
+                writeData(sheet, multimap.get(ks.get(i)));
+                //sheet name
+                wb.setSheetName(i, ks.get(i));
+            }
+            //删除多余的sheet
+            for(int i = ks.size(); i <31; i++){
+                wb.removeSheetAt(ks.size());
+            }
+
+            //response 输出
+            String filename = BasicData.lineCode2NameMap.get(lineCode) + st + "至" + et + "快慢误点明细.xls";
+            response.setContentType("application/x-msdownload");
+            response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+
+            OutputStream os = response.getOutputStream();
+            wb.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    private void writeData(Sheet sheet, List<FastAndSlow> list) {
+        List<FastAndSlow> ups = new ArrayList<>()
+                ,downs = new ArrayList<>();
+        //前4行是表头
+        Row row;
+        row = sheet.getRow(0);
+        row.getCell(4).setCellValue(list.get(0).getRq());
+        row.getCell(13).setCellValue(BasicData.lineCode2NameMap.get(list.get(0).getLineCode()));
+        FastAndSlow fas;
+        for(int i = 0; i < list.size(); i++){
+            fas = list.get(i);
+            row = sheet.createRow(i + 4);
+            row.createCell(0).setCellValue(i + 1);
+            row.createCell(1).setCellValue(fas.getStationName());
+            row.createCell(2).setCellValue(fas.getUpDown());
+            row.createCell(3).setCellValue(fas.getFcsj());
+            row.createCell(4).setCellValue(fas.getDfsj());
+            row.createCell(5).setCellValue(fas.getFcsjActual());
+            row.createCell(6).setCellValue(fas.getFcsjFast());
+            row.createCell(7).setCellValue(fas.getFcsjSlow());
+            row.createCell(8).setCellValue(fas.getDfsjFast());
+            row.createCell(9).setCellValue(fas.getDfsjSlow());
+            row.createCell(10).setCellValue(fas.getZdsj());
+            row.createCell(11).setCellValue(fas.getZdsjDf());
+            row.createCell(12).setCellValue(fas.getZdsjActual());
+            row.createCell(13).setCellValue(fas.getZdsjFast());
+            row.createCell(14).setCellValue(fas.getZdsjSlow());
+            row.createCell(15).setCellValue(fas.getZdsjDfFast());
+            row.createCell(16).setCellValue(fas.getZdsjDfSlow());
+
+            if(fas.getUpDown()==0)
+                ups.add(fas);
+            else
+                downs.add(fas);
+        }
+        //合计
+        int size = list.size();
+        row = sheet.createRow(size + 4);
+        row.createCell(1).setCellValue("发车：上行（计划快误点："+jhfcFast(ups)+"  累计时间："+jhfcFastTime(ups)+"  待发快误点："+dffcFast(ups)+"  累计时间："+dffcFastTime(ups)+"） ");
+        row.createCell(9).setCellValue("下行（计划快误点："+jhfcFast(downs)+"  累计时间："+jhfcFastTime(downs)+"  待发快误点："+dffcFast(downs)+"  累计时间："+dffcFastTime(downs)+"）");
+        row = sheet.createRow(size + 5);
+        row.createCell(1).setCellValue("发车：上行（计划慢误点："+jhfcSlow(ups)+"  累计时间："+jhfcSlowTime(ups)+"  待发慢误点："+dffcSlow(ups)+"  累计时间："+dffcSlowTime(ups)+"） ");
+        row.createCell(9).setCellValue("下行（计划慢误点："+jhfcSlow(downs)+"  累计时间："+jhfcSlowTime(downs)+"  待发慢误点："+dffcSlow(downs)+"  累计时间："+dffcSlowTime(downs)+"）");
+        row = sheet.createRow(size + 6);
+        row.createCell(1).setCellValue("到达：上行（计划快误点："+jhzdFast(ups)+"  累计时间："+jhzdFastTime(ups)+"  待发快误点："+dfzdFast(ups)+"  累计时间："+dfzdFastTime(ups)+"） ");
+        row.createCell(9).setCellValue("下行（计划快误点："+jhzdFast(downs)+"  累计时间："+jhzdFastTime(downs)+"  待发快误点："+dfzdFast(downs)+"  累计时间："+dfzdFastTime(downs)+"）");
+        row = sheet.createRow(size + 7);
+        row.createCell(1).setCellValue("到达：上行（计划慢误点："+jhzdSlow(ups)+"  累计时间："+jhzdSlowTime(ups)+"  待发慢误点："+dfzdSlow(ups)+"  累计时间："+dfzdSlowTime(ups)+"） ");
+        row.createCell(9).setCellValue("下行（计划慢误点："+jhzdSlow(downs)+"  累计时间："+jhzdSlowTime(downs)+"  待发慢误点："+dfzdSlow(downs)+"  累计时间："+dfzdSlowTime(downs)+"）");
+        //合并单元格
+        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 4, 1, 8));
+        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 4, 9, 16));
+        sheet.addMergedRegion(new CellRangeAddress(size + 5, size + 5, 1, 8));
+        sheet.addMergedRegion(new CellRangeAddress(size + 5, size + 5, 9, 16));
+        sheet.addMergedRegion(new CellRangeAddress(size + 6, size + 6, 1, 8));
+        sheet.addMergedRegion(new CellRangeAddress(size + 6, size + 6, 9, 16));
+        sheet.addMergedRegion(new CellRangeAddress(size + 7, size + 7, 1, 8));
+        sheet.addMergedRegion(new CellRangeAddress(size + 7, size + 7, 9, 16));
+
+        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 7, 0, 0));
+    }
+
+    private List<FastAndSlow> filterByType(List<FastAndSlow> all, String type) {
+        List rsList = new ArrayList();
+        if ("-1".equals(type)) {//慢误
+            for (FastAndSlow fas : all) {
+                if (fas.isSlow())
+                    rsList.add(fas);
+            }
+            return rsList;
+        } else if ("1".equals(type)) {//快误
+            for (FastAndSlow fas : all) {
+                if (fas.isFast())
+                    rsList.add(fas);
+            }
+            return rsList;
+        }
+        return all;
+    }
+
+
+    private String maxEndTime(String sStr, String eStr, int space) throws ParseException {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            long st = sdf.parse(sStr).getTime();
+            long et = sdf.parse(eStr).getTime();
+            long dayTime = 24 * 60 * 60 * 1000;
+            long spaceTime = dayTime * space;
+
+            if (et - st > spaceTime) {
+                eStr = sdf.format(new Date(st + spaceTime));
+            }
+        } catch (Exception e) {
+            throw e;
+        }
+        return eStr;
+    }
+
+    /**
+     * 计划发出快误点
+     * @param list
+     * @return
+     */
+    private int jhfcFast(List<FastAndSlow> list){
+        int count=0;
+        for(FastAndSlow fas : list){
+            if(fas.getFcsjFast() > 0)
+                count++;
+        }
+        return count;
+    }
+
+    /**
+     * 计划终点快误点
+     * @param list
+     * @return
+     */
+    private int jhzdFast(List<FastAndSlow> list){
+        int count=0;
+        for(FastAndSlow fas : list){
+            if(fas.getZdsjFast() > 0)
+                count++;
+        }
+        return count;
+    }
+
+    /**
+     * 待发发出快误点
+     * @param list
+     * @return
+     */
+    private int dffcFast(List<FastAndSlow> list){
+        int count=0;
+        for(FastAndSlow fas : list){
+            if(fas.getDfsjFast() > 0)
+                count++;
+        }
+        return count;
+    }
+
+    /**
+     * 待发终点快误点
+     * @param list
+     * @return
+     */
+    private int dfzdFast(List<FastAndSlow> list){
+        int count=0;
+        for(FastAndSlow fas : list){
+            if(fas.getZdsjDfFast() > 0)
+                count++;
+        }
+        return count;
+    }
+
+    //----------
+
+    /**
+     * 计划发出慢误点
+     * @param list
+     * @return
+     */
+    private int jhfcSlow(List<FastAndSlow> list){
+        int count=0;
+        for(FastAndSlow fas : list){
+            if(fas.getFcsjSlow() > 0)
+                count++;
+        }
+        return count;
+    }
+
+    /**
+     * 计划终点慢误点
+     * @param list
+     * @return
+     */
+    private int jhzdSlow(List<FastAndSlow> list){
+        int count=0;
+        for(FastAndSlow fas : list){
+            if(fas.getZdsjSlow() > 0)
+                count++;
+        }
+        return count;
+    }
+
+    /**
+     * 待发发出慢误点
+     * @param list
+     * @return
+     */
+    private int dffcSlow(List<FastAndSlow> list){
+        int count=0;
+        for(FastAndSlow fas : list){
+            if(fas.getDfsjSlow() > 0)
+                count++;
+        }
+        return count;
+    }
+
+    /**
+     * 待发终点慢误点
+     * @param list
+     * @return
+     */
+    private int dfzdSlow(List<FastAndSlow> list){
+        int count=0;
+        for(FastAndSlow fas : list){
+            if(fas.getZdsjDfSlow() > 0)
+                count++;
+        }
+        return count;
+    }
+    /**
+     * ################
+     */
+    /**
+     * 计划发出快误点
+     * @param list
+     * @return
+     */
+    private int jhfcFastTime(List<FastAndSlow> list){
+        int sum=0;
+        for(FastAndSlow fas : list){
+            sum+=fas.getFcsjFast();
+        }
+        return sum;
+    }
+
+    /**
+     * 计划终点快误点
+     * @param list
+     * @return
+     */
+    private int jhzdFastTime(List<FastAndSlow> list){
+        int sum=0;
+        for(FastAndSlow fas : list){
+            sum+=fas.getZdsjFast();
+        }
+        return sum;
+    }
+
+    /**
+     * 待发发出快误点
+     * @param list
+     * @return
+     */
+    private int dffcFastTime(List<FastAndSlow> list){
+        int sum=0;
+        for(FastAndSlow fas : list){
+            sum+=fas.getDfsjFast();
+        }
+        return sum;
+    }
+
+    /**
+     * 待发终点快误点
+     * @param list
+     * @return
+     */
+    private int dfzdFastTime(List<FastAndSlow> list){
+        int sum=0;
+        for(FastAndSlow fas : list){
+            sum+=fas.getZdsjDfFast();
+        }
+        return sum;
+    }
+
+    //----------
+
+    /**
+     * 计划发出慢误点
+     * @param list
+     * @return
+     */
+    private int jhfcSlowTime(List<FastAndSlow> list){
+        int sum=0;
+        for(FastAndSlow fas : list){
+            sum+=fas.getFcsjSlow();
+        }
+        return sum;
+    }
+
+    /**
+     * 计划终点慢误点
+     * @param list
+     * @return
+     */
+    private int jhzdSlowTime(List<FastAndSlow> list){
+        int sum=0;
+        for(FastAndSlow fas : list){
+            sum+=fas.getZdsjSlow();
+        }
+        return sum;
+    }
+
+    /**
+     * 待发发出慢误点
+     * @param list
+     * @return
+     */
+    private int dffcSlowTime(List<FastAndSlow> list){
+        int sum=0;
+        for(FastAndSlow fas : list){
+            sum+=fas.getDfsjSlow();
+        }
+        return sum;
+    }
+
+    /**
+     * 待发终点慢误点
+     * @param list
+     * @return
+     */
+    private int dfzdSlowTime(List<FastAndSlow> list){
+        int sum=0;
+        for(FastAndSlow fas : list){
+            sum+=fas.getZdsjDfSlow();
+        }
+        return sum;
+    }
+}
 \ No newline at end of file
+package com.bsth.data.utils;
+
+import com.google.common.collect.ArrayListMultimap;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * 数据转换
+ * Created by panzhao on 2017/3/13.
+ */
+public class ConvertUtil<T> {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyyMMdd");
+
+    /**
+     * 根据指定字段 将 list 分组
+     *
+     * @param list
+     * @param separator 字段使用分隔符连接 组成key
+     * @param fields
+     * @return
+     */
+    public ArrayListMultimap<String, T> groupMultiList(List<T> list, String separator, Field... fields) {
+        ArrayListMultimap<String, T> multimap = ArrayListMultimap.create();
+
+        String key;
+        //Object field;
+        try {
+            for (T t : list) {
+
+                key = "";
+                for (Field f : fields) {
+                    f.setAccessible(true);
+                    if(null == f.get(t))
+                        continue;
+                    //日期类型格式化为 YYYY-MM-DD
+                    if (f.getType().equals(Date.class))
+                        key += (separator + fmtyyyyMMdd.print(((Date) f.get(t)).getTime()));
+                    else
+                        key += (separator + f.get(t).toString());
+                }
+                if(key.length() > 1)
+                    key = key.substring(1);
+
+                multimap.put(key, t);
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        return multimap;
+    }
+
+    /**
+     * 根据指定字段 将 list 分组
+     *
+     * @param list
+     * @param separator 字段使用分隔符连接 组成key
+     * @param fields
+     * @return
+     */
+    public Map<String, T> groupList(List<T> list, String separator, Field... fields) {
+        Map<String, T> map = new HashMap<>();
+
+        String key;
+        //Object field;
+        try {
+            for (T t : list) {
+
+                key = "";
+                for (Field f : fields) {
+                    f.setAccessible(true);
+                    //日期类型格式化为 YYYY-MM-DD
+                    if (f.getType().equals(Date.class))
+                        key += (separator + fmtyyyyMMdd.print(((Date) f.get(t)).getTime()));
+                    else
+                        key += (separator + f.get(t).toString());
+                }
+                key = key.substring(1);
+
+                map.put(key, t);
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        return map;
+    }
+
+    /**
+     * 计算并集
+     *
+     * @param all
+     * @param sub
+     * @return
+     */
+    public List<String> calcUnion(Collection<String> all, Collection<String> sub) {
+        List<String> rs = new ArrayList<>();
+
+        for (String str : all) {
+            if (sub.contains(str))
+                rs.add(str);
+        }
+        return rs;
+    }
+
+    /**
+     * 计算补集
+     *
+     * @param all
+     * @param sub
+     * @return
+     */
+    public List<String> calcComplement(Collection<String> all, Collection<String> sub) {
+        List<String> rs = new ArrayList<>();
+
+        for (String str : all) {
+            if (!sub.contains(str))
+                rs.add(str);
+        }
+        return rs;
+    }
+}
@@ -7,6 +7,7 @@ public class Singledata {
 	private String gS;//所属公司
 	private String xL;//线路
+	private String xlmc;//线路名称
 	private String clzbh;//车号
@@ -141,6 +142,14 @@ public class Singledata {
 	public void setJhjl(String jhjl) {
 		this.jhjl = jhjl;
 	}
+
+	public String getXlmc() {
+		return xlmc;
+	}
+
+	public void setXlmc(String xlmc) {
+		this.xlmc = xlmc;
+	}
@@ -287,7 +287,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	List<Map<String, String>> findAllLineWithYgc();
     @Modifying
-    @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1 ", nativeQuery=true)
+    @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line = ?1 ", nativeQuery=true)
 	public void stationRouteDir(Integer line);
     @Modifying
@@ -25,16 +25,16 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.id = ?1 ")
 	ScheduleRealInfo scheduleById(Long id);
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and bc_type not in ('in','out') order by (lpName+1),clZbh,realExecDate,dfsj")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 and bc_type not in ('in','out') order by (lpName+1),clZbh,realExecDate,dfsj")
 	List<ScheduleRealInfo> scheduleDailyQp(String line,String date);
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
-	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
+	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
-	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.clZbh ")
+	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.clZbh ")
 	List<ScheduleRealInfo> queryUserInfo3(String line,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
@@ -43,7 +43,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//把sum(addMileage) 替换为0   数据表去掉了 add_mileage 字段
 	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,"
 			+ "0 as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
-			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
+			+ " s.xlBm = ?1 and s.scheduleDateStr = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
 	@Query(value="select t.inside_code,d.sender,d.txt_content,d.timestamp,0 as xlbm from  ("
@@ -57,7 +57,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
 			+ " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
 			+ " ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
-			+ " DATE_FORMAT(r.schedule_date,'%Y-%m-%d') = ?2 and r.cl_zbh like %?3% group by "
+			+ " r.schedule_date_str = ?2 and r.cl_zbh like %?3% group by "
 			+ " lp_name,xl_name,cl_zbh",nativeQuery=true)
 	List<Object[]> historyMessageCount(String line,String date,String code);
@@ -72,7 +72,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> findByDate(String dateStr);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and cl_zbh=?3 order by bcs")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 and cl_zbh=?3 order by bcs")
 	List<ScheduleRealInfo> findByDate2(String line,String date,String clzbh);
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.status = -1")
@@ -84,17 +84,17 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="SELECT request_code,FROM_UNIXTIME(TIMESTAMP / 1000,'%Y-%m-%d %T') as TIMESTAMP ,device_id  FROM bsth_v_report_80 WHERE FROM_UNIXTIME( TIMESTAMP / 1000,'%Y-%m-%d') = ?2 AND line_id = ?1 and device_id like %?3%",nativeQuery=true)
 	List<Object[]> account(String line,String date,String code);
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
-			+ " and s.scheduleDate <= str_to_date(?3,'%Y-%m-%d') and s.lpName like  %?4% "
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr >= ?2 "
+			+ " and s.scheduleDateStr <= ?3 and s.lpName like  %?4% "
 			+ " and clZbh like %?5% order by s.fcsj")
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDateStr = ?4 and s.xlBm=?5 order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5  order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDateStr = ?4 and s.xlBm=?5  order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybillXcld(String jGh,String clZbh,String lpName,String date,String line);
 //	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -102,27 +102,27 @@ 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 DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?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.adjustExps,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineTjrb(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 DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.xlDir=?3  and s.fcsjActual is not null and s.zdsjActual is not null  order by s.realExecDate,s.fcsjActual")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 and s.xlDir=?3  and s.fcsjActual is not null and s.zdsjActual is not null  order by s.realExecDate,s.fcsjActual")
 	List<ScheduleRealInfo> scheduleByDateAndLineInOut(String line,String date,String zd);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDateStr = ?2 and xlBm =?3 order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh like %?1% and s.clZbh like %?2% and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') and s.gsBm like %?4% and s.fgsBm like %?5%  order by realExecDate,dfsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh like %?1% and s.clZbh like %?2% and s.scheduleDateStr = ?3 and s.gsBm like %?4% and s.fgsBm like %?5%  order by realExecDate,dfsj")
 	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.jName = ?1 and s.clZbh = ?2  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d')  order by bcs")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2  and s.scheduleDateStr >=?3 and s.scheduleDateStr <=?4  order by bcs")
 	List<ScheduleRealInfo> queryListWaybill4(String jName,String clZbh,String date,String enddate);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2")
 	List<ScheduleRealInfo> scheduleDaily(String line,String date);
 	@Query(value = "select count(*) from ScheduleRealInfo s where s.xlBm=?1 and s.scheduleDateStr=?2")
@@ -139,66 +139,66 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//去掉了 xlBm is not null 
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.fcsj, lpName")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and s.scheduleDateStr = ?2 order by s.xlDir,s.realExecDate,s.fcsj, lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLine(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 DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.lpName, s.realExecDate,s.fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 order by s.lpName, s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?3 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and s.scheduleDateStr = ?3 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLineByGs_(String gsdm,String fgsdm,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?3 and s.bcType not in ('in','out','ldks') order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and s.scheduleDateStr = ?3 and s.bcType not in ('in','out','ldks') order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLineByGs(String gsdm,String fgsdm,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and s.scheduleDateStr= ?2 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	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 DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?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.adjustExps,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLine2(String line,String date);
 	//按月统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m') = ?2 and s.bcType not in ('in','out','ldks') order by s.xlBm")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and s.scheduleDateStr = ?2 and s.bcType not in ('in','out','ldks') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine3(String line,String date);
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3  and gsBm like %?4% and fgsBm like %?5% order by s.xlBm")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and s.scheduleDateStr >= ?2  and s.scheduleDateStr<= ?3  and gsBm like %?4% and fgsBm like %?5% order by 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 DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?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.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj2(String line,String date,String date2);
 		//月报表
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?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.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj")
 	List<Map<String,Object>> yesterdayDataList_eq(String line,String date,String gsbm,String fgsbm,String nbbm);
-	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
+	@Query(value="select s from ScheduleRealInfo s where s.scheduleDateStr = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
 	List<ScheduleRealInfo> setLD(String date);
-	@Query(value="select new map(xlBm as xlBm,lpName as lpName,clZbh as clZbh) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,lpName,clZbh ORDER BY xlBm,lpName,clZbh")
+	@Query(value="select new map(xlBm as xlBm,lpName as lpName,clZbh as clZbh) from ScheduleRealInfo s where s.scheduleDateStr = ?1 GROUP BY xlBm,lpName,clZbh ORDER BY xlBm,lpName,clZbh")
 	List<Map<String,Object>> setLDGroup(String date);
-	@Query(value="select new map(xlBm as xlBm,clZbh as clZbh) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,clZbh ORDER BY xlBm,clZbh")
+	@Query(value="select new map(xlBm as xlBm,clZbh as clZbh) from ScheduleRealInfo s where s.scheduleDateStr = ?1 GROUP BY xlBm,clZbh ORDER BY xlBm,clZbh")
 	List<Map<String,Object>> setLCYHGroup(String date);
-	@Query(value="select new map(xlBm as xlBm) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm ORDER BY xlBm")
+	@Query(value="select new map(xlBm as xlBm) from ScheduleRealInfo s where s.scheduleDateStr = ?1 GROUP BY xlBm ORDER BY xlBm")
 	List<Map<String,Object>> setDDRBGroup(String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -65,6 +65,8 @@ public interface TrafficManageService {
 	 */
 	String setJHBC();
+	String setLD(String theDate);
+
 	String setLD();
 	String setLDFile();
@@ -355,79 +355,84 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     @Override
     public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
         Map<String, Object> rsMap = new HashMap<>();
-        List<Directive> list = new ArrayList<>();
-
-        switch (dType) {
-            case -1:
-                //所有指令
-                list = new ArrayList<>(dayOfDirectives.all());
-                break;
-            case 0:
-                //调度指令
-                Collection<D60> dptArray = dayOfDirectives.all60();
-                for (D60 d60 : dptArray) {
-                    if (d60.isDispatch())
-                        list.add(d60);
-                }
-                break;
-            case 1:
-                //运营指令
-                Collection<D60> yyArray = dayOfDirectives.all60();
-                for (D60 d60 : yyArray) {
-                    if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x03
-                            && !d60.isDispatch())
-                        list.add(d60);
-                }
-                break;
-            case 2:
-                //线路切换指令
-                list.addAll(dayOfDirectives.all64());
-                break;
-            case 3:
-                //消息短语
-                Collection<D60> dyArray = dayOfDirectives.all60();
-                for (D60 d60 : dyArray) {
-                    if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x00
-                            && !d60.isDispatch())
-                        list.add(d60);
-                }
-                break;
-        }
+        try{
+            List<Directive> list = new ArrayList<>();
+
+            switch (dType) {
+                case -1:
+                    //所有指令
+                    list = new ArrayList<>(dayOfDirectives.all());
+                    break;
+                case 0:
+                    //调度指令
+                    Collection<D60> dptArray = dayOfDirectives.all60();
+                    for (D60 d60 : dptArray) {
+                        if (d60.isDispatch())
+                            list.add(d60);
+                    }
+                    break;
+                case 1:
+                    //运营指令
+                    Collection<D60> yyArray = dayOfDirectives.all60();
+                    for (D60 d60 : yyArray) {
+                        if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x03
+                                && !d60.isDispatch())
+                            list.add(d60);
+                    }
+                    break;
+                case 2:
+                    //线路切换指令
+                    list.addAll(dayOfDirectives.all64());
+                    break;
+                case 3:
+                    //消息短语
+                    Collection<D60> dyArray = dayOfDirectives.all60();
+                    for (D60 d60 : dyArray) {
+                        if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x00
+                                && !d60.isDispatch())
+                            list.add(d60);
+                    }
+                    break;
+            }
-        // 时间倒序
-        Collections.sort(list, new DayOfDirectives.DComparator());
-        if (StringUtils.isNotBlank(nbbm)) {
-            String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-            //按车辆过滤
-            List<Directive> subList = new ArrayList<>();
-            for (Directive d : list) {
-                if (d.getDeviceId().equals(deviceId)) {
-                    subList.add(d);
+            // 时间倒序
+            Collections.sort(list, new DayOfDirectives.DComparator());
+            if (StringUtils.isNotBlank(nbbm)) {
+                String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+                //按车辆过滤
+                List<Directive> subList = new ArrayList<>();
+                for (Directive d : list) {
+                    if (d.getDeviceId().equals(deviceId)) {
+                        subList.add(d);
+                    }
                 }
+                list = subList;
             }
-            list = subList;
-        }
-        int count = list.size();
-        // 分页
-        int s = page * size, e = s + size;
+            int count = list.size();
+            // 分页
+            int s = page * size, e = s + size;
-        if (e > count)
-            e = count;
+            if (e > count)
+                e = count;
-        List<Directive> rs = list.subList(s, e);
+            List<Directive> rs = list.subList(s, e);
-        // 时间格式化，车辆自编号转换
-        for (Directive d : rs) {
-            if (d.getTimeHHmm() == null)
-                d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
-            if (d.getNbbm() == null)
-                d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
-        }
+            // 时间格式化，车辆自编号转换
+            for (Directive d : rs) {
+                if (d.getTimeHHmm() == null)
+                    d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
+                if (d.getNbbm() == null)
+                    d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
+            }
-        rsMap.put("list", rs);
-        rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
-        rsMap.put("page", page);
+            rsMap.put("list", rs);
+            rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
+            rsMap.put("page", page);
+        }catch (Exception e){
+            logger.error("", e);
+            throw e;
+        }
         return rsMap;
     }
@@ -201,7 +201,7 @@ public class FormsServiceImpl implements FormsService {
 				+ " LEFT JOIN bsth_c_s_sp_info_real r on r.xl_bm=l.line_code" 
 		        + " where 1=1  ";
 		if(map.get("date").toString()!=""){
-			sql+="and  to_days(r.schedule_date)=to_days('"+map.get("date").toString() + "') ";
+			sql+="and  r.schedule_date_str='"+map.get("date").toString() + "'";
 		}
 		if( map.get("line").toString()!=""){
 			sql+=" and l.line_code=" + map.get("line").toString();
@@ -251,24 +251,14 @@ public class FormsServiceImpl implements FormsService {
 		}else{
 			sql	+= "  r.cl_zbh";
 		}
-		sql  += " from bsth_c_s_sp_info_real r where 1=1  ";
-		if(map.get("startDate")!=null&&!map.get("startDate").equals("")){
-			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
-		}
-		
-		if(map.get("endDate")!=null&&!map.get("endDate").equals("")){
-			sql+=" and  to_days('" + map.get("endDate").toString() + "') ";
-		}
+		sql  += " from bsth_c_s_sp_info_real r where "
+				+ " r.schedule_date_str >= '" + map.get("startDate").toString() + "' "
+						+ " and r.schedule_date_str <='" + map.get("endDate").toString() + "' ";
 		if(map.get("line")!=null&&!map.get("line").equals("")){
 			sql+=" and r.xl_bm='"+ map.get("line").toString() + "' ";
 		}
-//			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
-//		if(map.get("gsdmManth")!=null&&!map.get("gsdmManth").equals("")){
-			sql+=" and r.gs_bm like'%"+gsdmManth+"%' ";
-//		}
-		if(map.get("fgsdmManth")!=null&&!map.get("fgsdmManth").equals("")){
-			sql+=" and r.fgs_bm like'%"+fgsdmManth+"%' ";
-		}
+		sql+=" and r.gs_bm like'%"+gsdmManth+"%'  and r.fgs_bm like'%"+fgsdmManth+"%'";
+		
 		if(empnames.equals("驾驶员")){
 			sql	+= " GROUP BY "
 					+ "r.j_name,r.j_gh";
@@ -278,11 +268,6 @@ public class FormsServiceImpl implements FormsService {
 			sql	+= " GROUP BY r.cl_zbh";
 		}
-//					+ ",r.gs_bm,r.gs_name,"
-//					+ "r.fgs_bm,r.fgs_name,r.bc_type ";
-			
-//			r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,"
-//					+ " r.fgs_bm,r.fgs_name,r.bc_type,r.s_name,r.lp_name
 		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
 			@Override
@@ -409,7 +394,7 @@ public class FormsServiceImpl implements FormsService {
 				+ "IFNULL(r.s_name,'')as s_name,"
 				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name "
 				+ "FROM bsth_c_s_sp_info_real r  where 1=1  "
-				+ " and to_days(r.schedule_date)=to_days('"+date + "')  "
+				+ " and r.schedule_date_str='"+date + "'  "
 				+ " and r.xl_bm like '%"+line+"%' "
 				+ " and r.gs_bm  like '%"+gsdmShif+"%' "
 				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' ) t"
@@ -547,19 +532,6 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("fgsdm")!=null){
 			fgs =map.get("fgsdm").toString();
 		}
-		/*String sql = " select c.*,l.line_code   from bsth_c_chtoch c LEFT JOIN bsth_c_line l on c.xl=l.name WHERE 1=1  ";
-		if (!map.get("startDate").toString().equals(" ") && !map.get("endDate").toString().equals(" ")) {
-			sql += "and DATE_FORMAT( c.rq,'%Y-%m-%d') BETWEEN  '" + map.get("startDate").toString() + "'  and '"
-					+ map.get("endDate").toString() + "'";
-		}
-		if (!map.get("line").equals("")) {
-			sql += "and  line_code='" + map.get("line") + "'";
-		}
-		if (map.get("sel").equals("2")) {
-			sql += " and c.pcch!=c.pcry";
-		} else if (map.get("sel").equals("1")) {
-			sql += " and c.jhgh!=c.sjgh";
-		}*/
 		String sql="select * from bsth_c_chtoch where rq BETWEEN '"+ map.get("startDate").toString()+"' "
 				+ " and '"+map.get("endDate").toString() +"'";
@@ -630,19 +602,6 @@ public class FormsServiceImpl implements FormsService {
 //		rq = rq2 + "-" + rq3;
 		startDate = map.get("startDate").toString();
-//		endDate = map.get("endDate").toString();
-//		String sql = "select t.*,y.yh,y.jzl from ("
-//				+ " select r.xl_bm,r.xl_name,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 "
-//				+ " BETWEEN '"+startDate+"'  and '"+endDate+"'  and r.xl_bm='"+map.get("line").toString()+"'  "
-//				+ " AND r.gs_bm is not null and r.gs_bm='"+map.get("gsdmSing").toString()+"' "
-//				+ " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'  "
-//				+ " group by r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm) t "
-//				+ " LEFT JOIN (select a.nbbm,a.jsy,SUM(a.yh) as yh,SUM(a.jzl) as jzl "
-//				+ " from bsth_c_ylb a where  a.rq BETWEEN '"+startDate+"'  and '"+endDate+"'and "
-//				+ " a.ssgsdm='"+map.get("gsdmSing").toString()+"' and a.fgsdm='"+map.get("fgsdmSing").toString()+"' "
-//				+ "group by  a.nbbm,a.jsy) y"
-//				+ " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
 		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"
@@ -775,19 +734,28 @@ public class FormsServiceImpl implements FormsService {
 					String line=y.getXlbm();
 					String clzbh=y.getNbbm();
 					List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+					List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
 					for (int j = 0; j < listReal.size(); j++) {
 						ScheduleRealInfo s=listReal.get(j);
 						if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
 								&&s.getXlBm().equals(line)){
 							newList.add(s);
+							 Set<ChildTaskPlan> cts = s.getcTasks();
+				            if(cts != null && cts.size() > 0){
+				            	newList_.add(s);
+				            }else{
+					            if(s.getZdsjActual()!=null){
+					            	newList_.add(s);
+					            }
+				            }
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
 					double jhjcc=culateMileageService.culateJhJccgl(newList);
-					double yygl=culateMileageService.culateSjgl(newList);
-					double ljgl=culateMileageService.culateLjgl(newList);
-					double ksgl=culateMileageService.culateKsgl(newList);
-					double jcgl=culateMileageService.culateJccgl(newList);
+					double yygl=culateMileageService.culateSjgl(newList_);
+					double ljgl=culateMileageService.culateLjgl(newList_);
+					double ksgl=culateMileageService.culateKsgl(newList_);
+					double jcgl=culateMileageService.culateJccgl(newList_);
 					double zyygl=Arith.add(yygl, ljgl);
 					double zksgl=Arith.add(ksgl, jcgl);
@@ -797,7 +765,8 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-					sin.setxL(BasicData.lineCode2NameMap.get(y.getXlbm()));
+					sin.setxL(y.getXlbm());
+					sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
 					sin.setClzbh(clzbh);
 					sin.setJsy(jsy);
 					sin.setrQ(startDate);
@@ -819,19 +788,28 @@ public class FormsServiceImpl implements FormsService {
 					String line=y.getXlbm();
 					String clzbh=y.getNbbm();
 					List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+					List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
 					for (int j = 0; j < listReal.size(); j++) {
 						ScheduleRealInfo s=listReal.get(j);
 						if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
 								&&s.getXlBm().equals(line)){
 							newList.add(s);
+							 Set<ChildTaskPlan> cts = s.getcTasks();
+					            if(cts != null && cts.size() > 0){
+					            	newList_.add(s);
+					            }else{
+						            if(s.getZdsjActual()!=null){
+						            	newList_.add(s);
+						            }
+					            }
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
 					double jhjcc=culateMileageService.culateJhJccgl(newList);
-					double yygl=culateMileageService.culateSjgl(newList);
-					double ljgl=culateMileageService.culateLjgl(newList);
-					double ksgl=culateMileageService.culateKsgl(newList);
-					double jcgl=culateMileageService.culateJccgl(newList);
+					double yygl=culateMileageService.culateSjgl(newList_);
+					double ljgl=culateMileageService.culateLjgl(newList_);
+					double ksgl=culateMileageService.culateKsgl(newList_);
+					double jcgl=culateMileageService.culateJccgl(newList_);
 					double zyygl=Arith.add(yygl, ljgl);
 					double zksgl=Arith.add(ksgl, jcgl);
@@ -841,7 +819,8 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-					sin.setxL(BasicData.lineCode2NameMap.get(y.getXlbm()));
+					sin.setxL(y.getXlbm());
+					sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
 					sin.setClzbh(clzbh);
 					sin.setJsy(jsy);
 					sin.setrQ(startDate);
@@ -855,10 +834,10 @@ public class FormsServiceImpl implements FormsService {
 					listD.add(sin);
 				}
-			Collections.sort(listY,new SingledataByXlbm());
-			Collections.sort(listD,new SingledataByXlbm());
-			list.addAll(listY);
-			list.addAll(listD);
+				Collections.sort(listY,new SingledataByXlbm());
+				Collections.sort(listD,new SingledataByXlbm());
+				list.addAll(listY);
+				list.addAll(listD);
 			}else{
 				String sql="select r.s_gh,r.s_name, "
 						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm"
@@ -894,19 +873,29 @@ public class FormsServiceImpl implements FormsService {
 					String line=sin.getxL();
 					String clzbh=sin.getClzbh();
 					List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+					List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
+
 					for (int j = 0; j < listReal.size(); j++) {
 						ScheduleRealInfo s=listReal.get(j);
 						if(s.getsGh().equals(jsy) && s.getClZbh().equals(clzbh)
 								&&s.getXlBm().equals(line)){
 							newList.add(s);
+							 Set<ChildTaskPlan> cts = s.getcTasks();
+					            if(cts != null && cts.size() > 0){
+					            	newList_.add(s);
+					            }else{
+						            if(s.getZdsjActual()!=null){
+						            	newList_.add(s);
+						            }
+					            }
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
 					double jhjcc=culateMileageService.culateJhJccgl(newList);
-					double yygl=culateMileageService.culateSjgl(newList);
-					double ljgl=culateMileageService.culateLjgl(newList);
-					double ksgl=culateMileageService.culateKsgl(newList);
-					double jcgl=culateMileageService.culateJccgl(newList);
+					double yygl=culateMileageService.culateSjgl(newList_);
+					double ljgl=culateMileageService.culateLjgl(newList_);
+					double ksgl=culateMileageService.culateKsgl(newList_);
+					double jcgl=culateMileageService.culateJccgl(newList_);
 					double zyygl=Arith.add(yygl, ljgl);
 					double zksgl=Arith.add(ksgl, jcgl);
@@ -1210,8 +1199,8 @@ public class FormsServiceImpl implements FormsService {
 		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 DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' "
-				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"' ";
+				+ "and schedule_date_str >= '"+startDate+"' "
+				+ "and schedule_date_str <= '"+endDate+"' ";
 		if(line.trim().length() != 0){
 			sql += "and xl_bm = '"+line+"' ";
 		}
@@ -1367,8 +1356,8 @@ public class FormsServiceImpl implements FormsService {
 		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 DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
-				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
+				+ " from bsth_c_s_sp_info" + "  where schedule_date_str >= '"
+				+ map.get("startDate").toString() + "'  and  schedule_date_str <='" + 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() + "'"
@@ -1376,7 +1365,7 @@ public class FormsServiceImpl implements FormsService {
 				+ " ) 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  "
 				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
-				+ "where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
+				+ "where schedule_date_str >= '" + map.get("startDate").toString() + "'  and  schedule_date_str <= '"
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
 				+ "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') "
 //				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type"
@@ -1451,8 +1440,8 @@ public class FormsServiceImpl implements FormsService {
 		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 DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
-				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
+				+ " from bsth_c_s_sp_info" + "  where schedule_date_str >= '"
+				+ map.get("startDate").toString() + "'  and schedule_date_str<= '" + 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("gsdmAllline").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"
@@ -17,7 +17,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -25,7 +24,6 @@ import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -1715,13 +1713,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
 			boolean flag = true;
-			if(jhlc.toString().equals("0")){
+			if(jhlc.doubleValue() == 0d){
 				flag = false;
 			}
 			tempMap.put("date", Date);
 			tempMap.put("company", companyName);
 			tempMap.put("subCompany", subCompanyName);
-			tempMap.put("times", times);
+			tempMap.put("times", sfqr == 1 ? times : "全日");
 			tempMap.put("line", key);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
@@ -1732,37 +1730,37 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("lcbfb", df.format(flag?sjlc.divide(jhlc, 4, BigDecimal.ROUND_HALF_UP).doubleValue()*100:0)+"%");
 			tempMap.put("lzbc", lzbc);
 			tempMap.put("lzlc", lzlc.doubleValue());
-			tempMap.put("lzbfb", df.format(flag?(double)lzbc/jhbc*100:0)+"%");
+			tempMap.put("lzbfb", df.format(jhbc>0?(double)lzbc/jhbc*100:0)+"%");
 			tempMap.put("dmbc", dmbc);
 			tempMap.put("dmlc", dmlc.doubleValue());
-			tempMap.put("dmbfb", df.format(flag?(double)dmbc/jhbc*100:0)+"%");
+			tempMap.put("dmbfb", df.format(jhbc>0?(double)dmbc/jhbc*100:0)+"%");
 			tempMap.put("gzbc", gzbc);
 			tempMap.put("gzlc", gzlc.doubleValue());
-			tempMap.put("gzbfb", df.format(flag?(double)gzbc/jhbc*100:0)+"%");
+			tempMap.put("gzbfb", df.format(jhbc>0?(double)gzbc/jhbc*100:0)+"%");
 			tempMap.put("jfbc", jfbc);
 			tempMap.put("jflc", jflc.doubleValue());
-			tempMap.put("jfbfb", df.format(flag?(double)jfbc/jhbc*100:0)+"%");
+			tempMap.put("jfbfb", df.format(jhbc>0?(double)jfbc/jhbc*100:0)+"%");
 			tempMap.put("zsbc", zsbc);
 			tempMap.put("zslc", zslc.doubleValue());
-			tempMap.put("zsbfb", df.format(flag?(double)zsbc/jhbc*100:0)+"%");
+			tempMap.put("zsbfb", df.format(jhbc>0?(double)zsbc/jhbc*100:0)+"%");
 			tempMap.put("qrbc", qrbc);
 			tempMap.put("qrlc", qrlc.doubleValue());
-			tempMap.put("qrbfb", df.format(flag?(double)qrbc/jhbc*100:0)+"%");
+			tempMap.put("qrbfb", df.format(jhbc>0?(double)qrbc/jhbc*100:0)+"%");
 			tempMap.put("qcbc", qcbc);
 			tempMap.put("qclc", qclc.doubleValue());
-			tempMap.put("qcbfb", df.format(flag?(double)qcbc/jhbc*100:0)+"%");
+			tempMap.put("qcbfb", df.format(jhbc>0?(double)qcbc/jhbc*100:0)+"%");
 			tempMap.put("kxbc", kxbc);
 			tempMap.put("kxlc", kxlc.doubleValue());
-			tempMap.put("kxbfb", df.format(flag?(double)kxbc/jhbc*100:0)+"%");
+			tempMap.put("kxbfb", df.format(jhbc>0?(double)kxbc/jhbc*100:0)+"%");
 			tempMap.put("qhbc", qhbc);
 			tempMap.put("qhlc", qhlc.doubleValue());
-			tempMap.put("qhbfb", df.format(flag?(double)qhbc/jhbc*100:0)+"%");
+			tempMap.put("qhbfb", df.format(jhbc>0?(double)qhbc/jhbc*100:0)+"%");
 			tempMap.put("wybc", wybc);
 			tempMap.put("wylc", wylc.doubleValue());
-			tempMap.put("wybfb", df.format(flag?(double)wybc/jhbc*100:0)+"%");
+			tempMap.put("wybfb", df.format(jhbc>0?(double)wybc/jhbc*100:0)+"%");
 			tempMap.put("qtbc", qtbc);
 			tempMap.put("qtlc", qtlc.doubleValue());
-			tempMap.put("qtbfb", df.format(flag?(double)qtbc/jhbc*100:0)+"%");
+			tempMap.put("qtbfb", df.format(jhbc>0?(double)qtbc/jhbc*100:0)+"%");
 			resList.add(tempMap);
 		}
@@ -1784,7 +1782,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				e.printStackTrace();
 			}
 		}
-		System.out.println(map);
 		return resList;
 	}
@@ -279,14 +279,30 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
+	 * 上传路单 指定日期 yyyy-MM-dd
+	 * @param theDate
+	 * @return
+	 */
+	public String setLD(String theDate){
+		return uploadLD(theDate);
+	}
+
+	/**
+	 * 上传路单 上传前一天的路单
+	 * @return
+	 */
+	public String setLD(){
+		return uploadLD(null);
+	}
+	/**
 	 * 上传路单
 	 * @return 上传成功标识
 	 */
-	public String setLD(){
+	private String uploadLD(String theDate){
 		String result = "failure";
 		Line line;
 		// 取昨天 的日期
-		String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
+		String date = theDate == null ?sdfnyr.format(DateUtils.addDays(new Date(), -1)) : theDate;
 		StringBuffer sf = new StringBuffer();
 		String str;
 		try {
@@ -24,6 +24,7 @@ import com.bsth.data.utils.CustomStringUtils;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
+import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
@@ -246,7 +247,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             schedule.setDfsjAll(dfsj);
             schedule.setDfAuto(false);
-            schedule.setRemarks(remarks);
+            if("1".equals(opType))
+                schedule.setRemarks(remarks);
             List<ScheduleRealInfo> ts = new ArrayList<>();
             ts.add(schedule);
@@ -788,13 +790,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         		+ " select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
         		+ " s.lp_Name as lpName,s.j_Name as jName,max(s.schedule_date_str) as dateStr ,"
         		+ " min(s.fcsj) as fcsj,1 as px  from bsth_c_s_sp_info_real s  where "
-        		+ " s.xl_Bm = '"+line+"' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='"+date+"'"
+        		+ " s.xl_Bm = '"+line+"' and s.schedule_date_str ='"+date+"'"
         		+ " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name ) x where x.fcsj >'"+minfcsj+"'"
         		+ " UNION "
         		+ " select * from ( select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
         		+ " s.lp_Name as lpName,s.j_Name as jName, max(s.schedule_date_str) as dateStr,"
         		+ " min(s.fcsj) as fcsj,2 as px from bsth_c_s_sp_info_real s  "
-        		+ " where s.xl_Bm = '"+line+"' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='"+date+"'"
+        		+ " where s.xl_Bm = '"+line+"' and s.schedule_date_str ='"+date+"'"
         		+ " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name "
         		+ " ) y where y.fcsj <='"+minfcsj+"') z order by (" + state + "),dateStr,px " + type;
         List<ScheduleRealInfo> list = jdbcTemplate.query(sqlPlan,
@@ -2943,17 +2945,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }else{
         	yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList_eq(line, date,gsbm,fgsbm,nbbm);
         }
-        		
-//        System.out.println("shijian2:"+new Date());
-        //		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+        System.out.println("time2:"+new Date());
+	
         List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
-//        System.out.println("shijian3:"+new Date());
         for (int x = 0; x < yesterdayDataList.size(); x++) {
             String jName = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
             String xlbm  = yesterdayDataList.get(x).get("xlBm").toString();
-//            double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
-            double addMileage = 0, remMileage = 0;
             Map<String, Object> map = new HashMap<String, Object>();
             boolean fage = true;
             String company="";
@@ -2976,13 +2974,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
           	            	listS.add(scheduleRealInfo);
           	            }
                     }
-                    listS.add(scheduleRealInfo);
                 }
             }
             yesterdayDataList.get(x).put("company", company);
             yesterdayDataList.get(x).put("bCompany", bCompany);
-//            Double zgl=Arith.add(yygl,ksgl);
             Double ljgl=culateMieageService.culateLjgl(listS);
             Double sjgl=culateMieageService.culateSjgl(listS);
             Double ksgl=culateMieageService.culateKsgl(listS);
@@ -2993,15 +2989,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             yesterdayDataList.get(x).put("totalKilometers", zlc);
         }
-       /* List<Map<String, Object>> yesterdayDataLists = new ArrayList<Map<String, Object>>();
-
-        for (int i = 0; i < yesterdayDataList.size(); i++) {
-        	Map<String, Object> map=yesterdayDataList.get(i);
-        	 Double zlc=map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString());
-//        	 if(zlc>0){
-        		 yesterdayDataLists.add(map);
-//        	 }
-        }*/
         //增加顺序号
         for (int i = 0; i < yesterdayDataList.size(); i++) {
             if (i == 0) {
@@ -3743,6 +3730,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Double jcyl = 0.0;
         Double yh = 0.0;
         Double jzl = 0.0;
+        Double zlc=0.0;
         List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
         List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
         if(listYlb.size()>0){
@@ -3753,6 +3741,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 jcyl=Arith.add(jcyl, y.getJzyl());
                 yh =Arith.add(yh ,y.getYh());
                 jzl =Arith.add(jzl, y.getJzl());
+                zlc =Arith.add(zlc, y.getZlc());
             }
         }else{
         	 type=1;
@@ -3762,6 +3751,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 jcyl=Arith.add(jcyl, d.getJzcd());
                 yh =Arith.add(yh ,d.getHd());
                 jzl =Arith.add(jzl, d.getCdl());
+                zlc =Arith.add(zlc, d.getZlc());
 			}
         }
@@ -3772,7 +3762,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ccyl", ccyl);
         map.put("jcyl", jcyl);
         map.put("type", type);
-        
+        map.put("zlc", zlc);
         map.put("xlName", s.getXlName());
         map.put("clZbh", s.getClZbh());
         map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
@@ -13,12 +13,16 @@ public interface CulateMileageService {
 	 List<Map<String,Object>> jobLjqk(List<ScheduleRealInfo> lists);
 	 double culateLjgl(List<ScheduleRealInfo> lists);
+	 double culateLjgl_(List<ScheduleRealInfo> lists,String item);
 	 int culateLjbc(List<ScheduleRealInfo> lists,String item);
 	 double culateJhgl(List<ScheduleRealInfo> lists);
+	 double culateJhgl_(List<ScheduleRealInfo> lists,String item);
+
 	 int culateJhbc(List<ScheduleRealInfo> lists,String item);
 	 double culateSjgl(List<ScheduleRealInfo> lists);
+	 double culateSjgl_(List<ScheduleRealInfo> lists,String item); 
 	 int culateSjbc(List<ScheduleRealInfo> lists,String item);
 	 double culateKsgl(List<ScheduleRealInfo> lists);
@@ -32,8 +36,9 @@ public interface CulateMileageService {
 	 Map<String, Object> culateDjg(List<ScheduleRealInfo> lists,String line);
+	 Map<String, Object> culateWdbcs(List<ScheduleRealInfo> lists);
-	 
+	 int culateDtfzbc(List<ScheduleRealInfo> lists,String type,String status,String item);
 	 //以下计算方法供新报表使用
 	 Map<String, Double> culateSjlcMap(List<ScheduleRealInfo> lists);//计划内营运and计划外营运
@@ -261,6 +261,108 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 	}
 	@Override
+	public double culateLjgl_(List<ScheduleRealInfo> lists,String item) {
+		// TODO Auto-generated method stub
+		double ljgl=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				if(!scheduleRealInfo.isDestroy()){
+					String time = "";
+					if (scheduleRealInfo.getFcsjActual() != null) {
+						time = scheduleRealInfo.getFcsjActual();
+					}
+					if (time.equals("")) {
+						if (scheduleRealInfo.getDfsj() != null) {
+							time = scheduleRealInfo.getDfsj();
+						}
+					}
+					if(!time.equals("")){
+						String[] fcsjStr = time.split(":");
+						long fcsj = Long.parseLong(fcsjStr[0]) * 60 + Long.parseLong(fcsjStr[1]);
+						if(scheduleRealInfo.isSflj()){
+							Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+							if(childTaskPlans.isEmpty()){
+								if(item.equals("zgf")){
+									if(fcsj>=zgf1 && fcsj<=zgf2){
+										ljgl=Arith.add(ljgl,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+									}
+								}
+								if(item.equals("wgf")){
+									if(fcsj>=wgf1 && fcsj<=wgf2){
+										ljgl=Arith.add(ljgl,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+									}
+								}
+							}else{
+								Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+				                while (it.hasNext()) {
+				                    ChildTaskPlan childTaskPlan = it.next();
+				                    if(childTaskPlan.getMileageType().equals("service")){
+				                    	 if (!childTaskPlan.isDestroy()) {
+				 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+				 	                    	if(item.equals("zgf")){
+												if(fcsj>=zgf1 && fcsj<=zgf2){
+						 	                    	ljgl=Arith.add(ljgl,jhgl);
+												}
+											}
+											if(item.equals("wgf")){
+												if(fcsj>=wgf1 && fcsj<=wgf2){
+						 	                    	ljgl=Arith.add(ljgl,jhgl);
+												}
+											}
+				 	                    } 
+				                    }
+				                }
+							}
+						}else{
+							Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+							if(childTaskPlans.isEmpty()){
+								double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+								double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+								double zjlc=Arith.sub(jhlc, jhlcOrig);
+								if(zjlc>0){
+									if(item.equals("zgf")){
+										if(fcsj>=zgf1 && fcsj<=zgf2){
+											ljgl=Arith.add(zjlc, ljgl);
+										}
+									}
+									if(item.equals("wgf")){
+										if(fcsj>=wgf1 && fcsj<=wgf2){
+											ljgl=Arith.add(zjlc, ljgl);
+										}
+									}
+								}
+							}else{
+								Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+				                while (it.hasNext()) {
+				                    ChildTaskPlan childTaskPlan = it.next();
+				                    if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
+				                    	 if (!childTaskPlan.isDestroy()) {
+				 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+				 	                    	if(item.equals("zgf")){
+												if(fcsj>=zgf1 && fcsj<=zgf2){
+						 	                    	ljgl=Arith.add(ljgl,jhgl);
+												}
+											}
+											if(item.equals("wgf")){
+												if(fcsj>=wgf1 && fcsj<=wgf2){
+						 	                    	ljgl=Arith.add(ljgl,jhgl);
+												}
+											}
+				 	                    } 
+				                    }
+				                }
+							}
+						}
+					}
+				}
+				
+			}
+		}
+		return ljgl;
+	}
+	
+	@Override
 	public double culateLjgl(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
 		double ljgl=0;
@@ -368,6 +470,32 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		}
 		return jhgl;
 	}
+	
+	@Override
+	public double culateJhgl_(List<ScheduleRealInfo> lists,String item) {
+		// TODO Auto-generated method stub
+		double jhgl=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				if(!scheduleRealInfo.isSflj()){
+					String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
+					long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+					if(item.equals("zgf")){
+						if(fcsj>=zgf1 && fcsj<=zgf2){
+							jhgl=Arith.add(jhgl,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+						}
+					}
+					if(item.equals("wgf")){
+						if(fcsj>=wgf1 && fcsj<=wgf2){
+							jhgl=Arith.add(jhgl,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+						}
+					}
+				}
+			}
+		}
+		return jhgl;
+	}
 	@Override
 	public int culateJhbc(List<ScheduleRealInfo> lists,String item) {
@@ -434,6 +562,85 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		}
 		return sjgl;
 	}
+	
+	@Override
+	public double culateSjgl_(List<ScheduleRealInfo> lists, String item) {
+		// TODO Auto-generated method stub
+		double sjgl = 0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo = lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if (!scheduleRealInfo.isSflj()) {
+					String time = "";
+					if (scheduleRealInfo.getFcsjActual() != null) {
+						time = scheduleRealInfo.getFcsjActual();
+					}
+					if (time.equals("")) {
+						if (scheduleRealInfo.getDfsj() != null) {
+							time = scheduleRealInfo.getDfsj();
+						}
+					}
+					if (!time.equals("")) {
+						String[] fcsjStr = time.split(":");
+						long fcsj = Long.parseLong(fcsjStr[0]) * 60 + Long.parseLong(fcsjStr[1]);
+						if (childTaskPlans.isEmpty()) {
+							if (!scheduleRealInfo.isDestroy()) {
+								double jhlcOrig = scheduleRealInfo.getJhlcOrig() == null ? 0
+										: scheduleRealInfo.getJhlcOrig();
+								double jhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+								
+								if(item.equals("zgf")){
+									if(fcsj>=zgf1 && fcsj<=zgf2){
+										if (jhlc - jhlcOrig > 0) {
+											sjgl = Arith.add(sjgl, jhlcOrig);
+										} else {
+											sjgl = Arith.add(sjgl, jhlc);
+										}
+									}
+								}
+								if(item.equals("wgf")){
+									if(fcsj>=wgf1 && fcsj<=wgf2){
+										if (jhlc - jhlcOrig > 0) {
+											sjgl = Arith.add(sjgl, jhlcOrig);
+										} else {
+											sjgl = Arith.add(sjgl, jhlc);
+										}
+									}
+								}
+								
+
+							}
+						} else {
+							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+							while (it.hasNext()) {
+								ChildTaskPlan childTaskPlan = it.next();
+								if (childTaskPlan.getMileageType().equals("service")
+										&& "正常".equals(childTaskPlan.getType1())) {
+									if (!childTaskPlan.isDestroy()) {
+										Float jhgl = childTaskPlan.getMileage() == null ? 0
+												: childTaskPlan.getMileage();
+										
+										if(item.equals("zgf")){
+											if(fcsj>=zgf1 && fcsj<=zgf2){
+												sjgl = Arith.add(sjgl, jhgl);
+											}
+										}
+										if(item.equals("wgf")){
+											if(fcsj>=wgf1 && fcsj<=wgf2){
+												sjgl = Arith.add(sjgl, jhgl);
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return sjgl;
+	}
 	@Override
 	public int culateSjbc(List<ScheduleRealInfo> lists,String item) {
@@ -460,7 +667,21 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					if(!time.equals("")){
 						String[] fcsjStr = time.split(":");
 						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
-						if(childTaskPlans.isEmpty()){
+						if(scheduleRealInfo.getStatus()!=-1){
+							if(item.equals("zgf")){
+								if(fcsj>=zgf1 && fcsj<=zgf2){
+									sjbc++;
+								}
+							}else if(item.equals("wgf")){
+								if(fcsj>=wgf1 && fcsj<=wgf2){
+									sjbc++;
+								}
+							}else{
+								sjbc++;
+							}
+							
+						}
+						/*if(childTaskPlans.isEmpty()){
 							if(scheduleRealInfo.getStatus()!=-1){
 								if(item.equals("zgf")){
 									if(fcsj>=zgf1 && fcsj<=zgf2){
@@ -515,7 +736,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 									sjbc++;
 								}
 							}
-						}
+						}*/
 					}
 				}
 			}
@@ -578,6 +799,108 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		return jcclc;
 	}
+	
+	@Override
+	public int culateDtfzbc(List<ScheduleRealInfo> lists,String type,String status,String item){
+		int bc=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo s=lists.get(i);
+			if(s.getBcType().equals(type)){
+				if(status.equals("jh")){
+					String fcsjs=s.getFcsj();
+					String[] fcsjStr = fcsjs.split(":");
+					long fcsj = Long.parseLong(fcsjStr[0]) * 60 + Long.parseLong(fcsjStr[1]);
+					if(item.equals("zgf")){
+						if(fcsj>zgf1&&fcsj<zgf2)
+							bc++;
+						
+					}else if(item.equals("wgf")){
+						if(fcsj>wgf1&&fcsj<wgf2)
+							bc++;
+					}else{
+						bc++;
+					}
+				}else{
+					if(s.getFcsjActual()!=null){
+						if(!s.isDestroy()){
+							String fcsjs=s.getFcsjActual();
+							String[] fcsjStr = fcsjs.split(":");
+							long fcsj = Long.parseLong(fcsjStr[0]) * 60 + Long.parseLong(fcsjStr[1]);
+							if(item.equals("zgf")){
+								if(fcsj>zgf1&&fcsj<zgf2)
+									bc++;
+							}else if(item.equals("wgf")){
+								if(fcsj>wgf1&&fcsj<wgf2)
+									bc++;
+							}else{
+								bc++;
+							}
+						}
+					}
+					
+				}
+			}
+		}	
+		
+		return bc;
+	}
+	@Override
+	public Map<String, Object> culateWdbcs(List<ScheduleRealInfo> lists){
+		int sxk=0,sxkzgf=0,sxkwgf=0,sxm=0,sxmzgf=0,sxmwgf=0,xxk=0,
+				xxkzgf=0,xxkwgf=0,xxm=0,xxmzgf=0,xxmwgf=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo s=lists.get(i);
+			if(s.getFcsjActual()!=null){
+				String xlDir=s.getXlDir();
+				String fcsjs=s.getFcsj();
+				String[] fcsjStr = fcsjs.split(":");
+				long fcsj = Long.parseLong(fcsjStr[0]) * 60 + Long.parseLong(fcsjStr[1]);
+				String fcsjActuals=s.getFcsjActual();
+				String[] fcsjActualsStr = fcsjActuals.split(":");
+				long fcsjActual = Long.parseLong(fcsjActualsStr[0]) * 60 + Long.parseLong(fcsjActualsStr[1]);
+				
+				if("0".equals(xlDir)){
+					
+					if(fcsj-fcsjActual>1){
+						sxk++;
+						if(fcsj>zgf1&&fcsj<zgf2)
+							sxkzgf++;
+						if(fcsj>wgf1&&fcsj<wgf2)
+							sxkwgf++;
+					}
+					if(fcsjActual-fcsj>3){
+						sxm++;
+						if(fcsj>zgf1&&fcsj<zgf2)
+							sxmzgf++;
+						if(fcsj>wgf1&&fcsj<wgf2)
+							sxmwgf++;
+					}
+				}else{
+					if(fcsj-fcsjActual>1){
+						xxk++;
+						if(fcsj>zgf1&&fcsj<zgf2)
+							xxkzgf++;
+						if(fcsj>wgf1&&fcsj<wgf2)
+							xxkwgf++;
+					}
+					if(fcsjActual-fcsj>3){
+						xxm++;
+						if(fcsj>zgf1&&fcsj<zgf2)
+							xxmzgf++;
+						if(fcsj>wgf1&&fcsj<wgf2)
+							xxmwgf++;
+					}
+				}
+			}
+		}
+		Map<String, Object> m=new HashMap<String,Object>();
+		m.put("sxk", sxk);m.put("sxkzgf",sxkzgf );m.put("sxkwgf", sxkwgf);
+		m.put("sxm",sxm );m.put("sxmzgf", sxmzgf);m.put("sxmwgf", sxmwgf);
+		m.put("xxk", xxk);m.put("xxkzgf", xxkzgf);m.put("xxkwgf", xxkwgf);
+		m.put("xxm", xxm);m.put("xxmzgf", xxmzgf);m.put("xxmwgf", xxmwgf);
+		return m;
+	}
+	
 	@Override
 	public double culateJhJccgl(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
@@ -1909,16 +1909,43 @@ public class ReportServiceImpl implements ReportService{
 		}
 		List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
-		Map<String, Object> newMap=new HashMap<String,Object>();
+		Map<String, Object> newMap=culateService.culateWdbcs(sList);
 		newMap.put("jhbc", culateService.culateJhbc(sList,""));
+		newMap.put("jhbczgf", culateService.culateJhbc(sList,"zgf"));
+		newMap.put("jhbcwgf", culateService.culateJhbc(sList,"wgf"));
 		newMap.put("jhgl", culateService.culateJhgl(sList));
+		newMap.put("jhglzgf", culateService.culateJhgl_(sList,"zgf"));
+		newMap.put("jhglwgf", culateService.culateJhgl_(sList,"wgf"));
+
 		newMap.put("sjbc", culateService.culateSjbc(sList,""));
+		newMap.put("sjbczgf", culateService.culateSjbc(sList,"zgf"));
+		newMap.put("sjbcwgf", culateService.culateSjbc(sList,"wgf"));
 		newMap.put("sjgl", culateService.culateSjgl(sList));
+		newMap.put("sjglzgf", culateService.culateSjgl_(sList,"zgf"));
+		newMap.put("sjglwgf", culateService.culateSjgl_(sList,"wgf"));
+		
 		newMap.put("lbgl", culateService.culateLbgl(sList));
 		newMap.put("lbbc", culateService.culateLbbc(sList));
 		newMap.put("ljgl", culateService.culateLjgl(sList));
+		newMap.put("ljglzgf", culateService.culateLjgl_(sList,"zgf"));
+		newMap.put("ljglwgf", culateService.culateLjgl_(sList,"wgf"));
+
 		newMap.put("ljbc", culateService.culateLjbc(sList,""));
 		newMap.put("ksgl", culateService.culateKsgl(sList));
+		
+		newMap.put("jhfbbc",culateService.culateDtfzbc(sList, "venting", "jh", ""));
+		newMap.put("jhfbbczgf",culateService.culateDtfzbc(sList, "venting", "jh", "zgf"));
+		newMap.put("jhfbbcwgf",culateService.culateDtfzbc(sList, "venting", "jh", "wgf"));
+		newMap.put("sjfbbc",culateService.culateDtfzbc(sList, "venting", "sj", ""));
+		newMap.put("sjfbbczgf",culateService.culateDtfzbc(sList, "venting", "sj", "zgf"));
+		newMap.put("sjfbbcwgf",culateService.culateDtfzbc(sList, "venting", "sj", "wgf"));
+		
+		newMap.put("jhdtbc",culateService.culateDtfzbc(sList, "major", "jh", ""));
+		newMap.put("jhdtbczgf",culateService.culateDtfzbc(sList, "major", "jh", "zgf"));
+		newMap.put("jhdtbcwgf",culateService.culateDtfzbc(sList, "major", "jh", "wgf"));
+		newMap.put("sjdtbc",culateService.culateDtfzbc(sList, "major", "sj", ""));
+		newMap.put("sjdtbczgf",culateService.culateDtfzbc(sList, "major", "sj", "zgf"));
+		newMap.put("sjdtbcwgf",culateService.culateDtfzbc(sList, "major", "sj", "wgf"));
 		return newMap;
 	}
 	@Override
 <!DOCTYPE html>
 <html lang="zh">
 <head>
-    <meta name="renderer" content="webkit" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta charset="UTF-8">
-    <title>调度系统</title>
-
-    <meta http-equiv="Pragma" content="no-cache">
-    <meta http-equiv="Cache-control" content="no-cache">
-    <meta http-equiv="Cache" content="no-cache">
-
-    <!-- Font Awesome 图标字体 -->
-    <link
-            href="/metronic_v4.5.4/plugins/font-awesome/css/font-awesome.min.css"
-            rel="stylesheet" type="text/css" />
-    <!-- Bootstrap style -->
-    <link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css"
-          rel="stylesheet" type="text/css" />
-    <!-- jsTree 数插件 -->
-    <link
-            href="/metronic_v4.5.4/plugins/jstree/dist/themes/default/style.min.css"
-            rel="stylesheet" type="text/css" />
-    <!-- MULTI-select 多选下拉框美化 -->
-    <link
-            href="/metronic_v4.5.4/plugins/jquery-multi-select/css/multi-select.css"
-            rel="stylesheet" type="text/css" />
-
-    <!-- editable -->
-    <link
-            href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css"
-            rel="stylesheet" type="text/css" />
-    <!-- METRONIC style -->
-    <link href="/metronic_v4.5.4/layout4/css/themes/light.min.css"
-          rel="stylesheet" type="text/css" id="style_color" />
-    <link href="/metronic_v4.5.4/css/components.css" rel="stylesheet"
-          type="text/css" />
-    <link href="/metronic_v4.5.4/css/plugins.css" rel="stylesheet"
-          type="text/css" />
-    <link href="/metronic_v4.5.4/layout4/css/layout.min.css"
-          rel="stylesheet" type="text/css" />
-    <link href="/metronic_v4.5.4/layout4/css/custom.min.css"
-          rel="stylesheet" type="text/css" />
-    <!-- select2 下拉框插件 -->
-    <link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
-          rel="stylesheet" type="text/css" />
-    <link
-            href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css"
-            rel="stylesheet" type="text/css" />
-    <!-- layer 弹层 插件 -->
-    <link href="/assets/plugins/layer-v2.4/layer/skin/layer.css"
-          rel="stylesheet" type="text/css" />
-    <!-- fileinput 上传 插件 -->
-    <link href="/assets/plugins/fileinput/css/fileinput.min.css"
-          rel="stylesheet" type="text/css" />
-    <!-- iCheck 单选框和复选框 -->
-    <link href="/metronic_v4.5.4/plugins/icheck/skins/all.css"
-          rel="stylesheet" type="text/css" />
-    <!-- 日期控件 -->
-    <link
-            href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
-            rel="stylesheet" type="text/css" />
-    <!-- table 表格控件 -->
-    <link rel="stylesheet"
-          href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"
-          type="text/css" />
-    <link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
-    <!-- handsontable样式 -->
-    <link rel="stylesheet"
-          href="/assets/bower_components/handsontable/dist/handsontable.full.css" />
-    <!-- sweetalert样式 -->
-    <link rel="stylesheet"
-          href="/assets/bower_components/sweetalert/dist/sweetalert.css" />
-    <!-- schedule计划调度AngularJS模块主css -->
-    <link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css"
-          type="text/css" />
-
-    <!-- CSS动画 -->
-    <link
-            href="/metronic_v4.5.4/plugins/tipso/css/animate.css"
-            rel="stylesheet" type="text/css" />
-
-    <!-- 提示工具样式 -->
-    <link
-            href="/metronic_v4.5.4/plugins/tipso/css/tipso.css"
-            rel="stylesheet" type="text/css" />
-
-    <style type="text/css">
-        .searchForm {
-
-        }
-
-        .searchForm .form-group .control-label {
-            padding-right: 0px;
-            text-align: right;
-            margin-top: 7px;
-        }
-
-        .searchForm .form-group>div {
-            padding-left: 10px;
-            padding-right: 0px;
-        }
-
-        .searchForm .row>div {
-            padding-left: 0px;
-            padding-right: 0px;
-            padding: 5px 0 5px 0;
-            width: 270px;
-            display: inline-block;
-        }
-
-        .searchForm .form-actions {
-
-        }
-
-        tr.row-active td {
-            border-bottom: 1px solid blue !important;
-            color: blue;
-        }
-
-        .ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
-        {
-            font-size: 14px;
-        }
-
-        .ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
-        {
-            padding: 6px 26px;
-        }
-
-        .ms-container .ms-list {
-            height: 306px;
-        }
-
-        .ms-container .ms-selectable,.ms-container .ms-selection {
-            width: 47%;
-        }
-
-        .ms-container {
-            width: 470px;
-            margin: auto;
-        }
-
-        .multi-custom-header-left {
-            text-align: center;
-            padding: 7px;
-            color: #3B3F51;
-        }
-
-        .multi-custom-header-right {
-            text-align: center;
-            padding: 7px;
-            font-weight: bold;
-            color: #36C6D3;
-        }
-
-        .mt-element-list .list-simple.mt-list-container ul>.mt-list-item>.list-item-content
-        {
-            padding: 0 55px 0 0px;
-        }
-
-        .mt-element-list .list-simple.mt-list-container ul>.mt-list-item {
-            padding: 3.3px 0;
-        }
-
-        #route-container {
-            display: none;
-        }
-
-        .page-content.active {
-            display: block !important;
-        }
-
-        .page-header.navbar .page-logo .logo-default {
-            margin: 0;
-        }
-
-        .page-header.navbar .top-menu .navbar-nav>li.dropdown.open .dropdown-toggle
-        {
-            background-color: #284a99;
-        }
-
-        .page-header.navbar .page-logo {
-            padding-right: 10px;
-        }
-
-        .page-logo .logo-default.logo-default-text {
-            font-weight: 600;
-            color: white !important;
-            margin-top: 19px !important;
-            font-size: 24px;
-            text-decoration: none;
-        }
-
-        .page-logo .logo-default.logo-default-text:HOVER {
-            color: #dedede !important;
-        }
-    </style>
-
-    <!-- ocLazyLoading载入文件的位置 -->
-    <link id="ng_load_plugins_before" />
+<meta name="renderer" content="webkit" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+<meta charset="UTF-8">
+<title>调度系统</title>
+
+<meta http-equiv="Pragma" content="no-cache">
+<meta http-equiv="Cache-control" content="no-cache">
+<meta http-equiv="Cache" content="no-cache">
+
+<!-- Font Awesome 图标字体 -->
+<link
+	href="/metronic_v4.5.4/plugins/font-awesome/css/font-awesome.min.css"
+	rel="stylesheet" type="text/css" />
+<!-- Bootstrap style -->
+<link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css"
+	rel="stylesheet" type="text/css" />
+<!-- jsTree 数插件 -->
+<link
+	href="/metronic_v4.5.4/plugins/jstree/dist/themes/default/style.min.css"
+	rel="stylesheet" type="text/css" />
+<!-- MULTI-select 多选下拉框美化 -->
+<link
+	href="/metronic_v4.5.4/plugins/jquery-multi-select/css/multi-select.css"
+	rel="stylesheet" type="text/css" />
+
+<!-- editable -->
+<link
+	href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css"
+	rel="stylesheet" type="text/css" />
+<!-- METRONIC style -->
+<link href="/metronic_v4.5.4/layout4/css/themes/light.min.css"
+	rel="stylesheet" type="text/css" id="style_color" />
+<link href="/metronic_v4.5.4/css/components.css" rel="stylesheet"
+	type="text/css" />
+<link href="/metronic_v4.5.4/css/plugins.css" rel="stylesheet"
+	type="text/css" />
+<link href="/metronic_v4.5.4/layout4/css/layout.min.css"
+	rel="stylesheet" type="text/css" />
+<link href="/metronic_v4.5.4/layout4/css/custom.min.css"
+	rel="stylesheet" type="text/css" />
+<!-- select2 下拉框插件 -->
+<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
+	rel="stylesheet" type="text/css" />
+<link
+	href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css"
+	rel="stylesheet" type="text/css" />
+<!-- layer 弹层 插件 -->
+<link href="/assets/plugins/layer-v2.4/layer/skin/layer.css"
+	rel="stylesheet" type="text/css" />
+<!-- fileinput 上传 插件 -->
+<link href="/assets/plugins/fileinput/css/fileinput.min.css"
+	rel="stylesheet" type="text/css" />
+<!-- iCheck 单选框和复选框 -->
+<link href="/metronic_v4.5.4/plugins/icheck/skins/all.css"
+	rel="stylesheet" type="text/css" />
+<!-- 日期控件 -->
+<link
+	href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
+	rel="stylesheet" type="text/css" />
+<!-- table 表格控件 -->
+<link rel="stylesheet"
+	href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"
+	type="text/css" />
+<link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
+<!-- handsontable样式 -->
+<link rel="stylesheet"
+	href="/assets/bower_components/handsontable/dist/handsontable.full.css" />
+<!-- sweetalert样式 -->
+<link rel="stylesheet"
+      href="/assets/bower_components/sweetalert/dist/sweetalert.css" />
+<!-- schedule计划调度AngularJS模块主css -->
+<link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css"
+	type="text/css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/>
+
+<!-- CSS动画 -->
+<link
+	href="/metronic_v4.5.4/plugins/tipso/css/animate.css"
+	rel="stylesheet" type="text/css" />
+	
+<!-- 提示工具样式 -->
+<link
+	href="/metronic_v4.5.4/plugins/tipso/css/tipso.css"
+	rel="stylesheet" type="text/css" />
+
+<style type="text/css">
+.searchForm {
+	
+}
+
+.searchForm .form-group .control-label {
+	padding-right: 0px;
+	text-align: right;
+	margin-top: 7px;
+}
+
+.searchForm .form-group>div {
+	padding-left: 10px;
+	padding-right: 0px;
+}
+
+.searchForm .row>div {
+	padding-left: 0px;
+	padding-right: 0px;
+	padding: 5px 0 5px 0;
+	width: 270px;
+	display: inline-block;
+}
+
+.searchForm .form-actions {
+	
+}
+
+tr.row-active td {
+	border-bottom: 1px solid blue !important;
+	color: blue;
+}
+
+.ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
+	{
+	font-size: 14px;
+}
+
+.ms-container .ms-selectable li.ms-elem-selectable,.ms-container .ms-selection li.ms-elem-selection
+	{
+	padding: 6px 26px;
+}
+
+.ms-container .ms-list {
+	height: 306px;
+}
+
+.ms-container .ms-selectable,.ms-container .ms-selection {
+	width: 47%;
+}
+
+.ms-container {
+	width: 470px;
+	margin: auto;
+}
+
+.multi-custom-header-left {
+	text-align: center;
+	padding: 7px;
+	color: #3B3F51;
+}
+
+.multi-custom-header-right {
+	text-align: center;
+	padding: 7px;
+	font-weight: bold;
+	color: #36C6D3;
+}
+
+.mt-element-list .list-simple.mt-list-container ul>.mt-list-item>.list-item-content
+	{
+	padding: 0 55px 0 0px;
+}
+
+.mt-element-list .list-simple.mt-list-container ul>.mt-list-item {
+	padding: 3.3px 0;
+}
+
+#route-container {
+	display: none;
+}
+
+.page-content.active {
+	display: block !important;
+}
+
+.page-header.navbar .page-logo .logo-default {
+	margin: 0;
+}
+
+.page-header.navbar .top-menu .navbar-nav>li.dropdown.open .dropdown-toggle
+	{
+	background-color: #284a99;
+}
+
+.page-header.navbar .page-logo {
+	padding-right: 10px;
+}
+
+.page-logo .logo-default.logo-default-text {
+	font-weight: 600;
+	color: white !important;
+	margin-top: 19px !important;
+	font-size: 24px;
+	text-decoration: none;
+}
+
+.page-logo .logo-default.logo-default-text:HOVER {
+	color: #dedede !important;
+}
+
+	body,.page-content-wrapper,#pjax-container{
+		height: 100%;
+	}
+	html{
+		height: 90%;
+	}
+	.page-container{
+		height: 100%;
+	}
+</style>
+
+<!-- ocLazyLoading载入文件的位置 -->
+<link id="ng_load_plugins_before" />
 </head>
 <body
-        class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo page-sidebar-fixed">
-<div class="page-header navbar navbar-fixed-top"
-     style="background: linear-gradient(to bottom, #124e78, #125688);">
-    <div class="page-header-inner ">
-        <!-- LOGO -->
-        <div class="page-logo">
-            <a href="index.html" class="logo-default logo-default-text">
-                闵行公交调度系统 </a>
-            <div class="menu-toggler sidebar-toggler"></div>
-        </div>
-        <!-- END LOGO -->
-        <a href="javascript:;" class="menu-toggler responsive-toggler"
-           data-toggle="collapse" data-target=".navbar-collapse"> </a>
-        <div class="page-top">
-            <div class="top-menu">
-                <ul class="nav navbar-nav pull-right">
-                    <!-- 信息通知区 -->
-                    <li
-                            class="dropdown dropdown-extended dropdown-notification dropdown-dark"
-                            id="header_notification_bar"><a href="javascript:;"
-                                                            class="dropdown-toggle" data-toggle="dropdown"
-                                                            data-hover="dropdown" data-close-others="true"> <i
-                            class="fa fa-bell"></i> <span class="badge badge-success">
+	class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo page-sidebar-fixed">
+	<div class="page-header navbar navbar-fixed-top"
+		style="background: linear-gradient(to bottom, #124e78, #125688);">
+		<div class="page-header-inner ">
+			<!-- LOGO -->
+			<div class="page-logo">
+				<a href="index.html" class="logo-default logo-default-text">
+					闵行公交调度系统 </a>
+				<div class="menu-toggler sidebar-toggler"></div>
+			</div>
+			<!-- END LOGO -->
+			<a href="javascript:;" class="menu-toggler responsive-toggler"
+				data-toggle="collapse" data-target=".navbar-collapse"> </a>
+			<div class="page-top">
+				<div class="top-menu">
+					<ul class="nav navbar-nav pull-right">
+						<!-- 信息通知区 -->
+						<li
+							class="dropdown dropdown-extended dropdown-notification dropdown-dark"
+							id="header_notification_bar"><a href="javascript:;"
+							class="dropdown-toggle" data-toggle="dropdown"
+							data-hover="dropdown" data-close-others="true"> <i
+								class="fa fa-bell"></i> <span class="badge badge-success">
 									0 </span>
-                    </a>
-                        <ul class="dropdown-menu" style="max-width: 345px; width: 345px;">
-                            <li class="external">
-                                <h3>
-                                    今日 <span class="bold">0 条</span> 通知
-                                </h3> <a href="javascript:;">查看全部</a>
-                            </li>
-                            <li>
-                                <ul class="dropdown-menu-list scroller" style="height: 250px;"
-                                    data-handle-color="#637283">
-                                </ul>
-                            </li>
-                        </ul></li>
-                    <li class="dropdown dropdown-user dropdown-dark"><a
-                            href="javascript:;" class="dropdown-toggle"
-                            data-toggle="dropdown" data-hover="dropdown"
-                            data-close-others="true"> <span id="indexTopUName"
-                                                            class="username username-hide-on-mobile"
-                                                            style="vertical-align: middle;"> <i class="fa fa-user"></i></span>
-                    </a>
-                        <ul class="dropdown-menu dropdown-menu-default">
-                            <li><a href="javascript:;"> <i class="fa fa-user"></i>
-                                我的信息
-                            </a></li>
-                            <li><a href="javascript:;" id="changePWD"> <i
-                                    class="fa fa-unlock-alt"></i> 修改密码
-                            </a></li>
-                            <li class="divider"></li>
-                            <li><a href="javascript:;"> <i class="fa fa-lock"></i>
-                                锁屏
-                            </a></li>
-                            <li><a href="/logout"> <i class="fa fa-key"></i> 注销登陆
-                            </a></li>
-                        </ul></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-<div class="page-container">
-    <div class="page-sidebar-wrapper">
-        <div class="page-sidebar navbar-collapse collapse">
-            <ul class="page-sidebar-menu page-sidebar-menu-fixed"
-                data-keep-expanded="false" data-auto-scroll="true"
-                data-slide-speed="200" id="leftMenuSidebar">
-            </ul>
-        </div>
-    </div>
-    <div class="page-content-wrapper">
-        <div id="pjax-container" class="page-content"></div>
-
-        <div id="route-container">
-            <div ng-app="ScheduleApp">
-                <div ng-controller="ScheduleAppController">
-
-                    <!-- loading widget -->
-                    <div id="loadingWidget" class="flyover mask" loading-widget>
-                        <div class="alert alert-info">
-                            <strong>载入中......</strong>
-                        </div>
-                    </div>
-
-                    <div ui-view class="uv"></div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script id="menu_list_temp" type="text/html">
+						</a>
+							<ul class="dropdown-menu" style="max-width: 345px; width: 345px;">
+								<li class="external">
+									<h3>
+										今日 <span class="bold">0 条</span> 通知
+									</h3> <a href="javascript:;">查看全部</a>
+								</li>
+								<li>
+									<ul class="dropdown-menu-list scroller" style="height: 250px;"
+										data-handle-color="#637283">
+									</ul>
+								</li>
+							</ul></li>
+						<li class="dropdown dropdown-user dropdown-dark"><a
+							href="javascript:;" class="dropdown-toggle"
+							data-toggle="dropdown" data-hover="dropdown"
+							data-close-others="true"> <span id="indexTopUName"
+								class="username username-hide-on-mobile"
+								style="vertical-align: middle;"> <i class="fa fa-user"></i></span>
+						</a>
+							<ul class="dropdown-menu dropdown-menu-default">
+								<li><a href="javascript:;"> <i class="fa fa-user"></i>
+										我的信息
+								</a></li>
+								<li><a href="javascript:;" id="changePWD"> <i
+										class="fa fa-unlock-alt"></i> 修改密码
+								</a></li>
+								<li class="divider"></li>
+								<li><a href="javascript:;"> <i class="fa fa-lock"></i>
+										锁屏
+								</a></li>
+								<li><a href="/logout"> <i class="fa fa-key"></i> 注销登陆
+								</a></li>
+							</ul></li>
+					</ul>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="page-container">
+		<div class="page-sidebar-wrapper">
+			<div class="page-sidebar navbar-collapse collapse">
+				<ul class="page-sidebar-menu page-sidebar-menu-fixed"
+					data-keep-expanded="false" data-auto-scroll="true"
+					data-slide-speed="200" id="leftMenuSidebar">
+				</ul>
+			</div>
+		</div>
+		<div class="page-content-wrapper">
+			<div id="pjax-container" class="page-content"></div>
+
+			<div id="route-container">
+				<div ng-app="ScheduleApp">
+					<div ng-controller="ScheduleAppController">
+
+						<!-- loading widget -->
+						<div id="loadingWidget" class="flyover mask" loading-widget>
+							<div class="alert alert-info">
+								<strong>载入中......</strong>
+							</div>
+						</div>
+
+						<div ui-view class="uv"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<script id="menu_list_temp" type="text/html">
     {{each list as group i}}
     <li class="heading">
         <h3 class="uppercase">{{group.name}}</h3>
@@ -327,83 +338,83 @@
     {{/each}}
 </script>
-<script>
+	<script>
     delete window.require;
     delete window.exports;
     delete window.module;
 </script>
-<!-- jQuery -->
-<script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
-<!-- bootstrap -->
-<script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js"
-        data-exclude=1></script>
-<script src="/pages/forms/statement/js/jquery.autocompleter.js"></script>
-<script src="/pages/forms/statement/js/jquery.PrintArea.js"></script>
-<!-- MTRONIC JS -->
-<script src="/metronic_v4.5.4/scripts/app.min.js" data-exclude=1></script>
-<script src="/metronic_v4.5.4/layout4/scripts/layout.min.js"
-        data-exclude=1></script>
-<!-- 虚拟滚动条 -->
-<script
-        src="/metronic_v4.5.4/plugins/jquery-slimscroll/jquery.slimscroll.min.js"></script>
-<!-- jsTree 树插件 -->
-<script src="/metronic_v4.5.4/plugins/jstree/dist/jstree.min.js"></script>
-<!-- bootstrap-hover-dropDown -->
-<script
-        src="/metronic_v4.5.4/plugins/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js"></script>
-<!-- jquery.validate 表单验证 -->
-<script
-        src="/metronic_v4.5.4/plugins/jquery-validation/js/jquery.validate.min.js"></script>
-<script
-        src="/metronic_v4.5.4/plugins/jquery-validation/js/localization/messages_zh.js"></script>
-<!-- 向导式插件 -->
-<script
-        src="/metronic_v4.5.4//plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js"></script>
-<!-- iCheck 单选框和复选框  -->
-<script src="/metronic_v4.5.4/plugins/icheck/icheck.min.js"></script>
-<!-- select2 下拉框 -->
-<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
-<!-- MULTI SELECT 多选下拉框 -->
-<script
-        src="/metronic_v4.5.4/plugins/jquery-multi-select/js/jquery.multi-select.js"></script>
-<!-- editable.js -->
-<script
-        src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js"></script>
-<!-- PJAX -->
-<script src="/assets/plugins/jquery.pjax.js"></script>
-<!-- layer 弹层 -->
-<script src="/assets/plugins/layer-v2.4/layer/layer.js" data-exclude=1></script>
-<!-- fileinput 上传 -->
-<script src="/assets/plugins/fileinput/canvas-to-blob.min.js"></script>
-<script src="/assets/plugins/fileinput/purify.min.js"></script>
-<script src="/assets/plugins/fileinput/sortable.min.js"></script>
-<script src="/assets/plugins/fileinput/fileinput.min.js"></script>
-<script src="/assets/plugins/fileinput/fileinput_locale_zh.js"></script>
-<!-- jquery.purl URL解析 -->
-<script src="/assets/plugins/purl.js"></script>
-<!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
-<!-- jquery.pageinator 分页 -->
-<script src="/assets/plugins/jqPaginator.min.js"></script>
-<!-- moment.js 日期处理类库 -->
-<script src="/assets/plugins/moment-with-locales.js"></script>
-
-<script src="/assets/plugins/pinyin.js"></script>
-<!-- 日期控件 -->
-<script
-        src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js"></script>
-<!-- 表格控件 -->
-<script src="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js"></script>
-<!-- 统计图控件 -->
-<!--<script src="/assets/global/getEchart.js"></script>
-<script src="/assets/global/echarts.js"></script> -->
-<script src="/assets/js/common.js"></script>
-<script src="/assets/js/dictionary.js"></script>
-<!-- tipso JS -->
-<script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
-<script data-exclude=1>
+	<!-- jQuery -->
+	<script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
+	<!-- bootstrap -->
+	<script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js"
+		data-exclude=1></script>
+	<script src="/pages/forms/statement/js/jquery.autocompleter.js"></script>
+	<script src="/pages/forms/statement/js/jquery.PrintArea.js"></script>
+	<!-- MTRONIC JS -->
+	<script src="/metronic_v4.5.4/scripts/app.min.js" data-exclude=1></script>
+	<script src="/metronic_v4.5.4/layout4/scripts/layout.min.js"
+		data-exclude=1></script>
+	<!-- 虚拟滚动条 -->
+	<script
+		src="/metronic_v4.5.4/plugins/jquery-slimscroll/jquery.slimscroll.min.js"></script>
+	<!-- jsTree 树插件 -->
+	<script src="/metronic_v4.5.4/plugins/jstree/dist/jstree.min.js"></script>
+	<!-- bootstrap-hover-dropDown -->
+	<script
+		src="/metronic_v4.5.4/plugins/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js"></script>
+	<!-- jquery.validate 表单验证 -->
+	<script
+		src="/metronic_v4.5.4/plugins/jquery-validation/js/jquery.validate.min.js"></script>
+	<script
+		src="/metronic_v4.5.4/plugins/jquery-validation/js/localization/messages_zh.js"></script>
+	<!-- 向导式插件 -->
+	<script
+		src="/metronic_v4.5.4//plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js"></script>
+	<!-- iCheck 单选框和复选框  -->
+	<script src="/metronic_v4.5.4/plugins/icheck/icheck.min.js"></script>
+	<!-- select2 下拉框 -->
+	<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
+	<!-- MULTI SELECT 多选下拉框 -->
+	<script
+		src="/metronic_v4.5.4/plugins/jquery-multi-select/js/jquery.multi-select.js"></script>
+	<!-- editable.js -->
+	<script
+		src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js"></script>
+	<!-- PJAX -->
+	<script src="/assets/plugins/jquery.pjax.js"></script>
+	<!-- layer 弹层 -->
+	<script src="/assets/plugins/layer-v2.4/layer/layer.js" data-exclude=1></script>
+	<!-- fileinput 上传 -->
+	<script src="/assets/plugins/fileinput/canvas-to-blob.min.js"></script>
+	<script src="/assets/plugins/fileinput/purify.min.js"></script>
+	<script src="/assets/plugins/fileinput/sortable.min.js"></script>
+	<script src="/assets/plugins/fileinput/fileinput.min.js"></script>
+	<script src="/assets/plugins/fileinput/fileinput_locale_zh.js"></script>
+	<!-- jquery.purl URL解析 -->
+	<script src="/assets/plugins/purl.js"></script>
+	<!-- jquery.serializejson JSON序列化插件 -->
+	<script src="/assets/plugins/jquery.serializejson.js"></script>
+	<!-- art-template 模版引擎 -->
+	<script src="/assets/plugins/template.js"></script>
+	<!-- jquery.pageinator 分页 -->
+	<script src="/assets/plugins/jqPaginator.min.js"></script>
+	<!-- moment.js 日期处理类库 -->
+	<script src="/assets/plugins/moment-with-locales.js"></script>
+
+	<script src="/assets/plugins/pinyin.js"></script>
+	<!-- 日期控件 -->
+	<script
+		src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js"></script>
+	<!-- 表格控件 -->
+	<script src="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js"></script>
+	<!-- 统计图控件 -->
+	<!--<script src="/assets/global/getEchart.js"></script>
+	<script src="/assets/global/echarts.js"></script> -->
+	<script src="/assets/js/common.js"></script>
+	<script src="/assets/js/dictionary.js"></script>
+	<!-- tipso JS -->
+	<script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
+	<script data-exclude=1>
     //初始打开的片段地址
     var initFragment = "^_^initFragment^_^";
     //静态文件目录
@@ -545,79 +556,82 @@
     }
 </script>
-<!-- d3 -->
-<script src="/assets/js/d3.min.js" data-exclude=1></script>
-<!-- webSocket JS -->
-<script src="/assets/js/sockjs.min.js"></script>
-
-<!-- TODO：angularJS相关库 -->
-
-<!-- angularJS相关库 -->
-<!-- 这个是基于angularjs 1.4.10修改的版本，主要是修改了history控制部分，用于兼容route和pjax的同时操作history的冲突 -->
-<script src="/assets/js/angular.js" data-autocephaly=1></script>
-<script src="/assets/bower_components/angular-i18n/angular-locale_zh-cn.js" data-autocephaly=1></script>
-<script
-        src="/assets/bower_components/angular-resource/angular-resource.min.js"
-        data-exclude=1></script>
-<script
-        src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js"
-        data-exclude=1></script>
-<script
+	<!-- d3 -->
+	<script src="/assets/js/d3.min.js" data-exclude=1></script>
+	<!-- webSocket JS -->
+	<script src="/assets/js/sockjs.min.js"></script>
+	
+	<!-- TODO：angularJS相关库 -->
+
+	<!-- angularJS相关库 -->
+	<!-- 这个是基于angularjs 1.4.10修改的版本，主要是修改了history控制部分，用于兼容route和pjax的同时操作history的冲突 -->
+	<script src="/assets/js/angular.js" data-autocephaly=1></script>
+    <script src="/assets/bower_components/angular-i18n/angular-locale_zh-cn.js" data-autocephaly=1></script>
+	<script
+		src="/assets/bower_components/angular-resource/angular-resource.min.js"
+		data-exclude=1></script>
+	<script
+		src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js"
+		data-exclude=1></script>
+    <script
         src="/assets/bower_components/angular-animate/angular-animate.min.js"
         data-exclude=1></script>
-<script
-        src="/assets/bower_components/angular-touch/angular-touch.min.js"
-        data-exclude=1></script>
-<script
-        src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js"
-        data-exclude=1></script>
-<script
-        src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js"
-        data-exclude=1></script>
-<script
-        src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"
-        data-exclude=1></script>
-<!-- handsontable相关js -->
-<script
-        src="/assets/bower_components/handsontable/dist/handsontable.full.js"></script>
-<script
-        src="/assets/bower_components/ngHandsontable/dist/ngHandsontable.js"></script>
-<!-- sweetalert相关js -->
-<script src="/assets/bower_components/sweetalert/dist/sweetalert.min.js"></script>
-<script src="/assets/bower_components/ng-sweet-alert/ng-sweet-alert.js"></script>
-
-<!-- schedule计划调度AngularJS模块主JS -->
-<script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script>
-<script
-        src="/pages/scheduleApp/module/common/prj-common-globalservice.js"
-        data-exclude=1></script>
-<script src="/pages/scheduleApp/module/common/prj-common-filter.js"
-        data-exclude=1></script>
-<script src="/pages/scheduleApp/module/common/prj-common-directive.js"
-        data-exclude=1></script>
-<script
-        src="/pages/scheduleApp/module/common/prj-common-ui-route-state.js"
-        data-exclude=1></script>
-
-<!-- 地图相关 -->
-<!-- 百度 -->
-<script
-        src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
-        data-exclude=1></script>
-<script
-        src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
-        data-exclude=1></script>
-<script type="text/javascript"
-        src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
-        data-exclude=1></script>
-<script type="text/javascript"
-        src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
-        data-exclude=1></script>
-<script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
-<script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
-<!-- 高德  -->
-<script
-        src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
-        data-exclude=1></script>
+	<script
+		src="/assets/bower_components/angular-touch/angular-touch.min.js"
+		data-exclude=1></script>
+	<script
+		src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js"
+		data-exclude=1></script>
+	<script
+		src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js"
+		data-exclude=1></script>
+	<script
+		src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"
+		data-exclude=1></script>
+	<!-- handsontable相关js -->
+	<script
+		src="/assets/bower_components/handsontable/dist/handsontable.full.js"></script>
+	<script
+		src="/assets/bower_components/ngHandsontable/dist/ngHandsontable.js"></script>
+    <!-- sweetalert相关js -->
+    <script src="/assets/bower_components/sweetalert/dist/sweetalert.min.js"></script>
+    <script src="/assets/bower_components/ng-sweet-alert/ng-sweet-alert.js"></script>
+
+	<!-- schedule计划调度AngularJS模块主JS -->
+	<script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script>
+	<script
+		src="/pages/scheduleApp/module/common/prj-common-globalservice.js"
+		data-exclude=1></script>
+	<script src="/pages/scheduleApp/module/common/prj-common-filter.js"
+		data-exclude=1></script>
+	<script src="/pages/scheduleApp/module/common/prj-common-directive.js"
+		data-exclude=1></script>
+	<script
+		src="/pages/scheduleApp/module/common/prj-common-ui-route-state.js"
+		data-exclude=1></script>
+
+	<!-- 地图相关 -->
+	<!-- 百度 -->
+	<script
+		src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
+		data-exclude=1></script>
+	<script
+		src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
+		data-exclude=1></script>
+	<script type="text/javascript"
+		src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
+		data-exclude=1></script>
+	<script type="text/javascript"
+		src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
+		data-exclude=1></script>
+	<script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
+	<script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
+	<!-- 高德  -->
+	<script
+		src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
+		data-exclude=1></script>
+		
+	<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
+		
 </body>
 </html>
 \ No newline at end of file
@@ -100,7 +100,6 @@
 		selectTemp(function(){
 			/** 根据ID查询详细信息 */
 			$get('/line/' + lineId ,null, function(result){
-				debugger;
 				// 如果不为空
 				if(result) {	
 					// 定义日期格式
@@ -244,20 +243,6 @@
 					if(lineCode[0].id == lineId) {
 						// 提交
 						submit();
-					} else {
-						/*// 定义已有的线路编码
-						var oldCode = params.lineCode;
-						// 重新设置提交参数线路编码值
-						params.lineCode = lineId;
-						// 弹出选择框；确认则提交；取消则返回
-						layer.confirm('线路编码【'+oldCode+'】已存在！自动顺延为如下：<br>线路编码：'+lineId, {
-							btn : [ '确认提示并提交', '取消' ]
-						}, submit);
-						*/
-						layer.open({
-							  title: '消息提示'
-							  ,content: '线路编码【'+params.lineCode+'】已存在，请重新输入编码！'
-							});
 					}
 				} else {
 					// 提交
@@ -267,16 +252,16 @@
 			// 提交
 			function submit() {
 				// 添加数据
-				$post('/line', params, function(result) {
+				$post('/line/update', params, function(result) {
 					// 如果返回结果不为空
 					if(result){
 						// 返回状态码为"SUCCESS" ，则添加成功；返回状态码为"ERROR" ，则添加失败
 						if(result.status=='SUCCESS') {
 							// 弹出添加成功提示消息
-							layer.msg('添加成功...');
+							layer.msg('修改成功...');
 						} else if(result.status=='ERROR') {
 							// 弹出添加失败提示消息
-							layer.msg('添加失败...');
+							layer.msg('修改失败...');
 						}
 					}
 					// 返回list.html页面
@@ -7,6 +7,8 @@
  */
 (function(){
+	// 关闭左侧栏
+	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
 	// 获取参站点路由路ID
 	var no = [];
 	no = $.url().param('no').split(",");
@@ -500,4 +500,5 @@ var StrategyHeadway = function() {
     };
     return headWayF;
+
 }();
 \ No newline at end of file
@@ -190,7 +190,7 @@
         </td>
         <td>
-            {{obj.jsy}}
+            {{obj.jsy}}/{{obj.name}}
         </td>
         <td>
@@ -121,69 +121,9 @@
 							<td colspan="3">6:31~8:30</td>
 							<td colspan="3">16:01~18:00</td>
 						</tr>
-						<tr>
-							<td colspan="2">班次</td>
-							<td><label id="jhbc"></label></td>
-							<td><label id="sjbc"></label></td>
-							<td colspan="3">&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-						</tr>
-						<tr>
-							<td colspan="2">公里</td>
-							<td><label id="jhgl"></label></td>
-							<td><label id="sjgl"></label></td>
-							<td colspan="3">&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-						</tr>
-						<tr>
-							<td colspan="2">临加</td>
-							<td>&nbsp;</td>
-							<td><label id="sjljgl"></label></td>
-							<td colspan="3">&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-						</tr>
-						<tr>
-							<td colspan="2">上行快误点</td>
-							<td>&nbsp;</td>
-							<td>&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-						</tr>
-						<tr>
-							<td colspan="2">上行慢误点</td>
-							<td>&nbsp;</td>
-							<td>&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-						</tr>
-						<tr>
-							<td colspan="2">下行快误点</td>
-							<td>&nbsp;</td>
-							<td>&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-						</tr>
-						<tr>
-							<td colspan="2">下行慢误点</td>
-							<td>&nbsp;</td>
-							<td>&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-						</tr>
-						<tr>
-							<td colspan="2">放班班次</td>
-							<td>&nbsp;</td>
-							<td>&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-						</tr>
-						<tr>
-							<td colspan="2">调头班次</td>
-							<td>&nbsp;</td>
-							<td>&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-							<td colspan="3">&nbsp;</td>
-						</tr>
+						<tbody class="list_xxsj">
+						        	
+						  </tbody>
 					</table>
 				</div>
 			</div>
@@ -327,25 +267,16 @@
 				})
 				$get('/report/jobLjqk',{line:line,date:date},function(result){
-					 var list_lbqk = template('list_ljqk',{list:result});
+					 var list_ljqk = template('list_ljqk',{list:result});
 						// 把渲染好的模版html文本追加到表格中
-						$('#forms .list_ljqk').html(list_lbqk);
+						$('#forms .list_ljqk').html(list_ljqk);
 				})
 				$get('/report/jobHzxx',{line:line,date:date},function(result){
-					$("#jhbc").html(result.jhbc);
-					$("#sjbc").html(result.sjbc)
-					$("#jhgl").html(result.jhgl);
-					$("#sjgl").html(result.sjgl)
-					$("#sjljgl").html(result.ljgl);
-					
-					//临加
-					$("#ljbcs").html(result.ljbc);
-					$("#ljgls").html(result.ljgl)
-					
-					//烂班
-					$("#lbbcs").html(result.lbbc);
-					$("#lbgls").html(result.lbgl)
+					console
+					var list_xxsj=template('list_xxsj',result);
+					$('#forms .list_xxsj').html(list_xxsj);
+
 				})
 			}
@@ -413,3 +344,69 @@
 		</tr>
 	{{/if}}
 </script>
+
+<script type="text/html" id="list_xxsj">
+   <tr>
+	 <td colspan="2">班次</td>
+	 <td>{{jhbc}}</td>
+	 <td>{{sjbc}}</td>
+	 <td colspan="3">{{sjbczgf}}</td>
+	 <td colspan="3">{{sjbcwgf}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">公里</td>
+		<td>{{jhgl}}</td>
+		<td>{{sjgl}}</td>
+		<td colspan="3">{{sjglzgf}}</td>
+		<td colspan="3">{{sjglwgf}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">临加</td>
+		<td>&nbsp;</td>
+		<td>{{ljgl}}</td>
+		<td colspan="3">{{ljglzgf}}</td>
+		<td colspan="3">{{ljglwgf}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">上行快误点</td>
+		<td>&nbsp;</td>
+		<td>{{sxk}}</td>
+		<td colspan="3">{{sxkzgf}}</td>
+		<td colspan="3">{{sxkwgf}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">上行慢误点</td>
+		<td></td>
+		<td>{{sxm}}</td>
+		<td colspan="3">{{sxmzgf}}</td>
+		<td colspan="3">{{sxmwgf}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">下行快误点</td>
+		<td>&nbsp;</td>
+		<td>{{xxk}}</td>
+		<td colspan="3">{{xxkzgf}}</td>
+		<td colspan="3">{{xxkwgf}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">下行慢误点</td>
+		<td>&nbsp;</td>
+		<td>{{xxm}}</td>
+		<td colspan="3">{{xxmzgf}}</td>
+		<td colspan="3">{{xxmwgf}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">放班班次</td>
+		<td>{{jhfbbc}}</td>
+		<td>{{sjfbbc}}</td>
+		<td colspan="3">{{sjfbbczgf}}</td>
+		<td colspan="3">{{sjfbbcwgf}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">调头班次</td>
+		<td>{{jhdtbc}}</td>
+		<td>{{sjdtbc}}</td>
+		<td colspan="3">{{sjdtbczgf}}</td>
+		<td colspan="3">{{sjdtbcwgf}}</td>
+	</tr>
+</script>
@@ -221,7 +221,7 @@
 			<td>{{i+1}}</td>
 			<td>{{obj.rQ}}</td>
 			<td>{{obj.gS}}</td>
- 			<td>{{obj.xL}}</td>
+ 			<td>{{obj.xlmc}}</td>
 			<td>{{obj.clzbh}}</td>
 			<td>{{obj.jsy}}</td>
 			<td>{{obj.jName}}</td>
@@ -1049,8 +1049,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	    }  
 	    function moveDown(){  
 	        var row=mouseInfo["row"];  
-	        var col=mouseInfo["col"];  
-	          
+	        var col=mouseInfo["col"]; 
 	        var key=moveArray[parseInt(row)+1][col]; 
 	        if(document.getElementById(key)!=undefined)  
 	        {  
 <div class="ct_data_body_wrap">
     <div class="uk-card uk-card-default uk-card-body ct_rq_left">
-        <ul uk-scrollspy-nav="closest: li; scroll: true; offset: 100"
-            class="uk-nav uk-nav-default tm-nav uk-nav-parent-icon">
-            <li class="uk-active"><a href="#table_20171010">2017-10-10</a></li>
-            <li><a href="#table_20171011">2017-10-11</a></li>
-            <li><a href="#table_20171012">2017-10-12</a></li>
-            <li><a href="#table_20171013">2017-10-13</a></li>
-            <li><a href="#table_20171014">2017-10-14</a></li>
-            <li><a href="#table_20171015">2017-10-15</a></li>
-            <li><a href="#table_20171016">2017-10-16</a></li>
-        </ul>
+        <ul uk-scrollspy-nav="closest: li; scroll: true; offset: 285" class="uk-nav uk-nav-default tm-nav uk-nav-parent-icon"></ul>
     </div>
-    <div class="uk-card uk-card-default uk-card-body ct_right_tables">
-        <div id="table_20171010">
-            <table>
+    <div class="uk-card uk-card-default uk-card-body ct_right_tables" >
-            </table>
-        </div>
     </div>
+    <script id="fast_and_slow_left_rq_temp" type="text/html">
+        {{each listMap as obj k}}
+            <li><a href="#table_{{k}}">{{k}}</a></li>
+        {{/each}}
+    </script>
+
+    <script id="fast_and_slow_right_body_temp" type="text/html">
+        <div>
+            <div class="data_table_wrap head">
+                <table cellspacing="1" class="data_table">
+                    <col  />
+                    <col  width="14%"/>
+                    <col  width="4%"/>
+                    <col  width="6%"/>
+                    <col  width="6%"/>
+                    <col  width="6%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="6%"/>
+                    <col  width="6%"/>
+                    <col  width="6%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <tr>
+                        <td rowspan="3">序号</td>
+                        <td rowspan="3">发车站点</td>
+                        <td rowspan="3">方向</td>
+                        <td colspan="7">发车时间</td>
+                        <td colspan="7">到达时间</td>
+                    </tr>
+                    <tr>
+                        <td rowspan="2">计划发车<br>时间</td>
+                        <td rowspan="2">待发发车<br>时间</td>
+                        <td rowspan="2">实际发车<br>时间</td>
+                        <td colspan="2">计划</td>
+                        <td colspan="2">待发</td>
+                        <td rowspan="2">计划应到<br>时间</td>
+                        <td rowspan="2">待发应到<br>时间</td>
+                        <td rowspan="2">实际到达<br>时间</td>
+                        <td colspan="2">计划</td>
+                        <td colspan="2">待发</td>
+                    </tr>
+                    <tr>
+                        <td>快</td>
+                        <td>慢</td>
+                        <td>快</td>
+                        <td>慢</td>
+                        <td>快</td>
+                        <td>慢</td>
+                        <td>快</td>
+                        <td>慢</td>
+                    </tr>
+                </table>
+            </div>
+        {{each listMap as obj k}}
+            <h4><a>{{k}}</a></h4>
+            <div class="data_table_wrap data" id="table_{{k}}">
+                <table cellspacing="1" class="data_table">
+                    <col  />
+                    <col  width="14%"/>
+                    <col  width="4%"/>
+                    <col  width="6%"/>
+                    <col  width="6%"/>
+                    <col  width="6%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="6%"/>
+                    <col  width="6%"/>
+                    <col  width="6%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="5%"/>
+                    {{each listMap[k] as obj i}}
+                    <tr>
+                        <td>{{i+1}}</td>
+                        <td>{{obj.stationName}}</td>
+                        <td class="cell_dir_{{obj.upDown}}">{{obj.upDown==0?"上行":"下行"}}</td>
+                        <td>{{obj.fcsj}}</td>
+                        <td>{{obj.dfsj}}</td>
+                        <td>{{obj.fcsjActual}}</td>
+                        <td>{{obj.fcsjFast}}</td>
+                        <td>{{obj.fcsjSlow}}</td>
+                        <td>{{obj.dfsjFast}}</td>
+                        <td>{{obj.dfsjSlow}}</td>
+                        <td>{{obj.zdsj}}</td>
+                        <td>{{obj.zdsjDf}}</td>
+                        <td>{{obj.zdsjActual}}</td>
+                        <td>{{obj.zdsjFast}}</td>
+                        <td>{{obj.zdsjSlow}}</td>
+                        <td>{{obj.zdsjDfFast}}</td>
+                        <td>{{obj.zdsjDfSlow}}</td>
+                    </tr>
+                    {{/each}}
+                    <tr>
+                        <td rowspan="4">合计：</td>
+                        <td colspan="8" class="count_col">发车：上行（计划快误点：<a class="c_c_0">{{countMap[k][0]['fast'][0]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][0]}}</a>  &nbsp;待发快误点：<a class="c_c_0">{{countMap[k][0]['fast'][1]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][1]}}</a>）</td>
+                        <td colspan="8" class="count_col">发车：下行（计划快误点：<a class="c_c_1">{{countMap[k][1]['fast'][0]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][0]}}</a>  待发快误点：<a class="c_c_1">{{countMap[k][1]['fast'][1]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][1]}}</a>）</td>
+                    </tr>
+                    <tr>
+                        <td colspan="8" class="count_col">发车：上行（计划慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][0]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][0]}}</a>  &nbsp;待发慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][1]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][1]}}</a>）</td>
+                        <td colspan="8" class="count_col">发车：下行（计划慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][0]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][0]}}</a>  &nbsp;待发慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][1]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][1]}}</a>）</td>
+                    </tr>
+                    <tr>
+                        <td colspan="8" class="count_col">到达：上行（计划快误点：<a class="c_c_0">{{countMap[k][0]['fast'][2]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][2]}}</a>  &nbsp;待发快误点：<a class="c_c_0">{{countMap[k][0]['fast'][3]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][3]}}</a>）</td>
+                        <td colspan="8" class="count_col">到达：下行（计划快误点：<a class="c_c_1">{{countMap[k][1]['fast'][2]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][2]}}</a>  &nbsp;待发快误点：<a class="c_c_1">{{countMap[k][1]['fast'][3]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][3]}}</a>）</td>
+                    </tr>
+                    <tr>
+                        <td colspan="8" class="count_col">到达：上行（计划慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][2]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][2]}}</a>  &nbsp;待发慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][3]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][3]}}</a>）</td>
+                        <td colspan="8" class="count_col">到达：下行（计划慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][2]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][2]}}</a>  &nbsp;待发慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][3]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][3]}}</a>）</td>
+                    </tr>
+                </table>
+            </div>
+            <br>
+        {{/each}}
+        </div>
+    </script>
     <script>
         (function () {
-            var wrap = '.ct_data_body_wrap';
+            var wrap = '.ct_data_body_wrap',
+                    listMap, countMap={}, timeCountMap={};
             $(wrap).on('init', function (e, data) {
                 e.stopPropagation();
-                console.log('data init');
+                listMap = data.listMap;
+                //统计
+                for(var rq in listMap){
+                    /**
+                     * 2017-10-20:[{fast: [发车, 待发, 计划终点，待发终点], slow: [发车, 待发, 计划终点，待发终点]},{}]
+                     */
+                    countMap[rq]=[{fast:[0,0,0,0], slow:[0,0,0,0]}, {fast:[0,0,0,0], slow:[0,0,0,0]}];
+                    timeCountMap[rq]=[{fast:[0,0,0,0], slow:[0,0,0,0]}, {fast:[0,0,0,0], slow:[0,0,0,0]}];
+                    for(var i=0,obj;obj=listMap[rq][i++];){
+                        countDetail(countMap[rq], obj);
+                        sumTime(timeCountMap[rq], obj);
+                    }
+                }
+
+                //左侧日期list
+                $('.ct_rq_left>ul',wrap).html(template('fast_and_slow_left_rq_temp', {listMap: listMap}));
+                //右侧
+                $('.ct_right_tables',wrap).html(template('fast_and_slow_right_body_temp', {listMap: listMap, countMap: countMap, timeCountMap: timeCountMap}));
             });
+
+
+            function countDetail(json, obj) {
+                var i = obj.upDown;
+                if(obj.fcsjFast)
+                    json[i]['fast'][0]++;
+                if(obj.dfsjFast)
+                    json[i]['fast'][1]++;
+                if(obj.zdsjFast)
+                    json[i]['fast'][2]++;
+                if(obj.zdsjDfFast)
+                    json[i]['fast'][3]++;
+
+                if(obj.fcsjSlow)
+                    json[i]['slow'][0]++;
+                if(obj.dfsjSlow)
+                    json[i]['slow'][1]++;
+                if(obj.zdsjSlow)
+                    json[i]['slow'][2]++;
+                if(obj.zdsjDfSlow)
+                    json[i]['slow'][3]++;
+            }
+
+            function sumTime(json, obj) {
+                var i = obj.upDown;
+                json[i]['fast'][0]+=obj.fcsjFast;
+                json[i]['fast'][1]+=obj.dfsjFast;
+                json[i]['fast'][2]+=obj.zdsjFast;
+                json[i]['fast'][3]+=obj.zdsjDfFast;
+                json[i]['slow'][0]+=obj.fcsjSlow;
+                json[i]['slow'][1]+=obj.dfsjSlow;
+                json[i]['slow'][2]+=obj.zdsjSlow;
+                json[i]['slow'][3]+=obj.zdsjDfSlow;
+            }
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -18,7 +18,7 @@
         }
         .ct_cont{
-            height: calc(100% - 35px);
+            margin-top: 132px;
         }
         .ct_cont>div>div.uk-card{
@@ -94,16 +94,17 @@
             width: 200px;
             display: inline-block;
             vertical-align: top;
-            height: 99%;
-            height: calc(100% - 5px);
+            height: calc(100% - 184px);
+            position: fixed;
+            left: 25px;
         }
         .ct_right_tables{
             width: calc(100% - 220px);
             display: inline-block;
-            margin-left: 12px;
-            height: 99%;
-            height: calc(100% - 5px);
+            margin-left: 232px;
+            padding: 25px;
+            margin-bottom: 18px;
         }
         .tm-nav>li a{
@@ -120,7 +121,95 @@
             top: 15px;
         }
         .uk-nav-default>li.uk-active>a {
-            color: #222;
+            color: blue;
+            font-weight: 600;
+        }
+
+        .data_table_wrap{
+            min-width: 1170px;
+        }
+
+        .ct_right_tables table{
+            background: #8c8c8c;
+            width: 100%;
+            text-align: center;
+            font-size: 14px;
+            table-layout: fixed;
+            color: #000;
+        }
+
+        .ct_right_tables table td{
+            background: #fff;
+            height: 32px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .ct_right_tables table td.count_col{
+            text-align: left;
+            height: 40px;
+            text-indent:15px;
+            font-size: 14px !important;
+            font-weight: 400;
+        }
+
+        .data_table_wrap.head{
+            position: fixed;
+            width: calc(100% - 300px);
+            top: 155px;
+            padding-top: 25px;
+            background: #fff;
+        }
+
+        .ct_right_tables .data_table_wrap.head table tr:nth-child(-n+3) td{
+            background: #ededed;
+        }
+
+        .ct_right_tables table tr:nth-last-child(1) td,
+        .ct_right_tables table tr:nth-last-child(2) td,
+        .ct_right_tables table tr:nth-last-child(3) td,
+        .ct_right_tables table tr:nth-last-child(4) td{
+            background: #ededed;
+        }
+
+        .ct_fixed_header{
+            position: fixed;
+            width: 100%;
+            top: 0;
+            background: #fff;
+            z-index: 2;
+            padding-top: 25px;
+        }
+
+        .ct_right_tables h2{
+            margin-bottom: 10px;
+        }
+
+        .data_table_wrap:nth-child(2) {
+            margin-top: 91px;
+        }
+
+        .cell_dir_0{
+            color: #0000ff96;
+            font-weight: 600;
+            font-size: 12px;
+        }
+        .cell_dir_1{
+            color: #ff00009e;
+            font-weight: 600;
+            font-size: 12px;
+        }
+
+        .count_col .c_c_0{
+            color: #0000ffe0;
+        }
+
+        .count_col .c_c_1{
+            color: #ff0000d1;
+        }
+        .ct_cont{
+            display: none;
         }
     </style>
 </head>
@@ -130,8 +219,8 @@
     <div uk-spinner></div>
 </div>
 <div class="ct_page" style="display: none;">
-    <h3 class="uk-heading-line uk-heading-bullet"><span>快慢误点统计</span></h3>
-    <div class="ct_cont" >
+    <div class="ct_fixed_header">
+        <h3 class="uk-heading-line uk-heading-bullet"><span>快慢误点统计</span></h3>
         <div class="ct_search_form_wrap">
             <form>
                 <div class="ct_field">
@@ -154,26 +243,27 @@
                 </div>
                 <div class="ct_field">
                     <label>日期范围：
-                        <input class="uk-input" name="rq" style="width: 200px;">
+                        <input class="uk-input" name="rq" style="width: 200px;" >
                     </label>
                 </div>
                 <div class="ct_field">
-                    <label><input class="uk-radio" type="radio" name="type" checked> 全部</label>&nbsp;
-                    <label><input class="uk-radio" type="radio" name="type"> 快误</label>&nbsp;
-                    <label><input class="uk-radio" type="radio" name="type"> 慢误</label>
+                    <label><input class="uk-radio" type="radio" name="type" value="0" checked> 全部</label>&nbsp;
+                    <label><input class="uk-radio" type="radio" name="type" value="1"> 快误</label>&nbsp;
+                    <label><input class="uk-radio" type="radio" name="type" value="-1"> 慢误</label>
                 </div>
                 <div class="ct_field">
-                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
+                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search" ></i>搜索</button>
                 </div>
                 <div class="ct_field ct_field_bottom">
-                    <button class="uk-button uk-button-text" style="padding: 0 5px;">导出数据</button>
+                    <button class="uk-button uk-button-text export_excel" style="padding: 0 5px;">导出数据</button>
                 </div>
                 <div class="ct_field ct_field_bottom">
-                    <span uk-icon="icon: question" title="统计 “正常”、“区间”、“放站” 班次" uk-tooltip="pos: bottom"></span>
+                    <span uk-icon="icon: question" title="快1慢3; 排除进出场班次<br>一次至多查询5天的数据，如需更大查询范围，请导出" uk-tooltip="pos: bottom"></span>
                 </div>
             </form>
         </div>
-
+    </div>
+    <div class="ct_cont" >
         <div class="ct_cont_body">
         </div>
     </div>
@@ -210,15 +300,11 @@
         $('.ct_cont_body').html(rs);
     });
-    //点击搜索按钮
-    $('.search', f).on('click', function () {
-        $('.ct_data_body_wrap').trigger('init');
-    });
     //日期选择框
     var fs='YYYY-MM-DD'
-            , ets=moment().format(fs)
-            , sts=moment().subtract(7, 'days').format(fs);
+            , ets=moment().subtract(1, 'days').format(fs)
+            , sts=moment().subtract(6, 'days').format(fs);
     flatpickr('.ct_search_form_wrap [name=rq]', {
         mode: "range", dateFormat: "Y-m-d","locale": "zh", defaultDate: [sts, ets]
     });
@@ -276,6 +362,63 @@
         }
         $('[name=lineCode_eq]', f).html(opts);
     });
+
+    /**
+     * 点击搜索
+     */
+    $('.search', f).on('click', function () {
+        var that = this;
+        $(that).attr('disabled', 'disabled');
+        var params = serializeFormJSON();
+        $('.ct_cont').hide();
+        $.get('/summary/fastAndSlow/all', params, function (rs) {
+            $(that).removeAttr('disabled');
+            //按日期分组
+            var listMap = groupBy(rs, 'rq');
+            $('.ct_data_body_wrap').trigger('init', {listMap: listMap});
+            if(!rs || rs.length==0)
+                return UIkit.notification('没有搜索到相关数据！！', 'danger');
+            $('.ct_cont').show();
+        });
+    });
+    
+    function serializeFormJSON() {
+        var data = f.serializeJSON();
+        if(!data.rq)
+            return UIkit.notification('你必须选择时间范围！', 'danger');
+
+        var sDate = data.rq.substr(0, 10),
+                eDate = data.rq.substr(13);
+
+        return {lineCode_eq: data.lineCode_eq, rq_ge: sDate, rq_le: eDate, order: 't',type: data.type};
+    }
+
+    f.on('submit', function (e) {
+       return false;
+    });
+
+    var groupBy = function (list, field) {
+        var rs = {},
+                key;
+        $.each(list, function () {
+            key = this[field];
+            if (!rs[key])
+                rs[key] = [];
+
+            rs[key].push(this);
+        });
+
+        return rs;
+    };
+
+    /**
+     * 导出
+     */
+    $('.export_excel').on('click', function () {
+        var params = serializeFormJSON();
+
+        window.open('/summary/fastAndSlow/excel/' + params.lineCode_eq + "?st="+params.rq_ge+"&et="+params.rq_le+"&type="+params.type);
+    });
 })();
 </script>
 </body>
@@ -262,8 +262,8 @@
     }
     //日期选择器
-    $('[name=rq_eq]', f).val('2017-10-10');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-16', minDate: '2017-07-01'});
+    $('[name=rq_eq]', f).val('2017-10-23');
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-23', minDate: '2017-07-01'});
     var comps;
     //构建公司级联下拉框
@@ -1736,4 +1736,22 @@ dl.active&gt;dd.disabled{
     color: #a6a6a6;
     text-indent: 7px;
     padding-bottom: 5px;
+}
+
+.cancel_link{
+    font-size: 12px;
+    margin-left: 15px;
+    vertical-align: bottom;
+    color: #8d8d8d;
+    text-decoration: underline;
+    position: absolute;
+    right: 0;
+}
+
+.edit_link{
+    font-size: 12px;
+    margin-left: 15px;
+    vertical-align: bottom;
+    color: #ff2f2f;
+    text-decoration: underline;
 }
 \ No newline at end of file
@@ -20,7 +20,8 @@
             </h5>
             <code>{{t.fcsjActual}}</code>
             <div class="uk-button-group">
-                <a class="uk-button uk-button-mini uk-button-primary" >确定</a>
+                <a class="uk-button uk-button-mini uk-button-primary" data-line="{{t.xlBm}}">确定</a>
+                <a class="cancel_link" data-id="{{t.id}}" data-line="{{t.xlBm}}"><i class="uk-icon-remove"></i> 撤销</a>
             </div>
         </div>
     </script>
@@ -38,7 +39,9 @@
               </h5>
               <code>{{t.zdsjActual}}</code>
               <div class="uk-button-group">
-                  <a class="uk-button uk-button-mini uk-button-primary" >确定</a>
+                  <a class="uk-button uk-button-mini uk-button-primary" data-line="{{t.xlBm}}">确定</a>
+                  <a class="edit_link" data-type="1" data-id="{{t.id}}" data-line="{{t.xlBm}}">编辑</a>
+                  <a class="cancel_link" data-type="1" data-id="{{t.id}}" data-line="{{t.xlBm}}"><i class="uk-icon-remove"></i> 撤销</a>
               </div>
           </div>
       </div>
@@ -95,7 +95,7 @@ var gb_schedule_context_menu = (function () {
                 sch: sch
             }, modal_opts);
         },
-        cxsf: function (sch) {
+        cxsf: function (sch, cb) {
             if (!sch.fcsjActual)
                 return notify_err('车辆未实发，无法执行该操作！');
@@ -108,6 +108,8 @@ var gb_schedule_context_menu = (function () {
                     notify_succ('撤销实发操作成功！');
                     //calc 应发未发
                     gb_schedule_table.calc_yfwf_num(sch.xlBm);
+
+                    cb && cb();
                 });
             }, '确认撤销实发');
         },
@@ -176,7 +178,7 @@ var gb_schedule_context_menu = (function () {
                 sch: sch
             }, modal_opts);
         },
-        cxzx: function (sch) {
+        cxzx: function (sch, cb) {
             if (!sch.zdsjActual && !sch.fcsjActual)
                 return notify_err('车辆未执行，无法撤销执行！');
@@ -187,6 +189,8 @@ var gb_schedule_context_menu = (function () {
                 }, function (rs) {
                     gb_schedule_table.updateSchedule(rs.ts);
                     notify_succ('撤销执行成功！');
+
+                    cb && cb();
                 });
             }, '确认撤销执行');
         },
@@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            //showUpdateDescription();
+            showUpdateDescription();
         });
         function g_emit(id) {
@@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-09-28',
-        text: '<h5>1、修复了一个bug，该bug曾导致，出场时间设置为请求出场的线路，有几率早出场时间会误跳至分班班次！</h5>'
+        date: '2017-10-25',
+        text: '<h5>1、修正了双击调整待发时，备注会被清空的bug。！</h5><h5>2、现在发车和到站信使可以撤销和编辑。</h5>'
     };
     var storage = window.localStorage
@@ -218,9 +218,8 @@ var gb_sch_websocket = (function () {
     $(document).on('click', '.sys-mailbox .sys-note-42 .uk-button-primary', function (e) {
         e.stopPropagation();
         $(this).parents('.sys-note-42').remove();
-
         var size = $(this).parents('.sys-mailbox').find('.sys-mail-item').length
-            , lineCode = $(this).parents('li.line_schedule').data('id');
+            , lineCode = $(this).data('line');
         $('#badge_untreated_num_' + lineCode).text(size);
     });
@@ -233,7 +232,7 @@ var gb_sch_websocket = (function () {
         var dl = gb_schedule_table.scroToDl(sch);
         //高亮
         gb_schedule_table.reset_drag_active_all(dl);
-        dl.addClass('relevance-active intimity');
+        dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
     });
     //80同意
@@ -295,6 +294,41 @@ var gb_sch_websocket = (function () {
         gb_data_gps.deviceOffline(msg.gps);
     }
+    /**
+     * 信号撤销
+     */
+    $(document).on('click','.sys-note-42 .cancel_link', function () {
+        var id = $(this).data('id'),
+            lineCode = $(this).data('line');
+
+        var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+        if(!sch)
+            return;
+
+        var confirmBtn = $(this).parent().find('.uk-button-primary');
+        var type = $(this).data('type');
+        var fun = type==1?gb_schedule_context_menu.cxzx:gb_schedule_context_menu.cxsf;
+
+        fun(sch, function () {
+            confirmBtn.trigger('click');
+        });
+    });
+
+    /**
+     * 到站信号修改
+     */
+    $(document).on('click', '.sys-note-42 .edit_link', function () {
+        var id = $(this).data('id'),
+            lineCode = $(this).data('line');
+
+        var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+        if(!sch)
+            return;
+
+        var nextSch = gb_schedule_table.getNextSch(sch);
+        gb_schedule_context_menu.dftz(nextSch);
+    });
+
     return {
         sock: function () {
             return schSock;