Merge branch 'minhang' into pudong

潘钊
2 parents bbb8f22d b0ba5592
Showing 26 changed files with 2772 additions and 1509 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/signal/SchSiginUpdateDBThread.java
src/main/java/com/bsth/data/schedule/signal/SignalComplateHandler.java
src/main/java/com/bsth/data/schedule/signal/entity/SchSiginCompate.java
src/main/java/com/bsth/entity/excep/ArrivalInfo.java
src/main/java/com/bsth/entity/report/MileageReport.java
src/main/java/com/bsth/entity/report/ScheduleCorrectionReport.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/repository/oil/JdlRepository.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/JdlServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/CulateMileageService.java
@@ -417,6 +417,70 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		}
 		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
 	}
+	
+	/*
+	 * 公里修正报表
+	 */
+	@RequestMapping(value="/mileageReportTj")
+	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
+	}
+	
+	/*
+	 * 班次修正报表
+	 */
+	@RequestMapping(value="/scheduleCorrectionReport")
+	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
+	}
 	@RequestMapping(value="/MapById",method = RequestMethod.GET)
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
@@ -95,4 +95,9 @@ public class anomalyCheckController {
     public void updateCacheBuff(){
         geoCacheData.loadData();
     }
+
+    @RequestMapping(value = "/reCalcLpSch")
+    public void reCalcLpSch(){
+        dayOfSchedule._test_reCalcLpSch();
+    }
 }
@@ -84,12 +84,19 @@ public class ReportController {
 			@RequestParam int zd){
 		return service.queryStrinon(line,zd);
 	}
+	//根据排班查到离站
 	@RequestMapping(value="/queryInOutStrtion" ,method = RequestMethod.GET)
 	public List<Map<String, Object>> queryInOutStrtion(@RequestParam String line,
 			@RequestParam String date,@RequestParam int zd,@RequestParam String lzsj){
 		return service.queryInOutStrtion(line,date,zd,lzsj);
 	}
+	//根据GPS数据查到离站
+	@RequestMapping(value="/queryInOutStrtions" ,method = RequestMethod.GET)
+	public List<Map<String, Object>> queryInOutStrtions(@RequestParam String line,
+			@RequestParam String date,@RequestParam int zd,@RequestParam String lzsj){
+		return service.queryInOutStrtions(line,date,zd,lzsj);
+	}
 	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.GET)
 	public List<ArrivalInfo> queryListClzd(@RequestParam String zd,@RequestParam String line,
 			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
@@ -54,27 +54,19 @@ public class CarOutInfoHandler {
      * 全量更新发车信息表
      */
     public void updateAll() {
-        Set<String> ks = BasicData.lineCode2NameMap.keySet();
-        for (String lineCode : ks) {
-            update(lineCode);
-        }
-    }
-
-    public void update(String lineCode) {
-        try {
-            ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap = dayOfSchedule.getLpScheduleMap();
-            List<ScheduleRealInfo> list = new ArrayList<>();
+        try{
+            //将班次按线路分组
+            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+            ArrayListMultimap<String, ScheduleRealInfo> xlMaps = ArrayListMultimap.create();
+            for(ScheduleRealInfo sch : all){
+                xlMaps.put(sch.getXlBm(), sch);
+            }
-            Set<String> ks = lpScheduleMap.keySet();
-            String prefix = lineCode + "_";
+            Set<String> ks = xlMaps.keySet();
             for (String k : ks) {
-                if (k.startsWith(prefix)) {
-                    list.addAll(lpScheduleMap.get(k));
-                }
+                update(xlMaps.get(k));
             }
-
-            update(list);
-        } catch (Exception e) {
+        }catch (Exception e){
             logger.error("", e);
         }
     }
@@ -338,6 +338,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(lpNext != null){
                 lpNext.setQdzArrDatesj(sch.getZdsjActual());
             }
+            else{
+                logger.info(sch.getClZbh() + " 到终点，无下一班");
+            }
             //通知客户端
             sendUtils.sendZdsj(sch, lpNext, doneSum);
@@ -1137,4 +1137,16 @@ public class DayOfSchedule {
     public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap() {
         return lpScheduleMap;
     }
+
+    /**
+     * 重新全量计算路牌下的班次关联性
+     * 临时性的函数
+     */
+    public void _test_reCalcLpSch() {
+        Map<String ,Collection<ScheduleRealInfo>> map = lpScheduleMap.asMap();
+        Set<String> ks = map.keySet();
+        for(String k : ks){
+            schAttrCalculator.calcQdzTimePlan(new ArrayList<ScheduleRealInfo>(map.get(k)));
+        }
+    }
 }
 \ No newline at end of file
-package com.bsth.data.schedule.signal;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by panzhao on 2017/8/14.
- */
-@Component
-public class SchSiginUpdateDBThread extends Thread{
-
-    @Autowired
-    SignalComplateHandler signalComplateHandler;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public void run() {
-        try{
-            signalComplateHandler.handler();
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-}
+package com.bsth.data.schedule.signal;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by panzhao on 2017/8/14.
+ */
+@Component
+public class SchSiginUpdateDBThread extends Thread{
+
+    @Autowired
+    SignalComplateHandler signalComplateHandler;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try{
+            signalComplateHandler.handler();
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
-package com.bsth.data.schedule.signal;
-
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.signal.entity.SchSiginCompate;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.util.db.DBUtils_MS;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 班次信号补全（写入数据库，网关以补发的形式提交运管处）
- * Created by panzhao on 2017/8/13.
- */
-@Component
-public class SignalComplateHandler {
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    Logger log = LoggerFactory.getLogger(this.getClass());
-
-    public void handler(){
-        Collection<ScheduleRealInfo> all = dayOfSchedule.findAll();
-        List<SchSiginCompate> list = new ArrayList<>();
-
-        SchSiginCompate siginCompate;
-        Date d = new Date();
-        long et = System.currentTimeMillis() - (1000 * 60 * 60 * 2),
-            st = et - (1000 * 60 * 60 * 2);
-        for(ScheduleRealInfo sch : all){
-            if(sch.getDfsjT() > et || sch.getDfsjT() < st)
-                continue;
-
-            //能自动完成的
-            if(sch.getSiginCompate() >= 2)
-                continue;
-
-            //烂班
-            if(sch.isDestroy())
-                continue;
-
-            //空驶任务
-            if(dayOfSchedule.emptyService(sch))
-                continue;
-
-            siginCompate = new SchSiginCompate(sch);
-            if(siginCompate == null || StringUtils.isEmpty(siginCompate.getDeciveId()))
-                continue;
-
-            //标记已经补发
-            sch.setSiginCompate(3);
-            //标记入库
-            dayOfSchedule.save(sch);
-            siginCompate.setCreateDate(d);
-            list.add(siginCompate);
-        }
-
-        put(list);
-    }
-
-    public void put(final List<SchSiginCompate> list){
-        if(null == list || list.size() == 0)
-            return;
-
-        JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemp.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-
-        try{
-            jdbcTemp.batchUpdate("insert into bsth_t_sigin_complate(id, rq, line_code, device_id, up_down, s_code, e_code, st, et, create_date, status) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
-                @Override
-                public void setValues(PreparedStatement ps, int i) throws SQLException {
-                    SchSiginCompate sc = list.get(i);
-                    ps.setLong(1, sc.getId());
-                    ps.setString(2, sc.getRq());
-                    ps.setString(3, sc.getLineCode());
-                    ps.setString(4, sc.getDeciveId());
-                    ps.setInt(5, sc.getUpDown());
-                    ps.setString(6, sc.getsCode());
-                    ps.setString(7, sc.geteCode());
-                    ps.setLong(8, sc.getSt());
-                    ps.setLong(9, sc.getEt());
-                    ps.setDate(10, new java.sql.Date(sc.getCreateDate().getTime()));
-                    ps.setInt(11, sc.getStatus());
-                }
-
-                @Override
-                public int getBatchSize() {
-                    return list.size();
-                }
-            });
-
-            tran.commit(status);
-            log.info("补信号班次入库，" + list.size());
-        }catch (Exception e){
-            log.error("", e);
-            tran.rollback(status);
-        }
-    }
-
-
-}
+package com.bsth.data.schedule.signal;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.signal.entity.SchSiginCompate;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.db.DBUtils_MS;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 班次信号补全（写入数据库，网关以补发的形式提交运管处）
+ * Created by panzhao on 2017/8/13.
+ */
+@Component
+public class SignalComplateHandler {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    public void handler(){
+        Collection<ScheduleRealInfo> all = dayOfSchedule.findAll();
+        List<SchSiginCompate> list = new ArrayList<>();
+
+        SchSiginCompate siginCompate;
+        Date d = new Date();
+        long et = System.currentTimeMillis() - (1000 * 60 * 60 * 2),
+            st = et - (1000 * 60 * 60 * 2);
+        for(ScheduleRealInfo sch : all){
+            if(sch.getDfsjT() > et || sch.getDfsjT() < st)
+                continue;
+
+            //能自动完成的
+            if(sch.getSiginCompate() >= 2)
+                continue;
+
+            //烂班
+            if(sch.isDestroy())
+                continue;
+
+            //空驶任务
+            if(dayOfSchedule.emptyService(sch))
+                continue;
+
+            siginCompate = new SchSiginCompate(sch);
+            if(siginCompate == null || StringUtils.isEmpty(siginCompate.getDeciveId()))
+                continue;
+
+            //标记已经补发
+            sch.setSiginCompate(3);
+            //标记入库
+            dayOfSchedule.save(sch);
+            siginCompate.setCreateDate(d);
+            list.add(siginCompate);
+        }
+
+        put(list);
+    }
+
+    public void put(final List<SchSiginCompate> list){
+        if(null == list || list.size() == 0)
+            return;
+
+        JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemp.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            jdbcTemp.batchUpdate("insert into bsth_t_sigin_complate(id, rq, line_code, device_id, up_down, s_code, e_code, st, et, create_date, status) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    SchSiginCompate sc = list.get(i);
+                    ps.setLong(1, sc.getId());
+                    ps.setString(2, sc.getRq());
+                    ps.setString(3, sc.getLineCode());
+                    ps.setString(4, sc.getDeciveId());
+                    ps.setInt(5, sc.getUpDown());
+                    ps.setString(6, sc.getsCode());
+                    ps.setString(7, sc.geteCode());
+                    ps.setLong(8, sc.getSt());
+                    ps.setLong(9, sc.getEt());
+                    ps.setDate(10, new java.sql.Date(sc.getCreateDate().getTime()));
+                    ps.setInt(11, sc.getStatus());
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return list.size();
+                }
+            });
+
+            tran.commit(status);
+            log.info("补信号班次入库，" + list.size());
+        }catch (Exception e){
+            log.error("", e);
+            tran.rollback(status);
+        }
+    }
+
+
+}
-package com.bsth.data.schedule.signal.entity;
-
-import com.bsth.data.BasicData;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-
-import java.util.Date;
-
-/**
- * 班次信号补偿
- * Created by panzhao on 2017/8/13.
- */
-public class SchSiginCompate {
-
-    /** 实际班次ID */
-    private long id;
-
-    /** 班次日期 */
-    private String rq;
-
-    /** 线路编码 */
-    private String lineCode;
-
-    /** 设备号 */
-    private String deciveId;
-
-    /** 上下行 */
-    private int upDown;
-
-    /** 起始站编码 */
-    private String sCode;
-
-    /** 终点站编码 */
-    private String eCode;
-
-    /** 开始时间戳 */
-    private long st;
-
-    /** 结束时间戳 */
-    private long et;
-
-    /** 入库时间 */
-    private Date createDate;
-
-    private int status = 0;
-
-    public SchSiginCompate(ScheduleRealInfo sch) {
-        this.id = sch.getId();
-        this.rq = sch.getScheduleDateStr();
-        this.lineCode = sch.getXlBm();
-        this.upDown = Integer.parseInt(sch.getXlDir());
-        this.deciveId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
-        this.sCode = sch.getQdzCode();
-        this.eCode = sch.getZdzCode();
-        this.st = sch.getDfsjT();
-        this.et = sch.getZdsjT();
-
-        if(sch.getFcsjActualTime() != null)
-            this.st = sch.getFcsjActualTime();
-        if(sch.getZdsjActualTime() != null)
-            this.et = sch.getZdsjActualTime();
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getRq() {
-        return rq;
-    }
-
-    public void setRq(String rq) {
-        this.rq = rq;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getDeciveId() {
-        return deciveId;
-    }
-
-    public void setDeciveId(String deciveId) {
-        this.deciveId = deciveId;
-    }
-
-    public int getUpDown() {
-        return upDown;
-    }
-
-    public void setUpDown(int upDown) {
-        this.upDown = upDown;
-    }
-
-    public String getsCode() {
-        return sCode;
-    }
-
-    public void setsCode(String sCode) {
-        this.sCode = sCode;
-    }
-
-    public String geteCode() {
-        return eCode;
-    }
-
-    public void seteCode(String eCode) {
-        this.eCode = eCode;
-    }
-
-    public long getSt() {
-        return st;
-    }
-
-    public void setSt(long st) {
-        this.st = st;
-    }
-
-    public long getEt() {
-        return et;
-    }
-
-    public void setEt(long et) {
-        this.et = et;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-}
+package com.bsth.data.schedule.signal.entity;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import java.util.Date;
+
+/**
+ * 班次信号补偿
+ * Created by panzhao on 2017/8/13.
+ */
+public class SchSiginCompate {
+
+    /** 实际班次ID */
+    private long id;
+
+    /** 班次日期 */
+    private String rq;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 设备号 */
+    private String deciveId;
+
+    /** 上下行 */
+    private int upDown;
+
+    /** 起始站编码 */
+    private String sCode;
+
+    /** 终点站编码 */
+    private String eCode;
+
+    /** 开始时间戳 */
+    private long st;
+
+    /** 结束时间戳 */
+    private long et;
+
+    /** 入库时间 */
+    private Date createDate;
+
+    private int status = 0;
+
+    public SchSiginCompate(ScheduleRealInfo sch) {
+        this.id = sch.getId();
+        this.rq = sch.getScheduleDateStr();
+        this.lineCode = sch.getXlBm();
+        this.upDown = Integer.parseInt(sch.getXlDir());
+        this.deciveId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
+        this.sCode = sch.getQdzCode();
+        this.eCode = sch.getZdzCode();
+        this.st = sch.getDfsjT();
+        this.et = sch.getZdsjT();
+
+        if(sch.getFcsjActualTime() != null)
+            this.st = sch.getFcsjActualTime();
+        if(sch.getZdsjActualTime() != null)
+            this.et = sch.getZdsjActualTime();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getDeciveId() {
+        return deciveId;
+    }
+
+    public void setDeciveId(String deciveId) {
+        this.deciveId = deciveId;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getsCode() {
+        return sCode;
+    }
+
+    public void setsCode(String sCode) {
+        this.sCode = sCode;
+    }
+
+    public String geteCode() {
+        return eCode;
+    }
+
+    public void seteCode(String eCode) {
+        this.eCode = eCode;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}
@@ -61,11 +61,12 @@ public class ArrivalInfo {
 	private String jzsj;
 	/** -1 则信号有效，但程序标记为不使用 */
 	private int flag = 0;
-	
+	private Date dates;
+	private int route;
 	public ArrivalInfo(){}
 	public ArrivalInfo(String deviceId, long ts, String lineCode, int upDown, String stopNo, int inOut, long createDate,
-			int weeksYear, String stopName) {
+			int weeksYear, String stopName,Date dates,int route) {
 		this.deviceId = deviceId;
 		this.ts = ts;
@@ -75,6 +76,8 @@ public class ArrivalInfo {
 		this.stopName = stopName;
 		this.inOut = inOut;
 		this.createDate = createDate;
+		this.dates=dates;
+		this.route=route;
 	}
 /*	@Override
@@ -253,6 +256,22 @@ public class ArrivalInfo {
 	public void setPzh(String pzh) {
 		this.pzh = pzh;
 	}
+
+	public Date getDates() {
+		return dates;
+	}
+
+	public void setDates(Date dates) {
+		this.dates = dates;
+	}
+
+	public int getRoute() {
+		return route;
+	}
+
+	public void setRoute(int route) {
+		this.route = route;
+	}
+package com.bsth.entity.report;
+
+import java.util.Date;
+
+/**
+ * @ClassName: MileageReport.java
+ * @Description: TODO(营运里程修正报表)
+ * @author: YouRuiFeng
+ * @date: 2017-8-14 上午11:09:19
+ * 
+ */
+public class MileageReport {
+	/** 公司编码 */
+    private String companyId;
+
+    /** 分公司编码 */
+    private String subCompanyId;
+    
+    /** 公司名称 */
+    private String companyName;
+
+    /** 分公司名称 */
+    private String subCompanyName;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 线路名称 */
+    private String lineName;
+    
+    /** 总营运公里  */
+    private double zgl;
+
+    /** 实际运营公里  */
+    private double sjyygl;
+    
+    /** 实际空驶公里  */
+    private double sjksgl;
+
+    /** 手动待发公里  */
+    private double sddfgl;
+    
+    /** 自动代发公里  */
+    private double zddfgl;
+    
+    /** 完全无Gps信号公里  */
+    private double wqwxhgl;
+    
+    /** 部分无Gps公里  */
+    private double bfwxhgl;
+    
+    /** 漂移公里  */
+    private double pygl;
+    
+    /** 临加公里  */
+    private double ljgl;
+    
+    /** 子任务  */
+    private double zrwgl;
+
+    /** 其他*/
+    private String other;
+
+    /** 备注 */
+    private String remarks;
+    
+    /** 日期 （班次日期） */
+    private String rq;
+
+    private Date createDate;
+
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getSubCompanyId() {
+		return subCompanyId;
+	}
+
+	public void setSubCompanyId(String subCompanyId) {
+		this.subCompanyId = subCompanyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public String getSubCompanyName() {
+		return subCompanyName;
+	}
+
+	public void setSubCompanyName(String subCompanyName) {
+		this.subCompanyName = subCompanyName;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
+
+	public double getZgl() {
+		return zgl;
+	}
+
+	public void setZgl(double zgl) {
+		this.zgl = zgl;
+	}
+
+	public double getSjyygl() {
+		return sjyygl;
+	}
+
+	public void setSjyygl(double sjyygl) {
+		this.sjyygl = sjyygl;
+	}
+	
+	public double getSjksgl() {
+		return sjksgl;
+	}
+
+	public void setSjksgl(double sjksgl) {
+		this.sjksgl = sjksgl;
+	}
+
+	public double getSddfgl() {
+		return sddfgl;
+	}
+
+	public void setSddfgl(double sddfgl) {
+		this.sddfgl = sddfgl;
+	}
+
+	public double getZddfgl() {
+		return zddfgl;
+	}
+
+	public void setZddfgl(double zddfgl) {
+		this.zddfgl = zddfgl;
+	}
+
+	public double getWqwxhgl() {
+		return wqwxhgl;
+	}
+
+	public void setWqwxhgl(double wqwxhgl) {
+		this.wqwxhgl = wqwxhgl;
+	}
+
+	public double getBfwxhgl() {
+		return bfwxhgl;
+	}
+
+	public void setBfwxhgl(double bfwxhgl) {
+		this.bfwxhgl = bfwxhgl;
+	}
+
+	public double getPygl() {
+		return pygl;
+	}
+
+	public void setPygl(double pygl) {
+		this.pygl = pygl;
+	}
+
+	public double getLjgl() {
+		return ljgl;
+	}
+
+	public void setLjgl(double ljgl) {
+		this.ljgl = ljgl;
+	}
+
+	public double getZrwgl() {
+		return zrwgl;
+	}
+
+	public void setZrwgl(double zrwgl) {
+		this.zrwgl = zrwgl;
+	}
+
+	public String getOther() {
+		return other;
+	}
+
+	public void setOther(String other) {
+		this.other = other;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+    
+    
+}
+package com.bsth.entity.report;
+
+import java.util.Date;
+
+/**
+ * @ClassName: MileageReport.java
+ * @Description: TODO(营运里程修正报表)
+ * @author: YouRuiFeng
+ * @date: 2017-8-14 上午11:09:19
+ * 
+ */
+public class ScheduleCorrectionReport {
+	/** 公司编码 */
+    private String companyId;
+
+    /** 分公司编码 */
+    private String subCompanyId;
+    
+    /** 公司名称 */
+    private String companyName;
+
+    /** 分公司名称 */
+    private String subCompanyName;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 线路名称 */
+    private String lineName;
+    
+    /** 总营运班次  */
+    private int zbc;
+
+    /** 实际运营班次  */
+    private int sjyybc;
+    
+    /** 实际空驶班次  */
+    private int sjksbc;
+
+    /** 手动待发班次  */
+    private int sddfbc;
+    
+    /** 自动代发班次  */
+    private int zddfbc;
+    
+    /** 完全无Gps信号班次  */
+    private int wqwxhbc;
+    
+    /** 部分无Gps班次  */
+    private int bfwxhbc;
+    
+    /** 漂移班次  */
+    private int pybc;
+    
+    /** 临加班次  */
+    private int ljbc;
+    
+    /** 子任务  */
+    private int zrwbc;
+
+    /** 其他*/
+    private String other;
+
+    /** 备注 */
+    private String remarks;
+    
+    /** 日期 （班次日期） */
+    private String rq;
+
+    private Date createDate;
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getSubCompanyId() {
+		return subCompanyId;
+	}
+
+	public void setSubCompanyId(String subCompanyId) {
+		this.subCompanyId = subCompanyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public String getSubCompanyName() {
+		return subCompanyName;
+	}
+
+	public void setSubCompanyName(String subCompanyName) {
+		this.subCompanyName = subCompanyName;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
+
+	public int getZbc() {
+		return zbc;
+	}
+
+	public void setZbc(int zbc) {
+		this.zbc = zbc;
+	}
+
+	public int getSjyybc() {
+		return sjyybc;
+	}
+
+	public void setSjyybc(int sjyybc) {
+		this.sjyybc = sjyybc;
+	}
+
+	public int getSjksbc() {
+		return sjksbc;
+	}
+
+	public void setSjksbc(int sjksbc) {
+		this.sjksbc = sjksbc;
+	}
+
+	public int getSddfbc() {
+		return sddfbc;
+	}
+
+	public void setSddfbc(int sddfbc) {
+		this.sddfbc = sddfbc;
+	}
+
+	public int getZddfbc() {
+		return zddfbc;
+	}
+
+	public void setZddfbc(int zddfbc) {
+		this.zddfbc = zddfbc;
+	}
+
+	public int getWqwxhbc() {
+		return wqwxhbc;
+	}
+
+	public void setWqwxhbc(int wqwxhbc) {
+		this.wqwxhbc = wqwxhbc;
+	}
+
+	public int getBfwxhbc() {
+		return bfwxhbc;
+	}
+
+	public void setBfwxhbc(int bfwxhbc) {
+		this.bfwxhbc = bfwxhbc;
+	}
+
+	public int getPybc() {
+		return pybc;
+	}
+
+	public void setPybc(int pybc) {
+		this.pybc = pybc;
+	}
+
+	public int getLjbc() {
+		return ljbc;
+	}
+
+	public void setLjbc(int ljbc) {
+		this.ljbc = ljbc;
+	}
+
+	public int getZrwbc() {
+		return zrwbc;
+	}
+
+	public void setZrwbc(int zrwbc) {
+		this.zrwbc = zrwbc;
+	}
+
+	public String getOther() {
+		return other;
+	}
+
+	public void setOther(String other) {
+		this.other = other;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	
+}
@@ -53,7 +53,7 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
-			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
+			+ " group by nbbm,rq,ssgsdm,fgsdm",nativeQuery=true)
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
 	@Query(value="select nbbm,sum(cdl*100) as cdl ,sum(zlc*100) as zlc from bsth_c_dlb where to_days(?1)=to_days(rq) and "
@@ -17,25 +17,25 @@ public interface JdlRepository extends BaseRepository&lt;Jdl, Integer&gt;{
 	@Transactional
     @Modifying
     @Query(value="INSERT INTO bsth_c_jdl("+
-    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date,jsy)" +
+    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date)" +
     			 " VALUES(" +
-    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'),?11)", nativeQuery=true)
-	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate,String jsy);
+    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'))", nativeQuery=true)
+	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate);
-	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4% and jsy like %?5%" ,nativeQuery=true)
-	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm,String jsy);
+	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4% " ,nativeQuery=true)
+	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm);
 	@Query(value="SELECT * FROM bsth_c_jdl where rq = ?",nativeQuery=true)
 	List<Jdl> JdlList( String rq);
-	@Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4 and jsy = ?5 ",nativeQuery=true)
-	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm, String jsy);
+	@Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4  ",nativeQuery=true)
+	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm);
 	@Transactional
     @Modifying
-	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5 and jsy = ?6",nativeQuery=true)
-	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jsy);
+	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5",nativeQuery=true)
+	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm);
 }
@@ -673,9 +673,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(sfqr == 1){
 				where += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
 			}
-			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+//			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			where += " and bc_type != 'ldks'";
-			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc,"
+			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type,"
 					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
 					+ " from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
 					+ " and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"+where+"";
@@ -699,6 +700,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setZdsjActual(rs.getString("zdsj_actual"));
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setZdzName(rs.getString("zdz_name"));
+					schedule.setBcType(rs.getString("bc_type"));
 					schedule.setXlDir(rs.getString("xl_dir"));
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setRemarks(rs.getString("remarks"));
@@ -832,7 +834,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(model.length() != 0){
 				sql = "select sp.id from "
 						+ "(select id, tt_info, xl_bm, lp, fcsj from bsth_c_s_sp_info where schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'"
-						+ " and tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks') sp"
+						+ " and tt_info = '" + model + "' and bc_type != 'ldks') sp"
 						+ " left join bsth_c_s_ttinfo_detail tt on sp.tt_info = tt.ttinfo and sp.xl_bm = tt.xl and sp.lp = tt.lp and sp.fcsj = tt.fcsj";
 				ttList = jdbcTemplate.query(sql,
@@ -915,6 +917,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			Map<Long, ScheduleRealInfo> sortMap = new HashMap<Long, ScheduleRealInfo>();
+			Map<Long, Map<String, Object>> sortMap1 = new HashMap<Long, Map<String, Object>>();
 			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 			List<Long> keyList = new ArrayList<Long>();
 			List<Long> keyList2 = new ArrayList<Long>();
@@ -946,30 +949,25 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(int i = 1; i < keyList.size(); i++){
 				ScheduleRealInfo schedule1 = sortMap.get(keyList.get(i - 1));
 				ScheduleRealInfo schedule2 = sortMap.get(keyList.get(i));
-				if(!tsSet.contains(schedule1.getId())){
-					if(sfqr == 1 && time1 > schedule1.getFcsjT()){
-						jhyysj += schedule2.getFcsjT() - time1;
-					}else if(sfqr == 1 && time2 < schedule2.getFcsjT()){
-						jhyysj += time2 - schedule1.getFcsjT();
+				if(!tsSet.contains(schedule1.getId()) && !schedule1.getBcType().toString().equals("in") && !schedule1.getBcType().toString().equals("out")){
+					long fcsj1 = schedule1.getFcsjT();
+					long fcsj2 = schedule2.getFcsjT();
+					if(tsSet.contains(schedule2.getId()) || schedule2.getBcType().toString().equals("in") || schedule2.getBcType().toString().equals("out")){
+						fcsj2 = schedule1.getZdsjT();
+					}
+					if(sfqr == 1 && time1 > fcsj1){
+						jhyysj += fcsj2 - time1;
+					}else if(sfqr == 1 && time2 < fcsj2){
+						jhyysj += time2 - fcsj1;
 					}else{
-						jhyysj += schedule2.getFcsjT() - schedule1.getFcsjT();
+						jhyysj += fcsj2 - fcsj1;
 					}
-					jhyysj1 += schedule2.getFcsjT() - schedule1.getFcsjT();
-				}
-				long zdsj2 = schedule2.getZdsjT();
-				long fcsj2 = schedule2.getFcsjT();
-				if(fcsj2 > zdsj2)
-					zdsj2 += 1440l;
-				if(sfqr == 1 && time1 > fcsj2){
-					jhyssj += zdsj2 - time1;
-				}else if(sfqr == 1 && time2 < zdsj2){
-					jhyssj += time2 - fcsj2;
-				}else{
-					jhyssj += zdsj2 - fcsj2;
+					if(jhyysj < 0){
+						System.out.println(fcsj2 + " - " + fcsj1);
+					}
+					jhyysj1 += fcsj2 - fcsj1;
 				}
-				jhyssj1 += zdsj2 - fcsj2;
-				jhlc += schedule2.getJhlc()==null?0:schedule2.getJhlc();
-				if(i == 1){
+				if(i == 1 && schedule1.getBcType().toString().equals("normal")){
 					long zdsj1 = schedule1.getZdsjT();
 					long fcsj1 = schedule1.getFcsjT();
 					if(fcsj1 > zdsj1)
@@ -984,12 +982,27 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					jhyssj1 += zdsj1 - fcsj1;
 					jhlc += schedule1.getJhlc()==null?0:schedule1.getJhlc();
 				}
+				if(schedule2.getBcType().toString().equals("normal")){
+					long zdsj2 = schedule2.getZdsjT();
+					long fcsj2 = schedule2.getFcsjT();
+					if(fcsj2 > zdsj2)
+						zdsj2 += 1440l;
+					if(sfqr == 1 && time1 > fcsj2){
+						jhyssj += zdsj2 - time1;
+					}else if(sfqr == 1 && time2 < zdsj2){
+						jhyssj += time2 - fcsj2;
+					}else{
+						jhyssj += zdsj2 - fcsj2;
+					}
+					jhyssj1 += zdsj2 - fcsj2;
+					jhlc += schedule2.getJhlc()==null?0:schedule2.getJhlc();
+				}
 			}
 			for(int i = 0; i < keyList.size(); i++){
 				Map<String, Object> m = new HashMap<String, Object>();
 				ScheduleRealInfo schedule = sortMap.get(keyList.get(i));
-				
+
 				if(cMap.containsKey(schedule.getId())){
 					List<ChildTaskPlan> cTasks = cMap.get(schedule.getId());
 					for(ChildTaskPlan childTaskPlan : cTasks){
@@ -1012,6 +1025,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 								temp.put("fcsj", null);
 							}
 						}
+						temp.put("bcType", schedule.getBcType());
 						mapList.add(temp);
 					}
 				}else{
@@ -1029,6 +1043,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						m.put("zdsj", null);
 						m.put("fcsj", null);
 					}
+					m.put("bcType", schedule.getBcType());
 					mapList.add(m);
 				}
 			}
@@ -1036,6 +1051,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(Map<String, Object> m : mapList){
 				if(m.get("fcsj") != null && m.get("fcsj").toString().trim().length()!=0){
 					keyList2.add(Long.valueOf(m.get("fcsj").toString()));
+					sortMap1.put(Long.valueOf(m.get("fcsj").toString()), m);
 				}
 			}
 			Collections.sort(keyList2);
@@ -1043,36 +1059,31 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(int i = 1; i < keyList2.size(); i++){
 				long fcsj1 = keyList2.get(i - 1);
 				long fcsj2 = keyList2.get(i);
-				if(fcsj2 - fcsj1 < 90){
-					if(sfqr == 1 && time1 > fcsj1){
-						sjyysj += fcsj2 - time1;
-					}else if(sfqr == 1 && time2 < fcsj2){
-						sjyysj += time2 - fcsj1;
-					}else{
-						sjyysj += fcsj2 - fcsj1;
-					}
-					sjyysj1 += fcsj2 - fcsj1;
+				Map<String, Object> m1 = sortMap1.get(fcsj1);
+				Map<String, Object> m2 = sortMap1.get(fcsj2);
+				if(m1.get("bcType").toString().equals("in") || m1.get("bcType").toString().equals("out"))
+					continue;
+				if(m2.get("bcType").toString().equals("in") || m2.get("bcType").toString().equals("out")){
+					fcsj2 = Long.valueOf(m1.get("zdsj").toString());
+				} else if(i == keyList.size() - 1){
+					fcsj2 = Long.valueOf(m2.get("zdsj").toString());
+				}
+				if(sfqr == 1 && time1 > fcsj1){
+					sjyysj += fcsj2 - time1;
+				}else if(sfqr == 1 && time2 < fcsj2){
+					sjyysj += time2 - fcsj1;
+				}else{
+					sjyysj += fcsj2 - fcsj1;
 				}
+				sjyysj1 += fcsj2 - fcsj1;
 			}
-			for(int i = 1; i < mapList.size(); i++){
-				Map<String, Object> m1 = mapList.get(i - 1);
-				Map<String, Object> m2 = mapList.get(i);
-//				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
-//					long fcsj2 = Long.valueOf(m2.get("fcsj").toString());
-//					long fcsj1 = Long.valueOf(m1.get("fcsj").toString());
-//					if(sfqr == 1 && time1 > fcsj1){
-//						sjyysj += fcsj2 - time1;
-//					}else if(sfqr == 1 && time2 < fcsj2){
-//						sjyysj += time2 - fcsj1;
-//					}else{
-//						sjyysj += fcsj2 - fcsj1;
-//					}
-//					sjyysj1 += fcsj2 - fcsj1;
-//				}
-				if(m2.get("fcsj") != null && m2.get("zdsj") != null){
-					long zdsj = Long.valueOf(m2.get("zdsj").toString());
-					long fcsj = Long.valueOf(m2.get("fcsj").toString());
+			for(int i = 0; i < mapList.size(); i++){
+				Map<String, Object> m = mapList.get(i);
+				if(m.get("fcsj") != null && m.get("zdsj") != null &&
+						!m.get("bcType").toString().equals("in") && !m.get("bcType").toString().equals("out")){
+					long zdsj = Long.valueOf(m.get("zdsj").toString());
+					long fcsj = Long.valueOf(m.get("fcsj").toString());
 					if(fcsj > zdsj)
 						zdsj += 1440l;
 					if(sfqr == 1 && time1 > fcsj){
@@ -1083,22 +1094,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						sjyssj += zdsj - fcsj;
 					}
 					sjyssj1 += zdsj - fcsj;
-					sjlc += Double.valueOf(m2.get("lc").toString());
-				}
-				if(i == 1 && m1.get("fcsj") != null && m1.get("zdsj") != null){
-					long zdsj = Long.valueOf(m1.get("zdsj").toString());
-					long fcsj = Long.valueOf(m1.get("fcsj").toString());
-					if(fcsj > zdsj)
-						zdsj += 1440l;
-					if(sfqr == 1 && time1 > fcsj){
-						sjyssj += zdsj - time1;
-					}else if(sfqr == 1 && time2 < zdsj){
-						sjyssj += time2 - fcsj;
-					}else{
-						sjyssj += zdsj - fcsj;
-					}
-					sjyssj1 += zdsj - fcsj;
-					sjlc += Double.valueOf(m1.get("lc").toString());
+					sjlc += Double.valueOf(m.get("lc").toString());
 				}
 			}
 			tempMap.put("company", companyName);
@@ -9,6 +9,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -428,13 +430,22 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 //					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
-			// 前一天所有车辆最后进场班次信息
-//			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
-//			List<Dlb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
-//			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 从排班表中计算出行驶的总里程
 			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
 			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
+		    Map<String, Double> lcMap=new HashMap<String,Double>();
+			for (int i = 0; i < listpbs.size(); i++) {
+				String cl=listpbs.get(i).get("clZbh").toString();
+				Double lc= listpbs.get(i).get("totalKilometers") == null ? 0.0
+						: Double.parseDouble(listpbs.get(i).get("totalKilometers").toString());
+				if(lcMap.get(cl)==null){
+					lcMap.put(cl, lc);
+				}else{
+					Double lc_=lcMap.get(cl);
+					lcMap.remove(cl);
+					lcMap.put(cl, Arith.add(lc, lc_));
+				}
+			}
 			List<Jdl> jdlList=jdlRepository.JdlList(rq);
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
@@ -470,126 +481,134 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					}
 				}
 			}
-			
+			Map<String, Object> newMap_=new HashMap<String,Object>();
 			List<Dlb> addList = new ArrayList<Dlb>();
 			List<Dlb> updateList = new ArrayList<Dlb>();
 			String ins="";
 			Map<String, Object> ylMap=new HashMap<String, Object>();
-			for (int x = 0; x < listpb.size(); x++) {
+			List<Map<String, Object>> listpb_=listpb;
+			Collections.sort(listpb,new NbbmJcsxMap());
+			for (int x = 0; x < listpb_.size(); x++) {
 				String type = "add";
 				boolean sfdc = false;
-				Map<String, Object> map = listpb.get(x);
-				if (carsMap.get(map.get("clZbh").toString()) != null) {
-					sfdc = carsMap.get(map.get("clZbh").toString());
+				Map<String, Object> map_ = listpb_.get(x);
+				if (carsMap.get(map_.get("clZbh").toString()) != null) {
+					sfdc = carsMap.get(map_.get("clZbh").toString());
 				} else {
 					sfdc = false;
 				}
 				if (sfdc) {
-					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
-					Dlb t = new Dlb();
-					for (int k = 0; k < dlList.size(); k++) {
-						Dlb t1 = dlList.get(k);
-						if (t1.getNbbm().equals(map.get("clZbh").toString())
-								&& t1.getJsy().equals(map.get("jGh").toString())
-								&& t1.getXlbm().equals(map.get("xlBm").toString())) {
-							t = t1;
-							type = "update";
+					if(newMap_.get(map_.get("clZbh").toString())==null){
+						newMap_.put(map_.get("clZbh").toString(), map_.get("clZbh").toString());
+						//车辆总里程
+						double zlc =lcMap.get(map_.get("clZbh").toString());
+						//车辆总加电量
+						Double zjzl = 0.0;
+						for (int j = 0; j < ylxxList.size(); j++) {
+							Ylxxb ylxxb = ylxxList.get(j);
+							if (map_.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& map_.get("company").toString().equals(ylxxb.getGsdm())) {
+								zjzl = Arith.add(zjzl, ylxxb.getJzl());
+							}
 						}
-					}
-
-					// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
-				/*	if (map.get("seqNumber").toString().equals("1")) {
-						boolean fage = true;
-						for (int i = 0; i < ylListBe.size(); i++) {
-							Ylb ylb = ylListBe.get(i);
-							if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
-								if(ylb.getJzyl()>0){
-									t.setCzyl(ylb.getJzyl());
-									fage = false;
-									break;
-								}
-								
+						for (int i = 0; i < jdlList.size(); i++) {
+							Jdl jdl=jdlList.get(i);
+							if(map_.get("clZbh").toString().equals(jdl.getNbbm()) 
+									&&map_.get("company").toString().equals(jdl.getGsBm())
+									&&map_.get("bCompany").toString().equals(jdl.getFgsBm())){
+								zjzl = Arith.add(zjzl,jdl.getJdl());
 							}
 						}
-						if (fage) {
-							for (int y = 0; y < clyList.size(); y++) {
-								Cyl cyl = clyList.get(y);
-								if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
-									if(cyl!=null){
-										if(cyl.getCyl()>=0){
-											t.setCzyl(cyl.getCyl());
-											fage = false;
-											break;
-										}else {
-											if(cyl.getCxrl()!=null){
-												if(cyl.getCxrl()>0){
-													t.setCzyl(cyl.getCxrl());
-													fage = false;
-													break;
-												}
+						
+						Double nextJzyl = 0.0;
+						for (int i = 0; i < listpb.size(); i++) {
+							Map<String, Object> map = listpb.get(i);
+							if(map_.get("clZbh").toString().equals(map.get("clZbh").toString())){
+								// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+								Dlb t = new Dlb();
+								for (int k = 0; k < dlList.size(); k++) {
+									Dlb t1 = dlList.get(k);
+									if (t1.getNbbm().equals(map.get("clZbh").toString())
+											&& t1.getJsy().equals(map.get("jGh").toString())
+											&& t1.getXlbm().equals(map.get("xlBm").toString())) {
+										t = t1;
+										type = "update";
+									}
+								}
+								Double lc= Double.parseDouble(map.get("totalKilometers").toString());
+								if(map.get("seqNumber").toString().equals("1")){
+									// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+									Double dh=0.0;
+									if(zlc>0){
+										dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+									}
+									nextJzyl =Arith.sub(zjzl,dh);
+									if(zlc>0){
+										long l=Math.round(nextJzyl);
+										double ylxs=l*100/100;
+										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+										t.setHd(dh);
+										t.setCdl(dh);
+										nextJzyl=ylxs;
+									}else{
+										t.setHd(0.0);
+										t.setCdl(0.0);
+									}
+								}else{
+									Double dh=0.0;
+									if(zlc>0){
+										dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+									}
+									nextJzyl =Arith.sub( nextJzyl,dh);
+									if(zlc>0){
+										long l=0l;
+										double ylxs=0.0;
+										if(i==listpb.size()-1){
+//											ylxs=czyl;
+										}else{
+											if(listpb.get(i+1).get("clZbh").toString().equals(map.get("clZbh").toString())){
+												l=Math.round(nextJzyl);
+												ylxs=l*100/100;
 											}
+											
 										}
+										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+										t.setHd(dh);
+										t.setCdl(dh);
+										nextJzyl=ylxs;
+									}else{
+										t.setHd(0.0);
+										t.setCdl(0.0);
 									}
 								}
+								t.setCzcd(100.0);
+								t.setJzcd(100.0);
+								t.setNbbm(map.get("clZbh").toString());
+								t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
+								t.setZlc(map.get("totalKilometers") == null ? 0.0
+										: Double.parseDouble(map.get("totalKilometers").toString()));
+								t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+								t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+								t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
+								t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
+								t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+								t.setRq(sdf.parse(rq));
+								
+								 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+									 if(type.equals("add")){
+										 t.setCreatetime(date);
+										 addList.add(t); 
+									 }else{
+										 t.setUpdatetime(date);
+									     updateList.add(t); 
+									     ins += t.getId().toString()+",";
+									  }
+								 }
+//								repository.save(t);
+								newMap.put("status", ResponseCode.SUCCESS);
 							}
 						}
-						if (fage) {
-							t.setCzyl(0.0);
-						}
-					}
-					*/
-					Double jzl = 0.0;
-					//一人一车加注量只匹配一次
-					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())!=null){
-						
-					}else{
-						// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
-						for (int j = 0; j < ylxxList.size(); j++) {
-							Ylxxb ylxxb = ylxxList.get(j);
-							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
-									&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
-								jzl +=Arith.add(jzl, ylxxb.getJzl());
-							}
-						}
-						ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
 					}
-					for (int i = 0; i < jdlList.size(); i++) {
-						Jdl jdl=jdlList.get(i);
-						if(map.get("clZbh").toString().equals(jdl.getNbbm()) 
-								&&map.get("jGh").toString().equals(jdl.getJsy())
-								&&map.get("bCompany").toString().equals(jdl.getFgsBm())){
-							jzl+=jdl.getJdl();
-						}
-					}
-				
-					t.setCdl(jzl);
-					t.setCzcd(100.0);
-					t.setJzcd(100.0);
-					t.setHd(jzl);
-					t.setNbbm(map.get("clZbh").toString());
-					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
-					t.setZlc(map.get("totalKilometers") == null ? 0.0
-							: Double.parseDouble(map.get("totalKilometers").toString()));
-					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
-					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
-					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
-					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
-					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
-					t.setRq(sdf.parse(rq));
-					
-					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
-						 if(type.equals("add")){
-							 t.setCreatetime(date);
-							 addList.add(t); 
-						 }else{
-							 t.setUpdatetime(date);
-						     updateList.add(t); 
-						     ins += t.getId().toString()+",";
-						  }
-					 }
-//					repository.save(t);
-					newMap.put("status", ResponseCode.SUCCESS);
-
 				}
 			}
 			if(addList.size()>0){ 
@@ -1014,3 +1033,11 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		return lists;
 	}
 }
+
+class NbbmJcsxMap implements Comparator<Map<String, Object>>{
+	 @Override
+		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+			// TODO Auto-generated method stub
+			return  (o1.get("clZbh").toString()+o1.get("seqNumber").toString()).compareTo((o2.get("clZbh").toString()+o1.get("seqNumber").toString()));
+		}
+}
@@ -63,7 +63,7 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				}
 				String[] split = (text+";").split(",");
 				String str = "";
-				for(int j = 0; j < split.length && j < 6; j++){
+				for(int j = 0; j < split.length && j < 5; j++){
 					str += split[j];
 				}
 				if(str.trim().length() == 0)
@@ -75,22 +75,22 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				String[] split = text.split(",");
 				String rq = split[0].trim();
 				String nbbm = split[1].trim();
-				String jsy= split[2].trim();
-				double jdl = Double.valueOf(split[3].trim().length()!=0?split[3]:"0");
-				String jdz = split[4].trim();
-				String remarks = split[5].trim();
+//				String jsy= split[2].trim();
+				double jdl = Double.valueOf(split[2].trim().length()!=0?split[2]:"0");
+				String jdz = split[3].trim();
+				String remarks = split[4].trim();
 				if(rq.trim().length() == 0){
 					rq = sdf.format(new Date());
 				}
-				List<Double> jdl_ = repository.queryBySame(gsbm, fgsbm, rq, nbbm, jsy);
+				List<Double> jdl_ = repository.queryBySame(gsbm, fgsbm, rq, nbbm);
 				if(jdl_.size() == 0){
 					repository.insertData(gsbm, gsName, fgsbm, fgsName, rq, nbbm,
-							df.format(jdl), jdz, remarks, sd.format(new Date()),jsy);
+							df.format(jdl), jdz, remarks, sd.format(new Date()));
 				}else{
 //					jdl += jdl_.get(0);
-					repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm, jsy);
+					repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm);
 				}
 			}
 			wb.close();
@@ -112,9 +112,9 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 		String fgsbm = map.get("fgsbm").toString();
 		String rq = map.get("rq").toString();
 		String nbbm = map.get("nbbm").toString();
-		String jsy =map.get("jsy").toString();
+//		String jsy =map.get("jsy").toString();
 		Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
-		List<Jdl> query = repository.query(gsbm, fgsbm, rq, nbbm,jsy);
+		List<Jdl> query = repository.query(gsbm, fgsbm, rq, nbbm);
 		if(!map.containsKey("type")){
@@ -133,7 +133,6 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				m.put("nbbm", jdl.getNbbm());
 				m.put("jdl", jdl.getJdl());
 				m.put("jdz", jdl.getJdz());
-				m.put("jsy", jdl.getJsy());
 				m.put("remarks", jdl.getRemarks());
 				list.add(m);
 			}
@@ -180,4 +180,10 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     List<Map<String,Object>> statisticsDaily_mh_2(String line, String date, String xlName, String type);
 	List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date);
+
+	List<Map<String, Object>> mileageReport(String gsdm, String fgsdm,
+			String line, String date, String date2);
+	
+	List<Map<String, Object>> scheduleCorrectionReport(String gsdm, String fgsdm,
+			String line, String date, String date2);
 }
@@ -31,6 +31,8 @@ import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.realcontrol.SvgAttribute;
+import com.bsth.entity.report.MileageReport;
+import com.bsth.entity.report.ScheduleCorrectionReport;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.GuideboardInfo;
@@ -1837,7 +1839,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 map = new HashMap<String, Object>();
                  map.put("num", i++);
                  map.put("xlName", xlName);
-                 map.put("clZbh", BasicData.deviceId2NbbmMap.get(obj[2]));
+                 map.put("clZbh", BasicData.deviceId2NbbmMap.get(obj[2])==null?"":BasicData.deviceId2NbbmMap.get(obj[2]));
                  map.put("company",fgs);
                  map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[0] + "")).toUpperCase());
                  map.put("requestTime", obj[1]);
@@ -2324,10 +2326,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("dtbc", 0);
         map.put("dtbc_m", 0);
         map.put("dtbc_a", 0);
-        map.put("djg", 0);
-        map.put("djg_m", 0);
-        map.put("djg_a", 0);
-        map.put("djg_time", 0);
+        Map<String, Object> m=culateService.culateDjg(list_s, line);
+        map.put("djg", m.get("djgcsq"));
+        map.put("djg_m", m.get("djgcsz"));
+        map.put("djg_a", m.get("djgcsw"));
+        map.put("djg_time", m.get("djgsj"));
         map.put("jls", Arith.sub(Arith.add(jhlc, ljgl), lbgl));
         lMap.add(map);
         return lMap;
@@ -4637,6 +4640,195 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         return rs;
     }
+    
+
+	@Override
+	public List<Map<String, Object>> mileageReport(String gsdm,
+			String fgsdm, String line, String date, String date2) {
+		
+		String sql = "select * from calc_mileage where 1=1 " ;
+		if (!line.equals(" ")) {
+			sql = sql+" and line_code='"+ line+"' ";
+		}
+		sql = sql+" and DATE_FORMAT(rq,'%Y-%m-%d') between '"+ date+"'  and '"+ date2+"'";
+		if (!gsdm.equals(" ")) {
+			sql = sql+" and company_id="+gsdm;
+		}
+		if (!gsdm.equals(" ")) {
+			sql = sql+" and sub_company_id="+fgsdm;
+		}
+		sql = sql+" order by line_code";
+		List<MileageReport> list = jdbcTemplate.query(sql,
+                new RowMapper<MileageReport>() {
+                    @Override
+                    public MileageReport mapRow(ResultSet rs, int rowNum) throws SQLException {
+                    	MileageReport mr = new MileageReport();
+                        mr.setCompanyName(rs.getString("company_name"));
+                        mr.setSubCompanyName(rs.getString("sub_company_name"));
+                        mr.setLineName(rs.getString("line_name"));
+                        mr.setSjyygl(rs.getDouble("sjyygl"));
+                        mr.setSjksgl(rs.getDouble("sjksgl"));
+                        mr.setZgl(rs.getDouble("zyygl"));
+                        mr.setZddfgl(rs.getDouble("sddfgl"));
+                        mr.setSddfgl(rs.getDouble("zddfgl"));
+                        mr.setWqwxhgl(rs.getDouble("wqwxhgl"));
+                        mr.setBfwxhgl(rs.getDouble("bfwxhgl"));
+                        mr.setPygl(rs.getDouble("pygl"));
+                        mr.setLjgl(rs.getDouble("ljgl"));
+                        mr.setZrwgl(rs.getDouble("zrwgl"));
+                        mr.setOther(rs.getString("other"));
+                        return mr;
+                    }
+                });
+		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+		double sjyygl = 0.0;
+		double sjksgl = 0.0;
+		double zgl = 0.0;
+		double sddfgl = 0.0;
+		double zddfgl = 0.0;
+		double wqwxhgl = 0.0;
+		double bfwxhgl = 0.0;
+		double pygl = 0.0;
+		double ljgl = 0.0;
+		double zrwgl = 0.0;
+		for(MileageReport mr:list) {
+			Map<String, Object> resMap = new HashMap<String, Object>();
+			resMap.put("gsName", mr.getCompanyName());
+			resMap.put("fgsName", mr.getSubCompanyName());
+			resMap.put("xlName", mr.getLineName());
+			resMap.put("sjyygl", mr.getSjyygl());
+			resMap.put("sjksgl", mr.getSjksgl());
+			resMap.put("zgl", mr.getZgl());
+			resMap.put("sddfgl", mr.getSddfgl());
+			resMap.put("zddfgl", mr.getZddfgl());
+			resMap.put("wqwxhgl", mr.getWqwxhgl());
+			resMap.put("bfwxhgl", mr.getBfwxhgl());
+			resMap.put("pygl", mr.getPygl());
+			resMap.put("ljgl", mr.getLjgl());
+			resMap.put("zrwgl", mr.getZrwgl());
+			resMap.put("other", mr.getOther());
+			lMap.add(resMap);
+			sjyygl = Arith.add(sjyygl,mr.getSjyygl());
+			sjksgl = Arith.add(sjksgl,mr.getSjksgl());
+			zgl = Arith.add(zgl,mr.getZgl());
+			sddfgl = Arith.add(sddfgl,mr.getSddfgl());
+			zddfgl = Arith.add(zddfgl,mr.getZddfgl());
+			wqwxhgl = Arith.add(wqwxhgl,mr.getWqwxhgl());
+			bfwxhgl = Arith.add(bfwxhgl,mr.getBfwxhgl());
+			pygl = Arith.add(pygl,mr.getPygl());
+			ljgl = Arith.add(ljgl,mr.getLjgl());
+			zrwgl = Arith.add(zrwgl,mr.getZrwgl());
+		}
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		resMap.put("xlName", "合计");
+		resMap.put("sjyygl", sjyygl);
+		resMap.put("sjksgl", sjksgl);
+		resMap.put("zgl", zgl);
+		resMap.put("sddfgl", sddfgl);
+		resMap.put("zddfgl", zddfgl);
+		resMap.put("wqwxhgl", wqwxhgl);
+		resMap.put("bfwxhgl", bfwxhgl);
+		resMap.put("pygl", pygl);
+		resMap.put("ljgl", ljgl);
+		resMap.put("zrwgl", zrwgl);
+		resMap.put("other", null);
+		lMap.add(resMap);
+		return lMap;
+	}
+	
+	@Override
+	public List<Map<String, Object>> scheduleCorrectionReport(String gsdm,
+			String fgsdm, String line, String date, String date2) {
+		
+		String sql = "select * from calc_schedule where 1=1 " ;
+		if (!line.equals(" ")) {
+			sql = sql+" and line_code='"+ line+"' ";
+		}
+		sql = sql+" and DATE_FORMAT(rq,'%Y-%m-%d') between '"+ date+"'  and '"+ date2+"'";
+		if (!gsdm.equals(" ")) {
+			sql = sql+" and company_id="+gsdm;
+		}
+		if (!gsdm.equals(" ")) {
+			sql = sql+" and sub_company_id="+fgsdm;
+		}
+		sql = sql+" order by line_code";
+		List<ScheduleCorrectionReport> list = jdbcTemplate.query(sql,
+				new RowMapper<ScheduleCorrectionReport>() {
+			@Override
+			public ScheduleCorrectionReport mapRow(ResultSet rs, int rowNum) throws SQLException {
+				ScheduleCorrectionReport sReport = new ScheduleCorrectionReport();
+				sReport.setCompanyName(rs.getString("company_name"));
+				sReport.setSubCompanyName(rs.getString("sub_company_name"));
+				sReport.setLineName(rs.getString("line_name"));
+				sReport.setSjyybc(rs.getInt("sjyybc"));
+				sReport.setSjksbc(rs.getInt("sjksbc"));
+				sReport.setZbc(rs.getInt("zyybc"));
+				sReport.setZddfbc(rs.getInt("sddfbc"));
+				sReport.setSddfbc(rs.getInt("zddfbc"));
+				sReport.setWqwxhbc(rs.getInt("wqwxhbc"));
+				sReport.setBfwxhbc(rs.getInt("bfwxhbc"));
+				sReport.setPybc(rs.getInt("pybc"));
+				sReport.setLjbc(rs.getInt("ljbc"));
+				sReport.setZrwbc(rs.getInt("zrwbc"));
+				sReport.setOther(rs.getString("other"));
+				return sReport;
+			}
+		});
+		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+		int sjyybc = 0;
+		int sjksbc = 0;
+		int zbc = 0;
+		int sddfbc = 0;
+		int zddfbc = 0;
+		int wqwxhbc = 0;
+		int bfwxhbc = 0;
+		int pybc = 0;
+		int ljbc = 0;
+		int zrwbc = 0;
+		for(ScheduleCorrectionReport sReport:list) {
+			Map<String, Object> resMap = new HashMap<String, Object>();
+			resMap.put("gsName", sReport.getCompanyName());
+			resMap.put("fgsName", sReport.getSubCompanyName());
+			resMap.put("xlName", sReport.getLineName());
+			resMap.put("sjyybc", sReport.getSjyybc());
+			resMap.put("sjksbc", sReport.getSjksbc());
+			resMap.put("zbc", sReport.getZbc());
+			resMap.put("sddfbc", sReport.getSddfbc());
+			resMap.put("zddfbc", sReport.getZddfbc());
+			resMap.put("wqwxhbc", sReport.getWqwxhbc());
+			resMap.put("bfwxhbc", sReport.getBfwxhbc());
+			resMap.put("pybc", sReport.getPybc());
+			resMap.put("ljbc", sReport.getLjbc());
+			resMap.put("zrwbc", sReport.getZrwbc());
+			resMap.put("other", sReport.getOther());
+			lMap.add(resMap);
+			sjyybc = sjyybc + sReport.getSjyybc();
+			sjksbc = sjksbc + sReport.getSjksbc();
+			zbc = zbc + sReport.getZbc();
+			sddfbc = sddfbc + sReport.getSddfbc();
+			zddfbc = zddfbc + sReport.getZddfbc();
+			wqwxhbc = wqwxhbc + sReport.getWqwxhbc();
+			bfwxhbc = bfwxhbc + sReport.getBfwxhbc();
+			pybc = pybc + sReport.getPybc();
+			ljbc = ljbc + sReport.getLjbc();
+			zrwbc = zrwbc + sReport.getZrwbc();
+		}
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		resMap.put("xlName", "合计");
+		resMap.put("sjyybc", sjyybc);
+		resMap.put("sjksbc", sjksbc);
+		resMap.put("zbc", zbc);
+		resMap.put("sddfbc", sddfbc);
+		resMap.put("zddfbc", zddfbc);
+		resMap.put("wqwxhbc", wqwxhbc);
+		resMap.put("bfwxhbc", bfwxhbc);
+		resMap.put("pybc", pybc);
+		resMap.put("ljbc", ljbc);
+		resMap.put("zrwbc", zrwbc);
+		resMap.put("other", null);
+		lMap.add(resMap);
+		return lMap;
+	}
 }
 class AccountMap implements Comparator<Map<String, Object>>{
@@ -30,6 +30,8 @@ public interface CulateMileageService {
 	 int culateFzbc(List<ScheduleRealInfo> lists,String item);
+	 Map<String, Object> culateDjg(List<ScheduleRealInfo> lists,String line);
+	 
 	 //以下计算方法供新报表使用
@@ -17,6 +17,8 @@ public interface ReportService {
 	List<ArrivalInfo> queryListClzd(String line,String zd,String zdlx,String fcsj,String ddsj);
 	List<StationRoute> queryStrinon(String line,int zd);
 	List<Map<String, Object>> queryInOutStrtion(String line,String date,int zd,String lzsj);
+	
+	List<Map<String, Object>> queryInOutStrtions(String line,String date,int zd,String lzsj);
 	List<Map<String, String>>  sreachZd(String line,int zdlx);
 	List<Object[]> historyMessageCount(String line, String date, String code);
 package com.bsth.service.report.impl;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -9,18 +14,26 @@ import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import com.bsth.data.BasicData;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.Interval;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
+import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableJob;
+import com.bsth.util.ReportUtils;
 import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
 @Service
 public class CulateMileageServiceImpl  implements CulateMileageService{
-
+	@Autowired
+	JdbcTemplate jdbcTemplate;
 	private static long zgf1 = 6 * 60 + 31,
 			zgf2 = 8 * 60 + 30,
 			wgf1 = 16 * 60 + 1, 
@@ -943,6 +956,214 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		}
 		return kfks;
 	}
+
+	@Override
+	public Map<String, Object> culateDjg(List<ScheduleRealInfo> lists, String line) {
+		// TODO Auto-generated method stub
+		
+
+		// TODO Auto-generated method stub
+		List<ScheduleRealInfo> list=lists;
+		Map<String, Object> m=new HashMap<String,Object>();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+//			 Collections.sort(listInfo,new ComparableAcuals());
+			 //查询所有线路
+			 String xlSql="select line_code,spac_grade from bsth_c_line"
+			 		+ "  where line_code ='"+line+"'";
+			 
+			List<Map<String, Object>> xlList=jdbcTemplate.query(xlSql, new RowMapper<Map<String, Object>>() {
+			@Override
+			public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Map<String, Object> map=new HashMap<String,Object>();
+				map.put("line",arg0.getString("line_code"));
+				map.put("grade", arg0.getString("spac_grade"));
+				return map;
+			}
+		});
+			//查询大间隔时间
+			String djgSql="select * from bsth_c_interval";
+			List<Interval> djgList=jdbcTemplate.query(djgSql, new RowMapper<Interval>() {
+			@Override
+			public Interval mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Interval m=new Interval();
+				m.setLevel(arg0.getString("level"));
+				m.setPeak(arg0.getInt("peak"));
+				m.setTrough(arg0.getInt("trough"));
+				return m;
+			}
+		});
+			
+			 for (int i = 0; i < xlList.size(); i++) {
+				 String lineCode=xlList.get(i).get("line").toString();
+				 String grade =xlList.get(i).get("grade")==null?"1":xlList.get(i).get("grade").toString();
+				 int peak=0;
+				 int trough=0;
+				 for (int j = 0; j < djgList.size(); j++) {
+					Interval il=djgList.get(j);
+					if(il.getLevel().equals(grade)){
+						peak=il.getPeak();
+						trough=il.getTrough();
+						continue;
+					}
+			 }
+				List<ScheduleRealInfo> listInfo=new ArrayList<ScheduleRealInfo>();
+				 for (int j = 0; j < list.size(); j++) {
+					ScheduleRealInfo sinfo=list.get(j);
+					try {
+					if(sinfo.getXlBm().equals(lineCode)){
+						ScheduleRealInfo s=checkBc(sinfo);
+						String fcsj=s.getFcsjActual()==null?"":s.getFcsjActual();
+						if(!fcsj.equals("")){
+							Long fcsjAcual = sdf.parse(s.getRealExecDate() + " " + s.getFcsjActual()).getTime();
+							s.setFcsjActualTime(fcsjAcual);
+							s.setFcsjActual(fcsj);
+							listInfo.add(s);
+						}
+						
+					}
+					} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			 }
+				 
+			 if(listInfo.size()>0){
+				  m=listDjg(peak,trough,listInfo,grade);
+			 }else{
+				 m.put("djgcsz", "0");
+				 m.put("djgcsw", "0");
+				 m.put("djgcsq", "0");
+				 m.put("djgsj", "0");
+			 }
+		}
+		return m;
+	
+	}
+	
+	public ScheduleRealInfo checkBc(ScheduleRealInfo s){
+		//如果班次有子任务 且 子任务中有属于营运的。把该子任务的发车时间设置成班次的发车时间
+		String fcsj=s.getFcsjActual()==null?"":s.getFcsjActual();
+		if(fcsj.equals("")){
+			Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+			if(!childTaskPlans.isEmpty()){
+					List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
+		       	    Collections.sort(listit, new ComparableChild());
+		       	    for (int i = 0; i < listit.size(); i++) {
+		       	    	ChildTaskPlan c=listit.get(i);
+		       	    	if(!c.isDestroy()){
+		       	    		if(c.getMileageType().equals("service")){
+		       	    			s.setFcsjActual(c.getStartDate());
+								break;
+							}
+							
+		       	    	}
+					}
+			}
+		}
+		return s;
+	}
+	public Map<String, Object> listDjg(int peak,int trough,List<ScheduleRealInfo> listInfo,String grade){
+		DecimalFormat  df   = new DecimalFormat("#0.00"); 
+		Collections.sort(listInfo,new ComparableAcuals());
+		List<ScheduleRealInfo> listInfo0=new ArrayList<ScheduleRealInfo>();
+		List<ScheduleRealInfo> listInfo1=new ArrayList<ScheduleRealInfo>();
+		for (int i = 0; i < listInfo.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			if(s.getXlDir().equals("0")){
+				listInfo0.add(s);
+			}else{
+				listInfo0.add(s);
+			}
+			
+		}
+		Map<String, Object> map=new HashMap<String,Object>();
+		int djgcsz=0;
+		int djgcsw=0;
+		int djgcsq=0;
+		long djcsj=0l;
+		for (int i = 0; i < listInfo0.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			Long fcsjTime=s.getFcsjActualTime();
+			String time=s.getFcsjActual();
+			String[] fcsjStr = time.split(":");
+			long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+			if(i<listInfo.size()-1){
+				Long djg=0l;
+				Long fscjNext=listInfo.get(i+1).getFcsjActualTime();
+				if((fcsj>=zgf1&&fcsj<=zgf2)){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsz ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else if((fcsj>=wgf1&&fcsj<=wgf2)){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsw ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else{
+					djg = (long) (trough*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}
+			}
+		}
+		for (int i = 0; i < listInfo1.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			Long fcsjTime=s.getFcsjActualTime();
+			String time=s.getFcsjActual();
+			String[] fcsjStr = time.split(":");
+			long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+			if(i<listInfo.size()-1){
+				Long djg=0l;
+				Long fscjNext=listInfo.get(i+1).getFcsjActualTime();
+				if(fcsj>=zgf1&&fcsj<=zgf2){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsz ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else if(fcsj>=wgf1&&fcsj<=wgf2){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsw ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else{
+					djg = (long) (trough*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}
+			}
+		}
+		
+		map.put("djgcsz", djgcsz);
+		map.put("djgcsw", djgcsw);
+		map.put("djgcsq", djgcsq);
+		map.put("djgsj", djcsj);
+		return map;
+	}
 }
@@ -598,7 +598,7 @@ public class ReportServiceImpl implements ReportService{
 		        String sqlCl="SELECT cl_zbh,qdz_name,bc_type,fcsj,bcsj FROM"
 		        		+ "  bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
-		        		+ " AND bc_type = 'normal' order by qdz_name";
+		        		+ " AND  (bc_type = 'normal' or bc_type='region') order by qdz_name";
         List<Map<String, Object>> listj= jdbcTemplate.query(sqlCl,
 				 new RowMapper<Map<String, Object>>(){
@@ -873,7 +873,7 @@ public class ReportServiceImpl implements ReportService{
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
 						+ " fcsj > '"+minfcsj+"'  and bc_type!='ldks' "
 								+ " and bc_type !='region') "
-						+ " order by xl_dir, xh, lp,fcsj";
+						+ " order by  xh, lp,fcsj";
 				Map<String, Object> map=new HashMap<String,Object>();
 				List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
 						new RowMapper<Map<String, Object>>(){
@@ -915,6 +915,8 @@ public class ReportServiceImpl implements ReportService{
 		int temp = 48*60+1, zcj = 0;
 		boolean ists = true;
 		String lpname="";
+		int dir =-1;
+		int fcsjT_= 0;
 		for (int i = 0; i < list.size(); i++) {
 			Map<String, Object> m=list.get(i);
 			int xlDir = Integer.valueOf(m.get("dir").toString());
@@ -927,6 +929,10 @@ public class ReportServiceImpl implements ReportService{
 				if(temp>fcsjT){
 					temp=fcsjT+bcsj;
 				}
+				dir =xlDir;
+				if(bcType.equals("in") || bcType.equals("out")){
+					ists=false;
+				}
 			}else{
 				if(temp>fcsjT){
 					temp=fcsjT+bcsj;
@@ -934,74 +940,146 @@ public class ReportServiceImpl implements ReportService{
 				if(bcType.equals("in") || bcType.equals("out")){
 					temp = fcsjT+bcsj;
 					lpname=m.get("lp").toString();
+					dir =xlDir;
 					ists=false;
 				}else{
-//					if(ists){
-//						temp = fcsjT+bcsj;
-//						lpname=m.get("lp").toString();
-//					}else{
-						if(xlDir==0){
+//						if(xlDir==0){
 							//上行数据
 							if(fcsjT>= minSj && fcsjT <= 6*60+30){
 								//早高峰前
-								yysxZq +=bcsj;
-								sxcountZqbc ++;
-								zqFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxZq +=bcsj;
+									sxcountZqbc ++;
+									zqFcsj0.add(fcsjT);
+								}else{
+									yyxxZq +=bcsj;
+									xxcountZqbc ++;
+									zqFcsj1.add(fcsjT);
+								}
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxZq +=fcsjT-temp;
+										if(dir==0)
+											tzsxZq +=fcsjT-temp;
+										else
+											tzxxZq +=fcsjT-temp;
 									}
 								}
 								temp = fcsjT+bcsj;
 							}else if(fcsjT > 6*60+30 && fcsjT <= 8*60+30){
 								//早高峰
-								yysxZgf +=bcsj;
-								sxcountZgfbc ++;
-								zgfFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxZgf +=bcsj;
+									sxcountZgfbc ++;
+									zgfFcsj0.add(fcsjT);
+								}else{
+									yyxxZgf +=bcsj;
+									xxcountZgfbc ++;
+									zgfFcsj1.add(fcsjT);
+								}
+								
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxZgf +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT>= minSj && fcsjT <= 6*60+30)
+												tzsxZq +=fcsjT-temp;
+											else
+												tzsxZgf +=fcsjT-temp;
+										}else{
+											if(fcsjT_>= minSj && fcsjT_ <= 6*60+30)
+												tzxxZq +=fcsjT-temp;
+											else
+											    tzxxZgf +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}else if(fcsjT > 8*60+30 && fcsjT <= 16*60){
 								//中午
-								yysxZw +=bcsj;
-								sxcountZwbc ++;
-								zwFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxZw +=bcsj;
+									sxcountZwbc ++;
+									zwFcsj0.add(fcsjT);
+								}else{
+									yyxxZw +=bcsj;
+									xxcountZwbc ++;
+									zwFcsj1.add(fcsjT);
+								}
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxZw +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+												tzsxZgf +=fcsjT-temp;
+											else
+											    tzsxZw +=fcsjT-temp;
+										}else{
+											if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+												tzxxZgf +=fcsjT-temp;
+											else
+											    tzxxZw +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}else if(fcsjT > 16*60 && fcsjT <= 18*60){
 								//晚高峰
-								yysxWgf +=bcsj;
-								sxcountWgfbc ++;
-								wgfFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxWgf +=bcsj;
+									sxcountWgfbc ++;
+									wgfFcsj0.add(fcsjT);
+								}else{
+									yyxxWgf +=bcsj;
+									xxcountWgfbc ++;
+									wgfFcsj1.add(fcsjT);
+								}
+								
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxWgf +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+												tzsxZw +=fcsjT-temp;
+											else	
+											    tzsxWgf +=fcsjT-temp;
+										}else{
+											if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+												 tzxxZw +=fcsjT-temp;
+											else
+												 tzxxWgf +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}else{
 								//晚高峰后
-								yysxWh +=bcsj;
-								sxcountWhbc ++;
-								whFcsj0.add(fcsjT);
+								if(xlDir==0){
+									yysxWh +=bcsj;
+									sxcountWhbc ++;
+									whFcsj0.add(fcsjT);
+								}else{
+									yyxxWh +=bcsj;
+									xxcountWhbc ++;
+									whFcsj1.add(fcsjT);
+								}
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzsxWh +=fcsjT-temp;
+										if(dir==0){
+											if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+												tzsxWgf +=fcsjT-temp;
+											else
+											    tzsxWh +=fcsjT-temp;
+										}else{
+											if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+												tzxxWgf +=fcsjT-temp;
+											else
+											    tzxxWh +=fcsjT-temp;
+										}
 									}
 								}
 								temp =fcsjT+bcsj;
 							}
-							lpname=m.get("lp").toString();
-						}else{
+							
+						/*}else{
 							//下行数据
 							if(fcsjT>= minSj && fcsjT <= 6*60+30){
 								//早高峰前
@@ -1021,7 +1099,10 @@ public class ReportServiceImpl implements ReportService{
 								zgfFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxZgf +=fcsjT-temp;
+										if(fcsjT_>= minSj && fcsjT_ <= 6*60+30)
+											tzxxZq +=fcsjT-temp;
+										else
+										    tzxxZgf +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
@@ -1032,7 +1113,10 @@ public class ReportServiceImpl implements ReportService{
 								zwFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxZw +=fcsjT-temp;
+										if(fcsjT_ > 6*60+30 && fcsjT_ <= 8*60+30)
+											tzxxZgf +=fcsjT-temp;
+										else
+										    tzxxZw +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
@@ -1043,7 +1127,10 @@ public class ReportServiceImpl implements ReportService{
 								wgfFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxWgf +=fcsjT-temp;
+										if(fcsjT_ > 8*60+30 && fcsjT_ <= 16*60)
+											 tzxxZw +=fcsjT-temp;
+										else
+											 tzxxWgf +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
@@ -1054,20 +1141,27 @@ public class ReportServiceImpl implements ReportService{
 								whFcsj1.add(fcsjT);
 								if(ists){
 									if(lpname.equals(m.get("lp").toString())){
-										tzxxWh +=fcsjT-temp;
+										if(fcsjT_ > 16*60 && fcsjT_ <= 18*60)
+											tzxxWgf +=fcsjT-temp;
+										else
+										    tzxxWh +=fcsjT-temp;
 									}
 								}
 								temp =fcsjT+bcsj;
 							}
 //						}
-					}
+					}*/
+						lpname=m.get("lp").toString();
+						fcsjT_=fcsjT;
+						dir =xlDir;
+						if(m.get("ists").toString().trim().equals("1")){
+							ists=false;
+						}else{
+							ists = true;
+						}
 			    }
 			}
-			if(m.get("ists").toString().trim().equals("1")){
-				ists=false;
-			}else{
-				ists = true;
-			}
+			
 		}
 		//---------------------------------------早前
@@ -1885,6 +1979,50 @@ public class ReportServiceImpl implements ReportService{
 	        return list;
 		}
+		public List<ArrivalInfo> load4(String line, String date, int zd,String minfcsj){
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+			Long date1=0L;
+			Long date2=0L;
+			Calendar cal = Calendar.getInstance();
+			List<ArrivalInfo> list=null;
+			try {
+				 Date dates1 = simpleDateFormat.parse(date+" "+minfcsj+":01");
+				 String d1=date+" "+minfcsj+":01";
+//				 Date dates2=simpleDateFormat.parse(date+" 23:59:59");
+				 date1=dates1.getTime();
+//				 date2=dates2.getTime();
+				 cal.setTime(dates1);
+				 int weeks_year1 = cal.get(Calendar.WEEK_OF_YEAR);
+				 cal.add(cal.DATE,1);//把日期往后增加一天.整数往后推,负数往前移动 
+				 int weeks_year2 = cal.get(Calendar.WEEK_OF_YEAR);
+			     Date dates2=cal.getTime(); 
+			     String d2=simpleDateFormat.format(dates2);
+			     String sql="select *,UNIX_TIMESTAMP(times) as ts from bsth_c_arrival_info where times >= '"+d1 +"'and "
+			     		+ " times <='"+d2+"' and line_id = '"+line+"' and up_down = '"+zd+"'"
+			     				+ " order by device_id,times";
+			     
+			     list =jdbcTemplate.query(sql, new RowMapper<ArrivalInfo>() {
+						@Override
+						public ArrivalInfo mapRow(ResultSet arg0, int arg1) throws SQLException {
+							ArrivalInfo ai=new ArrivalInfo();
+							ai.setInOut(arg0.getInt("in_out"));
+							ai.setDeviceId(arg0.getString("device_id"));
+							ai.setStopNo(arg0.getString("stop_no"));
+							ai.setDates(arg0.getDate("times"));
+							ai.setTs(arg0.getLong("ts")*1000);
+							return ai;
+						}
+					});
+
+			} catch (ParseException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+			return list;
+			
+		}
+		
 		public List<ArrivalInfo> load3(String line, String date, int zd){
 					SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 					SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
@@ -1928,6 +2066,8 @@ public class ReportServiceImpl implements ReportService{
 				}
 			return list;
 		}
+		
+		//根据排班查到离站
 		@Override
 		public List<Map<String, Object>> queryInOutStrtion(String line, String date, int zd,String lzsj) {
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1997,6 +2137,106 @@ public class ReportServiceImpl implements ReportService{
 			return inoutList;
 		}
+		//根据GPS查到离站
+		@Override
+		public List<Map<String, Object>> queryInOutStrtions(String line, String date, int zd,String lzsj) {
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			 String sqlMinYysj="select start_opt from bsth_c_line_config where "
+		        		+ " id = ("
+		        		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
+		        		+ ")";
+			 String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+			List<ArrivalInfo> arrInfoList=this.load4(line, date, zd,minfcsj);
+			
+			//查询线路所有的站点
+			List<StationRoute> listStation= stationRouteRepository.findByLine(line,zd);
+			List<Map<String, Object>> inoutList=new ArrayList<Map<String,Object>>();
+			//保存的所以的站点信息
+			Map<String, Object> map1=new HashMap<String,Object>();
+			map1.put("bc", "");
+			map1.put("nbbm", "");
+			
+			for (int i = 0; i < listStation.size(); i++) {
+				map1.put(listStation.get(i).getStationCode()+"in"
+						, listStation.get(i).getStationName());
+				map1.put(listStation.get(i).getStationCode()+"out"
+						, (i+1));
+			}
+			inoutList.add(map1);
+		
+			/*for (int j = 0; j < listStation.size(); j++) {
+				 map2=new HashMap<String,Object>();
+				StationRoute s=listStation.get(j);
+				List<ArrivalInfo> arrivalList=new ArrayList<ArrivalInfo>();
+				for (int j2 = 0; j2 < arrInfoList.size(); j2++) {
+					ArrivalInfo a=arrivalList.get(j2);
+					if(s.getStationCode().equals(a.getStopNo())){
+						arrivalList.add(a);
+					}
+				}
+				Map<String, String> m=this.strInOut(arrivalList,lzsj);
+				
+				map2.put(s.getStationCode()+"in", m.get("in"));
+				map2.put(s.getStationCode()+"out", m.get("out"));
+				map2.put(s.getStationCode(), m.get("type"));
+			}*/
+			List<String> list_nbbm=new ArrayList<String>();
+			Map<String, Object> m=new HashMap<String,Object>();
+			for (int i = 0; i < arrInfoList.size(); i++) {
+				arrInfoList.get(i).setRoute(-1);
+				for (int j = 0; j < listStation.size(); j++) {
+					if(arrInfoList.get(i).getStopNo().equals(listStation.get(j).getStationCode())){
+						arrInfoList.get(i).setRoute(listStation.get(j).getStationRouteCode());
+						
+					}
+				}
+				if(m.get(arrInfoList.get(i).getDeviceId())==null){
+					m.put(arrInfoList.get(i).getDeviceId(), arrInfoList.get(i).getDeviceId());
+					list_nbbm.add(arrInfoList.get(i).getDeviceId());
+				}
+			}
+
+			Map<String, Object> map2=new HashMap<String, Object>();
+			for (int i = 0; i < list_nbbm.size(); i++) {
+				String nbbm=list_nbbm.get(i);
+				
+				int zdbm =0;
+				int inout=-1;
+				List<ArrivalInfo> arrivalList=new ArrayList<ArrivalInfo>();
+				for (int j = 0; j < arrInfoList.size(); j++) {
+					ArrivalInfo aif=arrInfoList.get(j);
+					
+					if(aif.getDeviceId().equals(nbbm)){
+						map2.put("nbbm", BasicData.deviceId2NbbmMap.get(nbbm));
+						if(aif.getRoute()>-1){
+							if(((inout==aif.getInOut() && zdbm==aif.getRoute()) || !(zdbm ==aif.getRoute()))){
+								if(aif.getRoute()<=zdbm ){
+									inoutList.add(map2);
+									map2=new HashMap<String, Object>();
+									arrivalList=new ArrayList<ArrivalInfo>();
+								}
+							}
+							arrivalList.add(aif);
+//							if(!(zdbm ==aif.getRoute())){
+								Map<String, String> m_=this.strInOut(arrivalList,lzsj);
+								map2.put(aif.getStopNo()+"in", m_.get("in"));
+								map2.put(aif.getStopNo()+"out", m_.get("out"));
+								map2.put(aif.getStopNo(), m_.get("type"));
+//								arrivalList=new ArrayList<ArrivalInfo>();
+//							}
+							zdbm =aif.getRoute();
+							inout=aif.getInOut();
+							
+						}
+						
+					}
+					
+				}
+			}
+		
+			return inoutList;
+		}
+		
 		public Map<String, String> strInOut(List<ArrivalInfo> lists,String lzsj){
 			String inout="";
 			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
@@ -2015,6 +2255,9 @@ public class ReportServiceImpl implements ReportService{
 							t1.setCzsj(sdf.format(new Date(t2.getTs())));
 							out =t2.getTs();
 							break;
+						}else{
+							t1.setCzsj("");
+							out =0l;
 						}
 					}
@@ -2721,7 +2964,7 @@ public class ReportServiceImpl implements ReportService{
  			 for (int i = 0; i < xlList.size(); i++) {
  				 String lineCode=xlList.get(i).get("line").toString();
- 				 String grade =xlList.get(i).get("grade").toString();
+ 				 String grade =xlList.get(i).get("grade")==null?"1":xlList.get(i).get("grade").toString();
  				 int peak=0;
  				 int trough=0;
  				 for (int j = 0; j < djgList.size(); j++) {
@@ -1233,7 +1233,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
 					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
 					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'"
-					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
+					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.trim().length() != 0)
 				sql += " and xl_bm = '"+line+"'";
 			else if(company.length() != 0)
@@ -1326,14 +1326,18 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			for(ScheduleRealInfo s : keyMap.get(xlName)){
 				if(s.getXlDir().equals("0")){
 					up1.add(s.getFcsjT());
-					up2.add(s.getFcsjActualTime());
 					up1Map.put(s.getFcsjT(), s);
-					up2Map.put(s.getFcsjActualTime(), s);
+					if(s.getFcsjActual() != null){
+						up2.add(s.getFcsjActualTime());
+						up2Map.put(s.getFcsjActualTime(), s);
+					}
 				} else if(s.getXlDir().equals("1")){
 					dn1.add(s.getFcsjT());
-					dn2.add(s.getFcsjActualTime());
 					dn1Map.put(s.getFcsjT(), s);
-					dn2Map.put(s.getFcsjActualTime(), s);
+					if(s.getFcsjActual() != null){
+						dn2.add(s.getFcsjActualTime());
+						dn2Map.put(s.getFcsjActualTime(), s);
+					}
 				}
 			}
 			if(up1.size() > 0 && up2.size() > 0){
@@ -1455,7 +1459,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
 					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
 					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"
-					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
+					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.length() != 0)
 				sql += " and xl_bm = '"+line+"'";
 			if(company.length() != 0)
@@ -1565,14 +1569,18 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				for(ScheduleRealInfo s : keyMap.get(xlName).get(date)){
 					if(s.getXlDir().equals("0")){
 						up1.add(s.getFcsjT());
-						up2.add(s.getFcsjActualTime());
 						up1Map.put(s.getFcsjT(), s);
-						up2Map.put(s.getFcsjActualTime(), s);
+						if(s.getFcsjActual() != null){
+							up2.add(s.getFcsjActualTime());
+							up2Map.put(s.getFcsjActualTime(), s);
+						}
 					} else if(s.getXlDir().equals("1")){
 						dn1.add(s.getFcsjT());
-						dn2.add(s.getFcsjActualTime());
 						dn1Map.put(s.getFcsjT(), s);
-						dn2Map.put(s.getFcsjActualTime(), s);
+						if(s.getFcsjActual() != null){
+							dn2.add(s.getFcsjActualTime());
+							dn2Map.put(s.getFcsjActualTime(), s);
+						}
 					}
 				}
 				if(up1.size() > 0 && up2.size() > 0){
@@ -1687,7 +1695,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return resList;
 	}
-	
 	/*@Override
 	public List<Map<String, Object>> commandState(Map<String, Object> map) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
@@ -192,7 +192,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                                         (!"进场".equals(cell_con.trim()))) {
                                     Map<String, Object> p1 = new HashMap<>();
                                     p1.put("line.id_eq", lineid);
-                                    p1.put("stationName_eq", cell_con.trim());
+                                    p1.put("stationName_like", cell_con.trim() + "%"); // 使用模糊匹配
                                     p1.put("stationMark_eq", "B");
                                     p1.put("destroy_eq", 0); // 未撤销
-<?xml version="1.0" encoding="UTF-8"?>
-<transformation>
-  <info>
-    <name>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</name>
-    <description>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</description>
-    <extended_description>&#x8f66;&#x8f86;&#x57fa;&#x7840;&#x4fe1;&#x606f;</extended_description>
-    <trans_version/>
-    <trans_type>Normal</trans_type>
-    <trans_status>0</trans_status>
-    <directory>&#x2f;</directory>
-    <parameters>
-        <parameter>
-            <name>erroroutputdir</name>
-            <default_value/>
-            <description>ktr step&#x914d;&#x7f6e;&#x7684;&#x9519;&#x8bef;&#x8f93;&#x51fa;&#x76ee;&#x5f55;</description>
-        </parameter>
-        <parameter>
-            <name>filepath</name>
-            <default_value/>
-            <description>&#x5f85;&#x5904;&#x7406;&#x5bfc;&#x5165;&#x7684;excel&#x6587;&#x4ef6;</description>
-        </parameter>
-    </parameters>
-    <log>
-<trans-log-table><connection/>
-<schema/>
-<table/>
-<size_limit_lines/>
-<interval/>
-<timeout_days/>
-<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STATUS</id><enabled>Y</enabled><name>STATUS</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name><subject/></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name><subject/></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name><subject/></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name><subject/></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name><subject/></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name><subject/></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>STARTDATE</id><enabled>Y</enabled><name>STARTDATE</name></field><field><id>ENDDATE</id><enabled>Y</enabled><name>ENDDATE</name></field><field><id>LOGDATE</id><enabled>Y</enabled><name>LOGDATE</name></field><field><id>DEPDATE</id><enabled>Y</enabled><name>DEPDATE</name></field><field><id>REPLAYDATE</id><enabled>Y</enabled><name>REPLAYDATE</name></field><field><id>LOG_FIELD</id><enabled>Y</enabled><name>LOG_FIELD</name></field><field><id>EXECUTING_SERVER</id><enabled>N</enabled><name>EXECUTING_SERVER</name></field><field><id>EXECUTING_USER</id><enabled>N</enabled><name>EXECUTING_USER</name></field><field><id>CLIENT</id><enabled>N</enabled><name>CLIENT</name></field></trans-log-table>
-<perf-log-table><connection/>
-<schema/>
-<table/>
-<interval/>
-<timeout_days/>
-<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>SEQ_NR</id><enabled>Y</enabled><name>SEQ_NR</name></field><field><id>LOGDATE</id><enabled>Y</enabled><name>LOGDATE</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STEPNAME</id><enabled>Y</enabled><name>STEPNAME</name></field><field><id>STEP_COPY</id><enabled>Y</enabled><name>STEP_COPY</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>INPUT_BUFFER_ROWS</id><enabled>Y</enabled><name>INPUT_BUFFER_ROWS</name></field><field><id>OUTPUT_BUFFER_ROWS</id><enabled>Y</enabled><name>OUTPUT_BUFFER_ROWS</name></field></perf-log-table>
-<channel-log-table><connection/>
-<schema/>
-<table/>
-<timeout_days/>
-<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>LOGGING_OBJECT_TYPE</id><enabled>Y</enabled><name>LOGGING_OBJECT_TYPE</name></field><field><id>OBJECT_NAME</id><enabled>Y</enabled><name>OBJECT_NAME</name></field><field><id>OBJECT_COPY</id><enabled>Y</enabled><name>OBJECT_COPY</name></field><field><id>REPOSITORY_DIRECTORY</id><enabled>Y</enabled><name>REPOSITORY_DIRECTORY</name></field><field><id>FILENAME</id><enabled>Y</enabled><name>FILENAME</name></field><field><id>OBJECT_ID</id><enabled>Y</enabled><name>OBJECT_ID</name></field><field><id>OBJECT_REVISION</id><enabled>Y</enabled><name>OBJECT_REVISION</name></field><field><id>PARENT_CHANNEL_ID</id><enabled>Y</enabled><name>PARENT_CHANNEL_ID</name></field><field><id>ROOT_CHANNEL_ID</id><enabled>Y</enabled><name>ROOT_CHANNEL_ID</name></field></channel-log-table>
-<step-log-table><connection/>
-<schema/>
-<table/>
-<timeout_days/>
-<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STEPNAME</id><enabled>Y</enabled><name>STEPNAME</name></field><field><id>STEP_COPY</id><enabled>Y</enabled><name>STEP_COPY</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>LOG_FIELD</id><enabled>N</enabled><name>LOG_FIELD</name></field></step-log-table>
-<metrics-log-table><connection/>
-<schema/>
-<table/>
-<timeout_days/>
-<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>METRICS_DATE</id><enabled>Y</enabled><name>METRICS_DATE</name></field><field><id>METRICS_CODE</id><enabled>Y</enabled><name>METRICS_CODE</name></field><field><id>METRICS_DESCRIPTION</id><enabled>Y</enabled><name>METRICS_DESCRIPTION</name></field><field><id>METRICS_SUBJECT</id><enabled>Y</enabled><name>METRICS_SUBJECT</name></field><field><id>METRICS_TYPE</id><enabled>Y</enabled><name>METRICS_TYPE</name></field><field><id>METRICS_VALUE</id><enabled>Y</enabled><name>METRICS_VALUE</name></field></metrics-log-table>
-    </log>
-    <maxdate>
-      <connection/>
-      <table/>
-      <field/>
-      <offset>0.0</offset>
-      <maxdiff>0.0</maxdiff>
-    </maxdate>
-    <size_rowset>10000</size_rowset>
-    <sleep_time_empty>50</sleep_time_empty>
-    <sleep_time_full>50</sleep_time_full>
-    <unique_connections>N</unique_connections>
-    <feedback_shown>Y</feedback_shown>
-    <feedback_size>50000</feedback_size>
-    <using_thread_priorities>Y</using_thread_priorities>
-    <shared_objects_file/>
-    <capture_step_performance>N</capture_step_performance>
-    <step_performance_capturing_delay>1000</step_performance_capturing_delay>
-    <step_performance_capturing_size_limit>100</step_performance_capturing_size_limit>
-    <dependencies>
-    </dependencies>
-    <partitionschemas>
-    </partitionschemas>
-    <slaveservers>
-    </slaveservers>
-    <clusterschemas>
-    </clusterschemas>
-  <created_user>-</created_user>
-  <created_date>2016&#x2f;06&#x2f;23 17&#x3a;44&#x3a;46.781</created_date>
-  <modified_user>-</modified_user>
-  <modified_date>2016&#x2f;06&#x2f;23 17&#x3a;44&#x3a;46.781</modified_date>
-    <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA&#x3d;</key_for_session_key>
-    <is_key_private>N</is_key_private>
-  </info>
-  <notepads>
-  </notepads>
-  <connection>
-    <name>192.168.168.1_jwgl_dw</name>
-    <server>192.168.168.1</server>
-    <type>ORACLE</type>
-    <access>Native</access>
-    <database>orcl</database>
-    <port>1521</port>
-    <username>jwgl_dw</username>
-    <password>Encrypted 2be98afc86aa7f2e4cb13b977d2adabcd</password>
-    <servername/>
-    <data_tablespace/>
-    <index_tablespace/>
-    <attributes>
-      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
-      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
-      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
-      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
-      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
-      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
-      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
-    </attributes>
-  </connection>
-  <connection>
-    <name>bus_control_variable</name>
-    <server>&#x24;&#x7b;v_db_ip&#x7d;</server>
-    <type>MYSQL</type>
-    <access>Native</access>
-    <database>&#x24;&#x7b;v_db_dname&#x7d;</database>
-    <port>3306</port>
-    <username>&#x24;&#x7b;v_db_uname&#x7d;</username>
-    <password>&#x24;&#x7b;v_db_pwd&#x7d;</password>
-    <servername/>
-    <data_tablespace/>
-    <index_tablespace/>
-    <attributes>
-      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
-      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
-      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
-      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
-      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
-      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
-      <attribute><code>STREAM_RESULTS</code><attribute>N</attribute></attribute>
-      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
-      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
-      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
-    </attributes>
-  </connection>
-  <connection>
-    <name>bus_control_&#x516c;&#x53f8;_201</name>
-    <server>localhost</server>
-    <type>MYSQL</type>
-    <access>Native</access>
-    <database>control</database>
-    <port>3306</port>
-    <username>root</username>
-    <password>Encrypted </password>
-    <servername/>
-    <data_tablespace/>
-    <index_tablespace/>
-    <attributes>
-      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
-      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
-      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
-      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
-      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
-      <attribute><code>STREAM_RESULTS</code><attribute>N</attribute></attribute>
-      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
-      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
-      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
-    </attributes>
-  </connection>
-  <connection>
-    <name>bus_control_&#x672c;&#x673a;</name>
-    <server>localhost</server>
-    <type>MYSQL</type>
-    <access>Native</access>
-    <database>control</database>
-    <port>3306</port>
-    <username>root</username>
-    <password>Encrypted </password>
-    <servername/>
-    <data_tablespace/>
-    <index_tablespace/>
-    <attributes>
-      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
-      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
-      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
-      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
-      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
-      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
-      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
-      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
-      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
-    </attributes>
-  </connection>
-  <connection>
-    <name>xlab_mysql_youle</name>
-    <server>101.231.124.8</server>
-    <type>MYSQL</type>
-    <access>Native</access>
-    <database>xlab_youle</database>
-    <port>45687</port>
-    <username>xlab-youle</username>
-    <password>Encrypted 2be98afc86aa78a88aa1be369d187a3df</password>
-    <servername/>
-    <data_tablespace/>
-    <index_tablespace/>
-    <attributes>
-      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
-      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
-      <attribute><code>PORT_NUMBER</code><attribute>45687</attribute></attribute>
-      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
-      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
-      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
-      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>N</attribute></attribute>
-      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>N</attribute></attribute>
-      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
-    </attributes>
-  </connection>
-  <connection>
-    <name>xlab_mysql_youle&#xff08;&#x672c;&#x673a;&#xff09;</name>
-    <server>localhost</server>
-    <type>MYSQL</type>
-    <access>Native</access>
-    <database>xlab_youle</database>
-    <port>3306</port>
-    <username>root</username>
-    <password>Encrypted </password>
-    <servername/>
-    <data_tablespace/>
-    <index_tablespace/>
-    <attributes>
-      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
-      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
-      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
-      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
-      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
-      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
-      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>N</attribute></attribute>
-      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>N</attribute></attribute>
-      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
-    </attributes>
-  </connection>
-  <connection>
-    <name>xlab_youle</name>
-    <server/>
-    <type>MYSQL</type>
-    <access>JNDI</access>
-    <database>xlab_youle</database>
-    <port>1521</port>
-    <username/>
-    <password>Encrypted </password>
-    <servername/>
-    <data_tablespace/>
-    <index_tablespace/>
-    <attributes>
-      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
-      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
-      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
-      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
-      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
-      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
-      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
-      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
-      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
-    </attributes>
-  </connection>
-  <order>
-  <hop> <from>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_cars 2</from><to>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</from><to>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</from><to>&#x5185;&#x90e8;&#x7f16;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x5185;&#x90e8;&#x7f16;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</from><to>&#x6dfb;&#x52a0;&#x67e5;&#x8be2;&#x5e38;&#x91cf;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x6dfb;&#x52a0;&#x67e5;&#x8be2;&#x5e38;&#x91cf;</from><to>&#x516c;&#x53f8;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x516c;&#x53f8;&#x67e5;&#x8be2;</from><to>&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</from><to>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</from><to>&#x5206;&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x5206;&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</from><to>&#x8f66;&#x8f86;&#x7f16;&#x7801;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x8f66;&#x8f86;&#x7f16;&#x7801;</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_cars 2</to><enabled>Y</enabled> </hop>
-  </order>
-  <step>
-    <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name>
-    <type>ExcelInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <header>Y</header>
-    <noempty>Y</noempty>
-    <stoponempty>N</stoponempty>
-    <filefield/>
-    <sheetfield/>
-    <sheetrownumfield/>
-    <rownumfield/>
-    <sheetfield/>
-    <filefield/>
-    <limit>0</limit>
-    <encoding/>
-    <add_to_result_filenames>Y</add_to_result_filenames>
-    <accept_filenames>Y</accept_filenames>
-    <accept_field>filepath_</accept_field>
-    <accept_stepname>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</accept_stepname>
-    <file>
-      <name/>
-      <filemask/>
-      <exclude_filemask/>
-      <file_required>N</file_required>
-      <include_subfolders>N</include_subfolders>
-    </file>
-    <fields>
-      <field>
-        <name>&#x8f66;&#x724c;&#x53f7;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x6240;&#x5c5e;&#x516c;&#x53f8;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x6240;&#x5c5e;&#x5206;&#x516c;&#x53f8;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8bbe;&#x5907;&#x7ec8;&#x7aef;&#x53f7;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-    </fields>
-    <sheets>
-      <sheet>
-        <name>&#x5de5;&#x4f5c;&#x8868;1</name>
-        <startrow>0</startrow>
-        <startcol>0</startcol>
-        </sheet>
-    </sheets>
-    <strict_types>N</strict_types>
-    <error_ignored>N</error_ignored>
-    <error_line_skipped>N</error_line_skipped>
-    <bad_line_files_destination_directory/>
-    <bad_line_files_extension>warning</bad_line_files_extension>
-    <error_line_files_destination_directory/>
-    <error_line_files_extension>error</error_line_files_extension>
-    <line_number_files_destination_directory/>
-    <line_number_files_extension>line</line_number_files_extension>
-    <shortFileFieldName/>
-    <pathFieldName/>
-    <hiddenFieldName/>
-    <lastModificationTimeFieldName/>
-    <uriNameFieldName/>
-    <rootUriNameFieldName/>
-    <extensionFieldName/>
-    <sizeFieldName/>
-    <spreadsheet_type>JXL</spreadsheet_type>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>218</xloc>
-      <yloc>59</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_cars 2</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <connection>bus_control_variable</connection>
-    <commit>500</commit>
-    <update_bypassed>N</update_bypassed>
-    <lookup>
-      <schema/>
-      <table>bsth_c_cars</table>
-      <key>
-        <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
-        <field>inside_code</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>car_plate</name>
-        <rename>&#x8f66;&#x724c;&#x53f7;</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>car_code</name>
-        <rename>cl_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>inside_code</name>
-        <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>company</name>
-        <rename>&#x6240;&#x5c5e;&#x516c;&#x53f8;</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>business_code</name>
-        <rename>gs_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>branche_company</name>
-        <rename>&#x6240;&#x5c5e;&#x5206;&#x516c;&#x53f8;</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>branche_company_code</name>
-        <rename>fgs_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>supplier_name</name>
-        <rename>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>equipment_code</name>
-        <rename>&#x8bbe;&#x5907;&#x7ec8;&#x7aef;&#x53f7;</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>690</xloc>
-      <yloc>393</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</name>
-    <type>GetVariable</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <fields>
-      <field>
-        <name>filepath_</name>
-        <variable>&#x24;&#x7b;filepath&#x7d;</variable>
-        <type>String</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-      </field>
-      <field>
-        <name>erroroutputdir_</name>
-        <variable>&#x24;&#x7b;erroroutputdir&#x7d;</variable>
-        <type>String</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-      </field>
-    </fields>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>70</xloc>
-      <yloc>59</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</name>
-    <type>ExcelOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <header>Y</header>
-    <footer>N</footer>
-    <encoding/>
-    <append>N</append>
-    <add_to_result_filenames>Y</add_to_result_filenames>
-    <file>
-      <name>&#x24;&#x7b;erroroutputdir&#x7d;&#x2f;&#x8f66;&#x8f86;&#x57fa;&#x7840;&#x4fe1;&#x606f;_&#x9519;&#x8bef;</name>
-      <extention>xls</extention>
-      <do_not_open_newfile_init>N</do_not_open_newfile_init>
-      <create_parent_folder>N</create_parent_folder>
-      <split>N</split>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <SpecifyFormat>N</SpecifyFormat>
-      <date_time_format/>
-      <sheetname>Sheet1</sheetname>
-      <autosizecolums>N</autosizecolums>
-      <nullisblank>N</nullisblank>
-      <protect_sheet>N</protect_sheet>
-      <password>Encrypted </password>
-      <splitevery>0</splitevery>
-      <usetempfiles>N</usetempfiles>
-      <tempdirectory/>
-      </file>
-    <template>
-      <enabled>N</enabled>
-      <append>N</append>
-      <filename>template.xls</filename>
-    </template>
-    <fields>
-      <field>
-        <name>&#x8f66;&#x724c;&#x53f7;</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>&#x6240;&#x5c5e;&#x516c;&#x53f8;</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>&#x6240;&#x5c5e;&#x5206;&#x516c;&#x53f8;</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>&#x8bbe;&#x5907;&#x7ec8;&#x7aef;&#x53f7;</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>error_count</name>
-        <type>Integer</type>
-        <format/>
-      </field>
-      <field>
-        <name>error_desc</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>error_column1</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>error_column2</name>
-        <type>String</type>
-        <format/>
-      </field>
-    </fields>
-    <custom>
-    <header_font_name>arial</header_font_name>
-    <header_font_size>10</header_font_size>
-    <header_font_bold>N</header_font_bold>
-    <header_font_italic>N</header_font_italic>
-    <header_font_underline>no</header_font_underline>
-    <header_font_orientation>horizontal</header_font_orientation>
-    <header_font_color>black</header_font_color>
-    <header_background_color>none</header_background_color>
-    <header_row_height>255</header_row_height>
-    <header_alignment>left</header_alignment>
-    <header_image/>
-    <row_font_name>arial</row_font_name>
-    <row_font_size>10</row_font_size>
-    <row_font_color>black</row_font_color>
-    <row_background_color>none</row_background_color>
-      </custom>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>502</xloc>
-      <yloc>395</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x5185;&#x90e8;&#x7f16;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-<send_true_to/>
-<send_false_to/>
-    <compare>
-<condition>
- <negated>N</negated>
- <conditions>
-  <condition>
-   <negated>N</negated>
-   <leftvalue>&#x5185;&#x90e8;&#x7f16;&#x7801;</leftvalue>
-   <function>IS NOT NULL</function>
-   <rightvalue/>
-   </condition>
-  </conditions>
- </condition>
-    </compare>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>218</xloc>
-      <yloc>164</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x6dfb;&#x52a0;&#x67e5;&#x8be2;&#x5e38;&#x91cf;</name>
-    <type>ScriptValueMod</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <compatible>N</compatible>
-    <optimizationLevel>9</optimizationLevel>
-    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
-        <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var up_code &#x3d; &#x27;88&#x27;&#x3b;</jsScript_script>
-      </jsScript>    </jsScripts>    <fields>      <field>        <name>up_code</name>
-        <rename>up_code</rename>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <replace>N</replace>
-      </field>    </fields>     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>389</xloc>
-      <yloc>61</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x516c;&#x53f8;&#x67e5;&#x8be2;</name>
-    <type>DBLookup</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_business</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
-        <name>up_code</name>
-        <field>up_code</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>&#x6240;&#x5c5e;&#x516c;&#x53f8;</name>
-        <field>business_name</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>business_code</name>
-        <rename>gs_code</rename>
-        <default/>
-        <type>String</type>
-      </value>
-    </lookup>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>540</xloc>
-      <yloc>59</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-<send_true_to/>
-<send_false_to/>
-    <compare>
-<condition>
- <negated>N</negated>
- <conditions>
-  <condition>
-   <negated>N</negated>
-   <leftvalue>gs_code</leftvalue>
-   <function>IS NOT NULL</function>
-   <rightvalue/>
-   </condition>
-  </conditions>
- </condition>
-    </compare>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>542</xloc>
-      <yloc>164</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</name>
-    <type>DBLookup</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_business</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
-        <name>gs_code</name>
-        <field>up_code</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>&#x6240;&#x5c5e;&#x5206;&#x516c;&#x53f8;</name>
-        <field>business_name</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>business_code</name>
-        <rename>fgs_code</rename>
-        <default/>
-        <type>String</type>
-      </value>
-    </lookup>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>683</xloc>
-      <yloc>59</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x5206;&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-<send_true_to/>
-<send_false_to/>
-    <compare>
-<condition>
- <negated>N</negated>
- <conditions>
-  <condition>
-   <negated>N</negated>
-   <leftvalue>fgs_code</leftvalue>
-   <function>IS NOT NULL</function>
-   <rightvalue/>
-   </condition>
-  </conditions>
- </condition>
-    </compare>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>685</xloc>
-      <yloc>162</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x8f66;&#x8f86;&#x7f16;&#x7801;</name>
-    <type>ScriptValueMod</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <compatible>N</compatible>
-    <optimizationLevel>9</optimizationLevel>
-    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
-        <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var cl_code &#x3d; gs_code &#x2b; &#x22;0&#x22; &#x2b; &#x5185;&#x90e8;&#x7f16;&#x7801;&#x3b;</jsScript_script>
-      </jsScript>    </jsScripts>    <fields>      <field>        <name>cl_code</name>
-        <rename>cl_code</rename>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <replace>N</replace>
-      </field>    </fields>     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>688</xloc>
-      <yloc>273</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step_error_handling>
-      <error>
-        <source_step>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_cars 2</source_step>
-        <target_step>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</target_step>
-        <is_enabled>Y</is_enabled>
-        <nr_valuename>error_count</nr_valuename>
-        <descriptions_valuename>error_desc</descriptions_valuename>
-        <fields_valuename>error_column1</fields_valuename>
-        <codes_valuename>error_column2</codes_valuename>
-        <max_errors/>
-        <max_pct_errors/>
-        <min_pct_rows/>
-      </error>
-  </step_error_handling>
-   <slave-step-copy-partition-distribution>
-</slave-step-copy-partition-distribution>
-   <slave_transformation>N</slave_transformation>
-
-</transformation>
+<?xml version="1.0" encoding="UTF-8"?>
+<transformation>
+  <info>
+    <name>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</name>
+    <description>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</description>
+    <extended_description>&#x8f66;&#x8f86;&#x57fa;&#x7840;&#x4fe1;&#x606f;</extended_description>
+    <trans_version/>
+    <trans_type>Normal</trans_type>
+    <trans_status>0</trans_status>
+    <directory>&#x2f;</directory>
+    <parameters>
+        <parameter>
+            <name>erroroutputdir</name>
+            <default_value/>
+            <description>ktr step&#x914d;&#x7f6e;&#x7684;&#x9519;&#x8bef;&#x8f93;&#x51fa;&#x76ee;&#x5f55;</description>
+        </parameter>
+        <parameter>
+            <name>filepath</name>
+            <default_value/>
+            <description>&#x5f85;&#x5904;&#x7406;&#x5bfc;&#x5165;&#x7684;excel&#x6587;&#x4ef6;</description>
+        </parameter>
+    </parameters>
+    <log>
+<trans-log-table><connection/>
+<schema/>
+<table/>
+<size_limit_lines/>
+<interval/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STATUS</id><enabled>Y</enabled><name>STATUS</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name><subject/></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name><subject/></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name><subject/></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name><subject/></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name><subject/></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name><subject/></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>STARTDATE</id><enabled>Y</enabled><name>STARTDATE</name></field><field><id>ENDDATE</id><enabled>Y</enabled><name>ENDDATE</name></field><field><id>LOGDATE</id><enabled>Y</enabled><name>LOGDATE</name></field><field><id>DEPDATE</id><enabled>Y</enabled><name>DEPDATE</name></field><field><id>REPLAYDATE</id><enabled>Y</enabled><name>REPLAYDATE</name></field><field><id>LOG_FIELD</id><enabled>Y</enabled><name>LOG_FIELD</name></field><field><id>EXECUTING_SERVER</id><enabled>N</enabled><name>EXECUTING_SERVER</name></field><field><id>EXECUTING_USER</id><enabled>N</enabled><name>EXECUTING_USER</name></field><field><id>CLIENT</id><enabled>N</enabled><name>CLIENT</name></field></trans-log-table>
+<perf-log-table><connection/>
+<schema/>
+<table/>
+<interval/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>SEQ_NR</id><enabled>Y</enabled><name>SEQ_NR</name></field><field><id>LOGDATE</id><enabled>Y</enabled><name>LOGDATE</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STEPNAME</id><enabled>Y</enabled><name>STEPNAME</name></field><field><id>STEP_COPY</id><enabled>Y</enabled><name>STEP_COPY</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>INPUT_BUFFER_ROWS</id><enabled>Y</enabled><name>INPUT_BUFFER_ROWS</name></field><field><id>OUTPUT_BUFFER_ROWS</id><enabled>Y</enabled><name>OUTPUT_BUFFER_ROWS</name></field></perf-log-table>
+<channel-log-table><connection/>
+<schema/>
+<table/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>LOGGING_OBJECT_TYPE</id><enabled>Y</enabled><name>LOGGING_OBJECT_TYPE</name></field><field><id>OBJECT_NAME</id><enabled>Y</enabled><name>OBJECT_NAME</name></field><field><id>OBJECT_COPY</id><enabled>Y</enabled><name>OBJECT_COPY</name></field><field><id>REPOSITORY_DIRECTORY</id><enabled>Y</enabled><name>REPOSITORY_DIRECTORY</name></field><field><id>FILENAME</id><enabled>Y</enabled><name>FILENAME</name></field><field><id>OBJECT_ID</id><enabled>Y</enabled><name>OBJECT_ID</name></field><field><id>OBJECT_REVISION</id><enabled>Y</enabled><name>OBJECT_REVISION</name></field><field><id>PARENT_CHANNEL_ID</id><enabled>Y</enabled><name>PARENT_CHANNEL_ID</name></field><field><id>ROOT_CHANNEL_ID</id><enabled>Y</enabled><name>ROOT_CHANNEL_ID</name></field></channel-log-table>
+<step-log-table><connection/>
+<schema/>
+<table/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STEPNAME</id><enabled>Y</enabled><name>STEPNAME</name></field><field><id>STEP_COPY</id><enabled>Y</enabled><name>STEP_COPY</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>LOG_FIELD</id><enabled>N</enabled><name>LOG_FIELD</name></field></step-log-table>
+<metrics-log-table><connection/>
+<schema/>
+<table/>
+<timeout_days/>
+<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>METRICS_DATE</id><enabled>Y</enabled><name>METRICS_DATE</name></field><field><id>METRICS_CODE</id><enabled>Y</enabled><name>METRICS_CODE</name></field><field><id>METRICS_DESCRIPTION</id><enabled>Y</enabled><name>METRICS_DESCRIPTION</name></field><field><id>METRICS_SUBJECT</id><enabled>Y</enabled><name>METRICS_SUBJECT</name></field><field><id>METRICS_TYPE</id><enabled>Y</enabled><name>METRICS_TYPE</name></field><field><id>METRICS_VALUE</id><enabled>Y</enabled><name>METRICS_VALUE</name></field></metrics-log-table>
+    </log>
+    <maxdate>
+      <connection/>
+      <table/>
+      <field/>
+      <offset>0.0</offset>
+      <maxdiff>0.0</maxdiff>
+    </maxdate>
+    <size_rowset>10000</size_rowset>
+    <sleep_time_empty>50</sleep_time_empty>
+    <sleep_time_full>50</sleep_time_full>
+    <unique_connections>N</unique_connections>
+    <feedback_shown>Y</feedback_shown>
+    <feedback_size>50000</feedback_size>
+    <using_thread_priorities>Y</using_thread_priorities>
+    <shared_objects_file/>
+    <capture_step_performance>N</capture_step_performance>
+    <step_performance_capturing_delay>1000</step_performance_capturing_delay>
+    <step_performance_capturing_size_limit>100</step_performance_capturing_size_limit>
+    <dependencies>
+    </dependencies>
+    <partitionschemas>
+    </partitionschemas>
+    <slaveservers>
+    </slaveservers>
+    <clusterschemas>
+    </clusterschemas>
+  <created_user>-</created_user>
+  <created_date>2016&#x2f;06&#x2f;23 17&#x3a;44&#x3a;46.781</created_date>
+  <modified_user>-</modified_user>
+  <modified_date>2016&#x2f;06&#x2f;23 17&#x3a;44&#x3a;46.781</modified_date>
+    <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA&#x3d;</key_for_session_key>
+    <is_key_private>N</is_key_private>
+  </info>
+  <notepads>
+  </notepads>
+  <connection>
+    <name>192.168.168.1_jwgl_dw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl_dw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb13b977d2adabcd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>bus_control_variable</name>
+    <server>&#x24;&#x7b;v_db_ip&#x7d;</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>&#x24;&#x7b;v_db_dname&#x7d;</database>
+    <port>3306</port>
+    <username>&#x24;&#x7b;v_db_uname&#x7d;</username>
+    <password>&#x24;&#x7b;v_db_pwd&#x7d;</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>bus_control_&#x516c;&#x53f8;_201</name>
+    <server>localhost</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>control</database>
+    <port>3306</port>
+    <username>root</username>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>bus_control_&#x672c;&#x673a;</name>
+    <server>localhost</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>control</database>
+    <port>3306</port>
+    <username>root</username>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>xlab_mysql_youle</name>
+    <server>101.231.124.8</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>xlab_youle</database>
+    <port>45687</port>
+    <username>xlab-youle</username>
+    <password>Encrypted 2be98afc86aa78a88aa1be369d187a3df</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>45687</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>xlab_mysql_youle&#xff08;&#x672c;&#x673a;&#xff09;</name>
+    <server>localhost</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>xlab_youle</database>
+    <port>3306</port>
+    <username>root</username>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
+      <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>N</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
+    <name>xlab_youle</name>
+    <server/>
+    <type>MYSQL</type>
+    <access>JNDI</access>
+    <database>xlab_youle</database>
+    <port>1521</port>
+    <username/>
+    <password>Encrypted </password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <order>
+  <hop> <from>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_cars 2</from><to>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</from><to>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</from><to>&#x5185;&#x90e8;&#x7f16;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5185;&#x90e8;&#x7f16;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</from><to>&#x6dfb;&#x52a0;&#x67e5;&#x8be2;&#x5e38;&#x91cf;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6dfb;&#x52a0;&#x67e5;&#x8be2;&#x5e38;&#x91cf;</from><to>&#x516c;&#x53f8;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x516c;&#x53f8;&#x67e5;&#x8be2;</from><to>&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</from><to>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</from><to>&#x5206;&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5206;&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</from><to>&#x8f66;&#x8f86;&#x7f16;&#x7801;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8f66;&#x8f86;&#x7f16;&#x7801;</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_cars 2</to><enabled>Y</enabled> </hop>
+  </order>
+  <step>
+    <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name>
+    <type>ExcelInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <header>Y</header>
+    <noempty>Y</noempty>
+    <stoponempty>N</stoponempty>
+    <filefield/>
+    <sheetfield/>
+    <sheetrownumfield/>
+    <rownumfield/>
+    <sheetfield/>
+    <filefield/>
+    <limit>0</limit>
+    <encoding/>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <accept_filenames>Y</accept_filenames>
+    <accept_field>filepath_</accept_field>
+    <accept_stepname>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</accept_stepname>
+    <file>
+      <name/>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+      <field>
+        <name>&#x8f66;&#x724c;&#x53f7;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x6240;&#x5c5e;&#x516c;&#x53f8;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x6240;&#x5c5e;&#x5206;&#x516c;&#x53f8;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8bbe;&#x5907;&#x7ec8;&#x7aef;&#x53f7;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+    </fields>
+    <sheets>
+      <sheet>
+        <name>&#x5de5;&#x4f5c;&#x8868;1</name>
+        <startrow>0</startrow>
+        <startcol>0</startcol>
+        </sheet>
+    </sheets>
+    <strict_types>N</strict_types>
+    <error_ignored>N</error_ignored>
+    <error_line_skipped>N</error_line_skipped>
+    <bad_line_files_destination_directory/>
+    <bad_line_files_extension>warning</bad_line_files_extension>
+    <error_line_files_destination_directory/>
+    <error_line_files_extension>error</error_line_files_extension>
+    <line_number_files_destination_directory/>
+    <line_number_files_extension>line</line_number_files_extension>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <spreadsheet_type>JXL</spreadsheet_type>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>218</xloc>
+      <yloc>59</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_cars 2</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <commit>500</commit>
+    <update_bypassed>N</update_bypassed>
+    <lookup>
+      <schema/>
+      <table>bsth_c_cars</table>
+      <key>
+        <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
+        <field>inside_code</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>car_plate</name>
+        <rename>&#x8f66;&#x724c;&#x53f7;</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>car_code</name>
+        <rename>cl_code</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>inside_code</name>
+        <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>company</name>
+        <rename>&#x6240;&#x5c5e;&#x516c;&#x53f8;</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>business_code</name>
+        <rename>gs_code</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>branche_company</name>
+        <rename>&#x6240;&#x5c5e;&#x5206;&#x516c;&#x53f8;</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>branche_company_code</name>
+        <rename>fgs_code</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>supplier_name</name>
+        <rename>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>equipment_code</name>
+        <rename>&#x8bbe;&#x5907;&#x7ec8;&#x7aef;&#x53f7;</rename>
+        <update>Y</update>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>690</xloc>
+      <yloc>393</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</name>
+    <type>GetVariable</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>
+      <field>
+        <name>filepath_</name>
+        <variable>&#x24;&#x7b;filepath&#x7d;</variable>
+        <type>String</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+      </field>
+      <field>
+        <name>erroroutputdir_</name>
+        <variable>&#x24;&#x7b;erroroutputdir&#x7d;</variable>
+        <type>String</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>70</xloc>
+      <yloc>59</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</name>
+    <type>ExcelOutput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <header>Y</header>
+    <footer>N</footer>
+    <encoding/>
+    <append>N</append>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <file>
+      <name>&#x24;&#x7b;erroroutputdir&#x7d;&#x2f;&#x8f66;&#x8f86;&#x57fa;&#x7840;&#x4fe1;&#x606f;_&#x9519;&#x8bef;</name>
+      <extention>xls</extention>
+      <do_not_open_newfile_init>N</do_not_open_newfile_init>
+      <create_parent_folder>N</create_parent_folder>
+      <split>N</split>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <SpecifyFormat>N</SpecifyFormat>
+      <date_time_format/>
+      <sheetname>Sheet1</sheetname>
+      <autosizecolums>N</autosizecolums>
+      <nullisblank>N</nullisblank>
+      <protect_sheet>N</protect_sheet>
+      <password>Encrypted </password>
+      <splitevery>0</splitevery>
+      <usetempfiles>N</usetempfiles>
+      <tempdirectory/>
+      </file>
+    <template>
+      <enabled>N</enabled>
+      <append>N</append>
+      <filename>template.xls</filename>
+    </template>
+    <fields>
+      <field>
+        <name>&#x8f66;&#x724c;&#x53f7;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x6240;&#x5c5e;&#x516c;&#x53f8;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x6240;&#x5c5e;&#x5206;&#x516c;&#x53f8;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x8bbe;&#x5907;&#x7ec8;&#x7aef;&#x53f7;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>error_count</name>
+        <type>Integer</type>
+        <format/>
+      </field>
+      <field>
+        <name>error_desc</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>error_column1</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>error_column2</name>
+        <type>String</type>
+        <format/>
+      </field>
+    </fields>
+    <custom>
+    <header_font_name>arial</header_font_name>
+    <header_font_size>10</header_font_size>
+    <header_font_bold>N</header_font_bold>
+    <header_font_italic>N</header_font_italic>
+    <header_font_underline>no</header_font_underline>
+    <header_font_orientation>horizontal</header_font_orientation>
+    <header_font_color>black</header_font_color>
+    <header_background_color>none</header_background_color>
+    <header_row_height>255</header_row_height>
+    <header_alignment>left</header_alignment>
+    <header_image/>
+    <row_font_name>arial</row_font_name>
+    <row_font_size>10</row_font_size>
+    <row_font_color>black</row_font_color>
+    <row_background_color>none</row_background_color>
+      </custom>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>502</xloc>
+      <yloc>395</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5185;&#x90e8;&#x7f16;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to/>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <conditions>
+  <condition>
+   <negated>N</negated>
+   <leftvalue>&#x5185;&#x90e8;&#x7f16;&#x7801;</leftvalue>
+   <function>IS NOT NULL</function>
+   <rightvalue/>
+   </condition>
+  </conditions>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>218</xloc>
+      <yloc>164</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x6dfb;&#x52a0;&#x67e5;&#x8be2;&#x5e38;&#x91cf;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var up_code &#x3d; &#x27;88&#x27;&#x3b;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>up_code</name>
+        <rename>up_code</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>389</xloc>
+      <yloc>61</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x516c;&#x53f8;&#x67e5;&#x8be2;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_business</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>up_code</name>
+        <field>up_code</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>&#x6240;&#x5c5e;&#x516c;&#x53f8;</name>
+        <field>business_name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>business_code</name>
+        <rename>gs_code</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>540</xloc>
+      <yloc>59</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to/>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <conditions>
+  <condition>
+   <negated>N</negated>
+   <leftvalue>gs_code</leftvalue>
+   <function>IS NOT NULL</function>
+   <rightvalue/>
+   </condition>
+  </conditions>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>542</xloc>
+      <yloc>164</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_business</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>gs_code</name>
+        <field>up_code</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>&#x6240;&#x5c5e;&#x5206;&#x516c;&#x53f8;</name>
+        <field>business_name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>business_code</name>
+        <rename>fgs_code</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>683</xloc>
+      <yloc>59</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5206;&#x516c;&#x53f8;&#x4ee3;&#x7801;&#x4e0d;&#x4e3a;&#x7a7a;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to/>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <conditions>
+  <condition>
+   <negated>N</negated>
+   <leftvalue>fgs_code</leftvalue>
+   <function>IS NOT NULL</function>
+   <rightvalue/>
+   </condition>
+  </conditions>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>685</xloc>
+      <yloc>162</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8f66;&#x8f86;&#x7f16;&#x7801;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var cl_code &#x3d; gs_code &#x2b; &#x22;0&#x22; &#x2b; &#x5185;&#x90e8;&#x7f16;&#x7801;&#x3b;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>cl_code</name>
+        <rename>cl_code</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>688</xloc>
+      <yloc>273</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step_error_handling>
+      <error>
+        <source_step>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_cars 2</source_step>
+        <target_step>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</target_step>
+        <is_enabled>Y</is_enabled>
+        <nr_valuename>error_count</nr_valuename>
+        <descriptions_valuename>error_desc</descriptions_valuename>
+        <fields_valuename>error_column1</fields_valuename>
+        <codes_valuename>error_column2</codes_valuename>
+        <max_errors/>
+        <max_pct_errors/>
+        <min_pct_rows/>
+      </error>
+  </step_error_handling>
+   <slave-step-copy-partition-distribution>
+</slave-step-copy-partition-distribution>
+   <slave_transformation>N</slave_transformation>
+
+</transformation>