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

游瑞烽
2 parents 4b33c7b5 10983d1d
Showing 83 changed files with 2538 additions and 862 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/CalcSheetController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/entity/mcy_forms/Shifday.java
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/sheet/CalcSheet.java
src/main/java/com/bsth/filter/AccessLogFilter.java
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/repository/oil/CwjyRepository.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/repository/oil/LsylbRepository.java
@@ -152,7 +152,11 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			m.put("rq", y.getRq());
 			m.put("gsname",y.getGsname() );
 			m.put("fgsname", y.getFgsname());
-			m.put("xlname", y.getXlname());
+			if(y.getLinename()==null){
+				m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			}else{
+				m.put("xlname", y.getLinename());
+			}			
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
@@ -255,7 +255,11 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("rq", sdfMonth.format(y.getRq()));
 			m.put("gsname",y.getGsname() );
 			m.put("fgsname", y.getFgsname());
-			m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			if(y.getLinename()==null){
+				m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			}else{
+				m.put("xlname", y.getLinename());
+			}
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
 package com.bsth.controller.realcontrol;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
@@ -10,14 +33,11 @@ import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
+import com.bsth.util.ConfigUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
 @RestController
 @RequestMapping("/realSchedule")
@@ -691,4 +711,74 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
 		return scheduleRealInfoService.deleteToHistory(id);
 	}
+	
+	/**
+	 * 从历史库里删除临加班次
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
+	public Map<String, Object> deleteToHistory(@RequestParam Map<String, Object> param){
+		SysUser user = SecurityUtils.getCurrentUser();
+		String uname = user.getUserName();
+		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url"));
+		url.append("?nbbm=").append(param.get("nbbm")).append("&bxy=").append(uname).append("&bxbm=").append(param.get("bxType"));
+		// 分公司保存格式 分公司编码_公司编码
+		String val = BasicData.nbbm2FgsCompanyCodeMap.get(param.get("nbbm"));
+		String[] arr = val.split("_");
+		if (!"22".equals(arr[1])) {
+			Map<String, Object> res = new HashMap<String, Object>();
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "除金高公司外暂未开通此功能");
+			
+			return res;
+		}
+		url.append("&fgs=").append(arr[0]);
+		
+		return request(url.toString());
+	}
+	
+	@SuppressWarnings("unchecked")
+	private static Map<String, Object> request(String url) {
+		Map<String, Object> res = new HashMap<String, Object>();
+		res.put("status", ResponseCode.SUCCESS);
+		InputStream in = null;
+		HttpURLConnection con = null;
+		try {
+			con = (HttpURLConnection)new URL(url).openConnection();
+			con.setRequestMethod("POST");
+			con.setRequestProperty("keep-alive", "true");
+			con.setRequestProperty("accept", "application/json");
+			con.setRequestProperty("content-type", "application/json");
+			con.setDoInput(true);
+			con.setReadTimeout(2500);
+			con.setConnectTimeout(2500);
+			
+			con.connect();
+			if (con.getResponseCode() == 200) {
+				in = con.getInputStream();
+				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+				IOUtils.copy(in, bout); bout.close();
+				Map<String, Object> response = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+				if (!"报修成功".equals(response.get("msg"))) {
+					res.put("status", ResponseCode.ERROR);
+					res.putAll(response);
+				}
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "调用上报接口异常");
+		} finally {
+			try {
+				if (in != null) in.close();
+				if (con != null) con.disconnect();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		return res;
+	}
 }
@@ -42,4 +42,11 @@ public class CalcSheetController  extends BaseController&lt;CalcSheet, Integer&gt;{
 		List<Map<String, Object>> list=calcSheetService.calcTurnoutrate(map);
 		return list;
 	}
+	
+	
+	@RequestMapping(value = "/calcTurnoutrateZgf",method = RequestMethod.GET)
+	public List<Map<String, Object>> calcTurnoutrateZgf(@RequestParam Map<String, Object> map){
+		List<Map<String, Object>> list=calcSheetService.calcTurnoutrateZgf(map);
+		return list;
+	}
 }
@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.report.ReportService;
 import com.bsth.util.ReportUtils;
@@ -357,10 +358,17 @@ public class ReportController {
 		return lMap;
 	}
-	
-	
 	@RequestMapping(value="/online")
 	public Map<String, Object> online(@RequestParam Map<String, Object> map){
 		return service.online(map);
 	}
+	
+	
+	
+	@RequestMapping(value = "/singledatatj", method = RequestMethod.GET)
+	public List<Singledata> singledatatj(@RequestParam Map<String, Object> map) {
+
+		return service.singledatatj(map);
+	}
+	
 }
@@ -63,6 +63,20 @@ public class CarConfigInfoController extends BController&lt;CarConfigInfo, Long&gt; {
         return rtn;
     }
+    @RequestMapping(value = "/validate_cars_2", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars(@RequestParam Integer xlId, @RequestParam Integer clId) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            carConfigInfoService.validate_cars(xlId, clId);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
     @RequestMapping(value = "/validate_cars_gs", method = RequestMethod.GET)
     public Map<String, Object> validate_cars_gs(HttpServletRequest request, @RequestParam Map<String, Object> param) {
         HttpSession session = request.getSession();
@@ -57,4 +57,21 @@ public class SchedulePlanController extends BController&lt;SchedulePlan, Long&gt; {
         return rtn;
     }
+    /**
+     * 验证排班计划时间范围内规则的正确性。
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/valttrule/{xlid}/{from}/{to}", method = RequestMethod.GET)
+    public Map<String, Object> validateRule(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "from") Date from,
+            @PathVariable(value = "to") Date to
+    ) throws Exception {
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", schedulePlanService.validateRule(xlid, from, to));
+        return rtn;
+    }
+
 }
@@ -55,6 +55,7 @@ public class BasicData {
     //线路编码和名称对照
     public static Map<String, String> lineCode2NameMap;
+    public static Map<String, String> lineCodeAllNameMap;
     //停车场
     public static List<String> parkCodeList;
@@ -315,6 +316,14 @@ public class BasicData {
             lineId2ShangHaiCodeMap = id2SHcode;
             lineCode2ShangHaiCodeMap = code2SHcode;
             stationName2YgcNumber = tempStationName2YgcNumber;
+            
+            Map<String, String> code2nameAll = new HashMap<>();
+            Iterator<Line> iteratorAll = lineRepository.findAll().iterator();
+            while (iteratorAll.hasNext()) {
+                line = iteratorAll.next();
+                code2nameAll.put(line.getLineCode(), line.getName());
+            }
+            lineCodeAllNameMap=code2nameAll;
         }
         /**
@@ -121,7 +121,7 @@ public class InStationProcess {
     private void inEndStation(ScheduleRealInfo sch, GpsEntity gps) {
         String nbbm = sch.getClZbh();
         //校验进站前置约束
-        if (!validInPremise(gps))
+        if (!validInPremise(gps) && isNormalSch(sch))
             return;
         //实达时间不覆盖
@@ -74,7 +74,7 @@ public class OutStationProcess {
      * @param gps
      */
     private void outStation(GpsEntity gps, GpsEntity prev) {
-    	logger.info("进站记录(到达时间:" + gps.getArrTime() + " 进出站状态:" + gps.getInstation() + " 站点编号:" + gps.getStopNo() + " deviceId:" + gps.getDeviceId() + " nbbm:" + gps.getNbbm() + ")");
+    	logger.info("出站记录(到达时间:" + gps.getArrTime() + " 进出站状态:" + gps.getInstation() + " 站点编号:" + gps.getStopNo() + " deviceId:" + gps.getDeviceId() + " nbbm:" + gps.getNbbm() + ")");
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         //起点发车
@@ -35,6 +35,8 @@ public class Shifday {
 	private String sjbc;//实际班次
 	private String jgh;
+
+	private String sgh;
 	private String zbh;
@@ -56,6 +58,14 @@ public class Shifday {
 		this.jgh = jgh;
 	}
+	public String getSgh() {
+		return sgh;
+	}
+
+	public void setSgh(String sgh) {
+		this.sgh = sgh;
+	}
+
 	public String getZbh() {
 		return zbh;
 	}
@@ -22,6 +22,7 @@ public class Dlb {
 	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private Date rq;
 	private String xlbm;
+	private String linename;
 	private String ssgsdm;
 	private String fgsdm;
 	private String nbbm;
@@ -102,6 +103,14 @@ public class Dlb {
 		this.xlbm = xlbm;
 	}
+	public String getLinename() {
+		return linename;
+	}
+
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+
 	public String getSsgsdm() {
 		return ssgsdm;
 	}
@@ -348,7 +357,7 @@ public class Dlb {
 	}
 	public String getXlname() {
-		return BasicData.lineCode2NameMap.get(this.xlbm);
+		return BasicData.lineCodeAllNameMap.get(this.xlbm);
 	}
 	public void setXlname(String xlname) {
@@ -22,6 +22,7 @@ public class Ylb {
 	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private Date rq;
 	private String xlbm;
+	private String linename;
 	private String ssgsdm;
 	private String fgsdm;
 	private String nbbm;
@@ -95,6 +96,15 @@ public class Ylb {
 	public void setXlbm(String xlbm) {
 		this.xlbm = xlbm;
 	}
+	
+	public String getLinename() {
+		return linename;
+	}
+
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+
 	public String getSsgsdm() {
 		return ssgsdm;
 	}
@@ -292,7 +302,7 @@ public class Ylb {
 	}
 	public String getXlname() {
-		return BasicData.lineCode2NameMap.get(this.xlbm);
+		return BasicData.lineCodeAllNameMap.get(this.xlbm);
 	}
 	public void setXlname(String xlname) {
 package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_Type;
 import javax.persistence.*;
 import java.sql.PreparedStatement;
@@ -49,6 +49,8 @@ public class CalcSheet {
 	private String sjbcs;
 	/*临加班次数*/
 	private String ljbcs;
+	/*计划发车早高峰*/
+	private String jhcczgf;
 	/*公司名字*/
 	@Transient
 	private String gsname;
@@ -173,6 +175,12 @@ public class CalcSheet {
 	}
+	public String getJhcczgf() {
+		return jhcczgf;
+	}
+	public void setJhcczgf(String jhcczgf) {
+		this.jhcczgf = jhcczgf;
+	}
 	public String getFgsname() {
 		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);
 	}
@@ -58,9 +58,11 @@ public class AccessLogFilter extends BaseFilter {
 		s.append(getBlock(params));
 		s.append(getBlock(headers));
 		s.append(getBlock(request.getHeader("Referer")));
-
-		logger.info(s.toString());
+		
+		long now = System.currentTimeMillis();
 		chain.doFilter(request, response);
+		s.append("<cost time:").append(System.currentTimeMillis() - now).append(">");
+		logger.info(s.toString());
 	}
 	private static String getParams(HttpServletRequest request) {
@@ -51,6 +51,8 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	@Query("SELECT L FROM Line L where L.destroy=0 and L.remove !=1")
 	List<Line> findAllService();
+	@Query("SELECT L FROM Line L")
+	List<Line> findAll();
 	@Modifying
 	@Query(value = "UPDATE Line l set l.name=?1 , l.company=?2, l.brancheCompany=?3, "
@@ -22,8 +22,8 @@ public interface CwjyRepository extends BaseRepository&lt;Cwjy, Integer&gt;{
 	 */
 	@Query(value="SELECT a.gsdm as gsdm,a.nbbm as nbbm,b.jsy as jsy,b.jzl as jzl ,b.stationid as stationid,"
 			+ "b.nylx as nylx,b.yj as yj,b.bz as bz,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
-   " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days(?1) and jylx=1) b " +
-  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  from bsth_c_ylb where  to_days(rq)= to_days(?1 ) group by nbbm "+
+   " left  join ( select * from bsth_c_ylxxb b where b.yyrq=?1 and jylx=1) b " +
+  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  from bsth_c_ylb where rq= ?1  group by nbbm "+
    " ) c on a.nbbm=c.nbbm  where  a.nbbm like %?2% ",nativeQuery=true)
 	List<Object[]> obtainCwjycl(String rq,String nbbm);
@@ -28,13 +28,13 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+	@Query(value="SELECT * FROM bsth_c_dlb  where rq=?1 and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc",nativeQuery=true)
 	List<Dlb> obtainDl(String rq,String gsbm,String fgsdm,String xlbm,String nbbm,String px);
 	@Query(value="select s from Dlb s "
-			+ " where to_days(?1)=to_days(s.rq) "
+			+ " where to_days(s.rq)=to_days(?1) "
 			+ " and s.ssgsdm like %?2% "
 			+ " and s.fgsdm like %?3%"
 			+ " and s.xlbm like %?4% "
@@ -49,14 +49,14 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Query(value="select nbbm,count(nbbm) from bsth_c_dlb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,count(nbbm) from bsth_c_dlb where rq=?1 and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
 			+ " group by nbbm,rq,ssgsdm,fgsdm",nativeQuery=true)
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
-	@Query(value="select nbbm,sum(cdl*100) as cdl ,sum(zlc*100) as zlc from bsth_c_dlb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,sum(cdl*100) as cdl ,sum(zlc*100) as zlc from bsth_c_dlb where rq= ?1 and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
@@ -66,7 +66,7 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	@Query(value="select cdl,hd,sh from Dlb s "
-			+ " where to_days(?1)=to_days(s.rq)  "
+			+ " where  to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm like %?2% "
 			+ " and s.fgsdm like %?3%"
 			+ " and s.xlbm like %?4% "
@@ -74,7 +74,7 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	List<Object[]> sumDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
 	@Query(value="select ifnull(cdl,0),ifnull(hd,0),ifnull(sh,0) from bsth_c_dlb "
-			+ " where to_days(?1)=to_days(rq) "
+			+ " where rq=?1 "
 			+ " and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% "
@@ -93,10 +93,10 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 				" WHERE id = ?1", nativeQuery=true)
 	public void dlbUpdate(Integer id,double czcd,double jzcd,double hd, double sh,String shyy,int yhlx);
-	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_dlb  where rq=?1 and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
 	List<Dlb> queryListDlb(String rq,String nbbm,String jgh,String xlbm);
-	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and xlbm=?2",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_dlb  where rq=?1 and xlbm=?2",nativeQuery=true)
 	List<Dlb> queryDlbByRqXlbm(String rq, String xlbm);
 }
@@ -22,7 +22,7 @@ public interface LsylbRepository extends BaseRepository&lt;Lsylb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Query(value="select nbbm,count(nbbm) from bsth_ls_ylb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,count(nbbm) from bsth_ls_ylb where rq=?1 and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5%  and nylx= ?6 "
@@ -30,7 +30,7 @@ public interface LsylbRepository extends BaseRepository&lt;Lsylb, Integer&gt;{
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int nylx);
 	@Query(value="select s from Lsylb s "
-			+ " where to_days(?1)=to_days(s.rq) "
+			+ " where to_days(s.rq)=to_days(?1) "
 			+ " and s.ssgsdm =?2 "
 			+ " and s.fgsdm =?3 "
 			+ " and s.xlbm like %?4% "
@@ -38,7 +38,7 @@ public interface LsylbRepository extends BaseRepository&lt;Lsylb, Integer&gt;{
 			+ " and s.nbbm in ?6 order by nbbm,jhsj")
 	List<Lsylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,int nylx,List<String> listNbbm);
-	@Query(value="select nbbm,sum(jzl*100) as jzl ,sum(zlc*100) as zlc from bsth_ls_ylb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,sum(jzl*100) as jzl ,sum(zlc*100) as zlc from bsth_ls_ylb where rq=?1 and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% and nylx =?6 "
@@ -47,7 +47,7 @@ public interface LsylbRepository extends BaseRepository&lt;Lsylb, Integer&gt;{
 	@Query(value="select ifnull(jzl,0),ifnull(yh,0),ifnull(sh,0) from bsth_ls_ylb "
-			+ " where to_days(?1)=to_days(rq) "
+			+ " where rq=?1 "
 			+ " and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% "
@@ -57,7 +57,7 @@ public interface LsylbRepository extends BaseRepository&lt;Lsylb, Integer&gt;{
 	@Query(value="select jzl,yh,sh from Lsylb s "
-			+ " where to_days(?1)=to_days(s.rq)  "
+			+ " where  to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm like %?2% "
 			+ " and s.fgsdm like %?3%"
 			+ " and s.xlbm like %?4% "
@@ -33,7 +33,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select y.* from (select max(d.id) as id ,d.nbbm from ("
 			+ " select b.rq,b.nbbm,max(b.jcsx) as jcsx from ("
 			+ " select max(t.rq) as rq ,t.nbbm   from bsth_c_ylb t "
-			+ " where to_days(t.rq)< to_days(?1) "
+			+ " where t.rq< ?1 "
 			+ " and t.ssgsdm like %?2% and t.fgsdm like %?3%  "
 			+ " and t.xlbm like %?4%  and t.nbbm like %?5% group by nbbm ) a "
 			+ " left join bsth_c_ylb b on  a.rq=b.rq and a.nbbm=b.nbbm "
@@ -63,29 +63,29 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+	@Query(value="SELECT * FROM bsth_c_ylb  where rq=?1 and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
 	List<Ylb> obtainYl(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+	@Query(value="SELECT * FROM bsth_c_ylb  where  rq=?1  and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm = ?4 and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
 	List<Ylb> obtainYlEq(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+	@Query(value="SELECT * FROM bsth_c_ylb  where  rq=?1  and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm = ?4 and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
 	List<Ylb> obtainYl_eq(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylb  where  rq=?1  and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
 	List<Ylb> queryListYlb(String rq,String nbbm,String jgh,String xlbm);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and xlbm=?2",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylb  where  rq=?1  and xlbm=?2",nativeQuery=true)
 	List<Ylb> queryYlbByRqXlbm(String rq,String xlbm);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4 order by ?5 asc",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylb  where  rq=?1 and nbbm =?2 and jsy=?3 and xlbm=?4 order by ?5 asc",nativeQuery=true)
 	List<Ylb> checkYlb(String rq,String nbbm,String jgh,String xlbm,String px);
 	/**
 	 * 查询当天总的加注量和总里程
@@ -102,7 +102,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Query(value="select nbbm,count(nbbm) from bsth_c_ylb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,count(nbbm) from bsth_c_ylb where  rq=?1  and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
@@ -117,7 +117,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Query(value="select nbbm,sum(jzl*100) as jzl ,sum(zlc*100) as zlc from bsth_c_ylb where to_days(?1)=to_days(rq) and "
+	@Query(value="select nbbm,sum(jzl*100) as jzl ,sum(zlc*100) as zlc from bsth_c_ylb where  rq=?1  and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
@@ -126,7 +126,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select jzl,yh,sh from Ylb s "
-			+ " where to_days(?1)=to_days(s.rq)  "
+			+ " where to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm like %?2% "
 			+ " and s.fgsdm like %?3%"
 			+ " and s.xlbm like %?4% "
@@ -134,7 +134,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Object[]> sumYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
 	@Query(value="select ifnull(jzl,0),ifnull(yh,0),ifnull(sh,0) from bsth_c_ylb "
-			+ " where to_days(?1)=to_days(rq) "
+			+ " where  rq=?1  "
 			+ " and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% "
@@ -144,7 +144,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select s from Ylb s "
-			+ " where to_days(?1)=to_days(s.rq) "
+			+ " where  to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm =?2 "
 			+ " and s.fgsdm =?3 "
 			+ " and s.xlbm like %?4% "
@@ -50,4 +50,7 @@ public interface CarConfigInfoRepository extends BaseRepository&lt;CarConfigInfo, L
     @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
     List<CarConfigInfo> findByXlId(Integer xlid);
+
+    @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
+    List<CarConfigInfo> findByClId(Integer clid);
 }
 \ No newline at end of file
@@ -43,5 +43,7 @@ public interface GuideboardInfoRepository extends BaseRepository&lt;GuideboardInfo,
     @Query(value = "SELECT g FROM GuideboardInfo g  where g.xl =?1 and g.lpName = ?2 and g.lpNo = ?3 and lpType =?4 and isCancel = 0")
     List<GuideboardInfo> validateLp(Line xl,String lpName , int lpNo,String lpType);
+
+    List<GuideboardInfo> findByXlId(Integer id);
 }
@@ -48,4 +48,6 @@ public interface TTInfoRepository extends BaseRepository&lt;TTInfo, Long&gt; {
             "from LineVersions lv where lv.line.id = ?1 and lv.status = ?2 ")
     List<Map<String, Object>> findLineVersionDescs3(Integer lineId, Integer status);
+    List<TTInfo> findByXlId(Integer xlId);
+
 }
@@ -596,7 +596,7 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Shifday> shifday(Map<String, Object> map) {
-		String line=""; 
+		String line="";
 		String date="";
 		String gsdmShif="";
 		String fgsdmShif="";
@@ -624,18 +624,17 @@ public class FormsServiceImpl implements FormsService {
 		if(!type.equals("") && !statue.equals("")){
 			sql_ +=" order by "+statue+" "+type;
 		}
-		String sql ="select t.* from (select r.schedule_date,r.j_name,"
-				+ "IFNULL(r.s_name,'')as s_name,"
-				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name "
-				+ "FROM bsth_c_s_sp_info_real r  where 1=1  "
-				+ " and r.schedule_date_str='"+date + "'  "
+		String sql ="select t.* from (select r.schedule_date,"
+				+ " IFNULL(r.s_gh,'')as s_gh,r.cl_zbh,"
+				+ " r.xl_bm,r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name"
+				+ " FROM bsth_c_s_sp_info_real r where 1=1 "
+				+ " and r.schedule_date_str='"+date + "' "
 				+ " and r.xl_bm = '"+line+"' "
 				+ " and r.gs_bm  like '%"+gsdmShif+"%' "
-				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' ) t"
-				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, "
-				+ "t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm,t.lp_name  "
-				+ sql_;
-		 
+				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' "+sql_+") t"
+				+ " GROUP BY t.schedule_date,t.xl_bm,t.cl_zbh,t.lp_name,"
+				+ " t.j_gh,t.s_gh,t.gs_bm,t.fgs_bm ";
+		
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
@@ -643,15 +642,16 @@ public class FormsServiceImpl implements FormsService {
 			public Shifday mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shifday shifday = new Shifday();
 				shifday.setRq(arg0.getString("schedule_date"));
-				shifday.setjName(arg0.getString("j_name").toString());
-				shifday.setsName(arg0.getString("s_name") == null ? "" : arg0.getString("s_name").toString());
+//				shifday.setjName(arg0.getString("j_name").toString());
+//				shifday.setsName(arg0.getString("s_name") == null ? "" : arg0.getString("s_name").toString());
 				shifday.setCarPlate(arg0.getString("cl_zbh").toString());
 				shifday.setJgh(arg0.getString("j_gh"));
+				shifday.setSgh(arg0.getString("s_gh") == null ? "" : arg0.getString("s_gh").toString());
 				shifday.setLpName(arg0.getString("lp_name")== null ? "" : arg0.getString("lp_name").toString());
 				return shifday;
 			}
-			
 		});
+		
 		List<ScheduleRealInfo> sList;
 		List<ScheduleRealInfo> list_s;
 		List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
@@ -661,8 +661,9 @@ public class FormsServiceImpl implements FormsService {
 			Shifday d=list.get(i);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(d.getJgh().equals(s.getjGh()) && d.getCarPlate().equals(s.getClZbh())
-						&&d.getLpName().equals(s.getLpName())){
+				if(d.getJgh().equals(s.getjGh()) && d.getSgh().equals(s.getsGh())
+						&& d.getCarPlate().equals(s.getClZbh())
+						&& d.getLpName().equals(s.getLpName())){
 					sList.add(s);
 					 Set<ChildTaskPlan> cts = s.getcTasks();
 			            if(cts != null && cts.size() > 0){
@@ -674,7 +675,10 @@ public class FormsServiceImpl implements FormsService {
 			            }
 				}
 			}
-			
+			if(sList.size()>0){
+				d.setjName(sList.get(0).getjName());
+				d.setsName(sList.get(0).getsName() == null ? "":sList.get(0).getsName());
+			}
 			double ksgl=culateMileageService.culateKsgl(list_s);
 			double jccgl=culateMileageService.culateJccgl(list_s);
 			double zksgl=Arith.add(ksgl, jccgl);
@@ -893,7 +897,9 @@ public class FormsServiceImpl implements FormsService {
 				if(fgsdm.length() != 0){
 					sql += " and r.fgs_bm ='"+fgsdm+"'";
 				}
-			    sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh,r.j_name order by r.xl_bm,r.cl_zbh";
+			    sql += " group by r.fgs_bm,r.j_gh,r.xl_bm,r.cl_zbh,r.j_name " +
+			    		"order by r.xl_bm,r.cl_zbh";
+			     
 			    list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 					@Override
@@ -924,7 +930,7 @@ public class FormsServiceImpl implements FormsService {
 						+ " WHERE rq = '"+startDate+"'"
 						+ linesql
 						+ " union"
-						+ "  SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh,fgsdm FROM bsth_c_dlb"
+						+ " SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh,fgsdm FROM bsth_c_dlb"
 						+ " WHERE rq = '"+startDate+"'"
 						+ linesql;
 				List<Singledata> listNy = jdbcTemplate.query(nysql, new RowMapper<Singledata>() {
@@ -968,7 +974,7 @@ public class FormsServiceImpl implements FormsService {
 						s.setsName("");
 						s.setgS(BasicData.businessFgsCodeNameMap.get(sin_.getgS()+"_"+gsdm));
 						s.setxL(line);
-						s.setXlmc(BasicData.lineCode2NameMap.get(line));
+						s.setXlmc(BasicData.lineCodeAllNameMap.get(line));
 						s.setJzl(sin_.getJzl());
 						s.setHyl(sin_.getHyl());
 						s.setUnyyyl(sin_.getUnyyyl());
@@ -1724,7 +1730,7 @@ public class FormsServiceImpl implements FormsService {
 		startDate = map.get("startDate").toString();
 		String sql="select r.s_gh,r.s_name, "
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm,xl_name"
 				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
 		if(!xlbm.equals("")){
 			sql += " and r.xl_bm = '"+xlbm+"'";
@@ -1736,7 +1742,7 @@ public class FormsServiceImpl implements FormsService {
 			sql += " and r.fgs_bm='"+fgsdm+"'";
 		}
 		sql += " group  by  r.s_gh,r.s_name,"
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm,xl_name order by r.xl_bm,r.cl_zbh";
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1750,6 +1756,7 @@ public class FormsServiceImpl implements FormsService {
 				sin.setjName(arg0.getString("j_name"));
 				sin.setSgh(arg0.getString("s_gh"));
 				sin.setsName(arg0.getString("s_name"));
+				sin.setXlmc(arg0.getString("xl_name"));
 				sin.setgS(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs_bm")+"_"+arg0.getString("gs_bm")));
 				return sin;
@@ -1767,7 +1774,7 @@ public class FormsServiceImpl implements FormsService {
 			String clzbh=sin.getClzbh();
 			String xl=sin.getxL();
 			String spy=sin.getSgh();
-			sin.setxL(BasicData.lineCode2NameMap.get(xl));
+			sin.setxL(sin.getXlmc());
 			for (int j = 0; j < listReal.size(); j++) {
 				ScheduleRealInfo s=listReal.get(j);
 				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
@@ -1912,7 +1919,12 @@ public class FormsServiceImpl implements FormsService {
 						sin.setEmptMileage(String.valueOf(zksgl));
 						sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 						sin.setxL(y.getXlbm());
-						sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
+						if(y.getLinename()==null){
+							sin.setXlmc(y.getXlname());
+						}else{
+							sin.setXlmc(y.getLinename());
+						}
+						
 						sin.setClzbh(clzbh);
 						sin.setJsy(jsy);
 						sin.setrQ(startDate);
@@ -1994,8 +2006,11 @@ public class FormsServiceImpl implements FormsService {
 						sin.setEmptMileage(String.valueOf(zksgl));
 						sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 						sin.setxL(y.getXlbm());
-						sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
-						sin.setClzbh(clzbh);
+						if(y.getLinename()==null){
+							sin.setXlmc(y.getXlname());
+						}else{
+							sin.setXlmc(y.getLinename());
+						}						sin.setClzbh(clzbh);
 						sin.setJsy(jsy);
 						sin.setrQ(startDate);
 						if(newList.size()>0){
@@ -2019,7 +2034,7 @@ public class FormsServiceImpl implements FormsService {
 				list.addAll(listD);
 			}else{
 				String sql="select r.s_gh,r.s_name, "
-						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm"
+						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm,r.xl_name"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'"
 								+ " and r.s_gh !='' and r.s_gh is not null ";
@@ -2033,7 +2048,7 @@ public class FormsServiceImpl implements FormsService {
 					sql += " and r.fgs_bm='"+fgsdm+"'";
 				}
 				sql += " group  by  r.s_gh,r.s_name,"
-						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
+						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm,r.xl_name order by r.xl_bm,r.cl_zbh";
 				 list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 					//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -2045,6 +2060,7 @@ public class FormsServiceImpl implements FormsService {
 						sin.setClzbh(arg0.getString("cl_zbh"));
 						sin.setSgh(arg0.getString("s_gh"));
 						sin.setsName(arg0.getString("s_name"));
+						sin.setXlmc(arg0.getString("xl_name"));
 						return sin;
 					}
 				});
@@ -2054,6 +2070,7 @@ public class FormsServiceImpl implements FormsService {
 					String jsy=sin.getSgh();
 					String line=sin.getxL();
 					String clzbh=sin.getClzbh();
+					String xl_name=sin.getXlmc();
 					List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
 					List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
@@ -2086,7 +2103,7 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
+					sin.setXlmc(xl_name);
 					sin.setClzbh(clzbh);
 					sin.setJsy("");
 					sin.setjName("");
@@ -2192,8 +2209,11 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setxL(y.getXlbm());
-					sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
-					sin.setClzbh(clzbh);
+					if(y.getLinename()==null){
+						sin.setXlmc(y.getXlname());
+					}else{
+						sin.setXlmc(y.getLinename());
+					}					sin.setClzbh(clzbh);
 					sin.setJsy(jsy);
 					sin.setrQ(startDate);
 					if(newList.size()>0){
@@ -2274,7 +2294,11 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setxL(y.getXlbm());
-					sin.setXlmc(BasicData.lineCode2NameMap.get(y.getXlbm()));
+					if(y.getLinename()==null){
+						sin.setXlmc(y.getXlname());
+					}else{
+						sin.setXlmc(y.getLinename());
+					}
 					sin.setClzbh(clzbh);
 					sin.setJsy(jsy);
 					sin.setrQ(startDate);
@@ -2299,7 +2323,7 @@ public class FormsServiceImpl implements FormsService {
 			list.addAll(listD);
 		}else{
 			String sql="select r.s_gh,r.s_name, "
-					+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm"
+					+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm,r.xl_name"
 					+ " from bsth_c_s_sp_info_real r where "
 					+ " r.schedule_date_str = '"+startDate+"'"
 					+ " and r.s_gh !='' and r.s_gh is not null ";
@@ -2313,7 +2337,7 @@ public class FormsServiceImpl implements FormsService {
 				sql += " and r.fgs_bm='"+fgsdm+"'";
 			}
 		       sql += " group  by  r.s_gh,r.s_name,"
-		       		+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
+		       		+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm,xl_name order by r.xl_bm,r.cl_zbh";
 			 list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 				//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -2325,6 +2349,7 @@ public class FormsServiceImpl implements FormsService {
 					sin.setClzbh(arg0.getString("cl_zbh"));
 					sin.setSgh(arg0.getString("s_gh"));
 					sin.setsName(arg0.getString("s_name"));
+					sin.setXlmc(arg0.getString("xl_name"));
 					return sin;
 				}
 			});
@@ -2334,6 +2359,7 @@ public class FormsServiceImpl implements FormsService {
 				String jsy=sin.getSgh();
 				String line=sin.getxL();
 				String clzbh=sin.getClzbh();
+				String xl_name=sin.getXlmc();
 				List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
 				List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
@@ -2367,7 +2393,7 @@ public class FormsServiceImpl implements FormsService {
 				sin.setEmptMileage(String.valueOf(zksgl));
 				sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-				sin.setXlmc(BasicData.lineCode2NameMap.get(line));
+				sin.setXlmc(xl_name);
 				sin.setClzbh(clzbh);
 				sin.setJsy("");
 				sin.setjName("");
@@ -400,7 +400,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				sql += " and cl.line_code = '"+line+"'";
 			if(ttId.length() != 0)
 				sql += " and td.ttinfo = '"+ttId+"'";
-			sql += " group by td.lp";
+			sql += " group by td.lp, lp.lp_name";
 			 list = jdbcTemplate.query(sql,
 					new RowMapper<Map<String, Object>>(){
@@ -328,7 +328,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		}
 		String sql_ylb="SELECT nbbm,group_concat(jsy) AS jsy FROM bsth_c_ylb WHERE "
-				+ " to_days(rq) = to_days('"+rq+"') AND ssgsdm = '"+gsdm+"' AND "
+				+ " rq = '"+rq+"' AND ssgsdm = '"+gsdm+"' AND "
 				+ " fgsdm = '"+fgsdm+"' GROUP BY nbbm";
 		List<Map<String, String>> ylbList= jdbcTemplate.query(sql_ylb,
@@ -197,6 +197,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
 					t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
 					t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
+					t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
 					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 					t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 					t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
@@ -464,6 +465,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								t.setZlc(map.get("totalKilometers") == null ? 0.0
 										: Double.parseDouble(map.get("totalKilometers").toString()));
 								t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+								t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
 								t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 								t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
 								t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
@@ -884,7 +886,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			String px) {
 		// TODO Auto-generated method stub
 		String sql="SELECT * FROM bsth_c_dlb  "
-				+ " where to_days('"+rq+"')=to_days(rq) and ssgsdm like '%"+gsdm+"%' "
+				+ " where rq='"+rq+"' and ssgsdm like '%"+gsdm+"%' "
 				+ " and fgsdm like '%"+fgsdm+"%'";
 		if(xlbm.equals("")){
 			sql+= " and xlbm like '%"+xlbm+"%' ";
@@ -194,6 +194,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
 						t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString()));
 						t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
+						t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
 						t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 						t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 						t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
@@ -492,6 +493,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setZlc(map.get("totalKilometers") == null ? 0.0
 							: Double.parseDouble(map.get("totalKilometers").toString()));
 					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+					t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
 					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
 					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
@@ -611,111 +611,119 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
      * 临加班次
      */
     @Override
-    public Map<String, Object> save(ScheduleRealInfo t) {
+    public Map<String, Object> save(ScheduleRealInfo sch) {
         Map<String, Object> rs = new HashMap<>();
         try {
-            if (!carExist(t.getGsBm(), t.getClZbh())) {
-                rs.put("msg", "车辆 " + t.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
-                rs.put("status", ResponseCode.ERROR);
-                return rs;
+        	String clZbh = sch.getClZbh();
+            if (StringUtils.isNotEmpty(clZbh)) {
+                //检测
+                if (!carExist(sch.getGsBm(), clZbh)) {
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "车辆 " + clZbh + " 不存在！");
+                    return rs;
+                } else if (!sch.getGsBm().equals(BasicData.nbbm2CompanyCodeMap.get(clZbh))) {
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", sch.getXlName() + "所属的公司编码下找不到自编号为【" + clZbh + "】的车辆");
+                    return rs;
+                }
             }
             SysUser user = SecurityUtils.getCurrentUser();
-            String schDate = DayOfSchedule.currSchDateMap.get(t.getXlBm());
+            String schDate = DayOfSchedule.currSchDateMap.get(sch.getXlBm());
             SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd"), sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-            if (StringUtils.isEmpty(t.getjGh())) {
+            if (StringUtils.isEmpty(sch.getjGh())) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "驾驶员工号不能为空！");
                 return rs;
             }
             //截取驾驶员工号
-            if (t.getjGh().indexOf("-") != -1) {
-                t.setjGh(t.getjGh().split("-")[1]);
+            if (sch.getjGh().indexOf("-") != -1) {
+                sch.setjGh(sch.getjGh().split("-")[1]);
             }
             //检查驾驶员工号
-            String jName = getPersonName(t.getGsBm(), t.getjGh());
+            String jName = getPersonName(sch.getGsBm(), sch.getjGh());
             if (StringUtils.isEmpty(jName)) {
-                rs.put("msg", t.getXlName() + "所属的公司编码下找不到工号为【" + t.getjGh() + "】的驾驶员");
+                rs.put("msg", sch.getXlName() + "所属的公司编码下找不到工号为【" + sch.getjGh() + "】的驾驶员");
                 rs.put("status", ResponseCode.ERROR);
                 return rs;
-            } else if (StringUtils.isEmpty(t.getjName())) {
-                t.setjName(jName);//补上驾驶员名称
+            } else if (StringUtils.isEmpty(sch.getjName())) {
+                sch.setjName(jName);//补上驾驶员名称
             }
             //有售票员
-            if (StringUtils.isNotEmpty(t.getsGh())) {
-                String sName = getPersonName(t.getGsBm(), t.getsGh());
+            if (StringUtils.isNotEmpty(sch.getsGh())) {
+                String sName = getPersonName(sch.getGsBm(), sch.getsGh());
                 if (StringUtils.isEmpty(sName)) {
-                    rs.put("msg", t.getXlName() + "所属的公司编码下找不到工号为【" + t.getjGh() + "】的售票员");
+                    rs.put("msg", sch.getXlName() + "所属的公司编码下找不到工号为【" + sch.getjGh() + "】的售票员");
                     rs.put("status", ResponseCode.ERROR);
                     return rs;
-                } else if (StringUtils.isEmpty(t.getsName())) {
-                    t.setsName(sName);//补上售票员名称
+                } else if (StringUtils.isEmpty(sch.getsName())) {
+                    sch.setsName(sName);//补上售票员名称
                 }
             } else {
-                t.setsGh("");
-                t.setsName("");
+                sch.setsGh("");
+                sch.setsName("");
             }
             //公司 和 分公司名称
-            t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
-            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm() + "_" + t.getGsBm()));
-            t.setCreateDate(new Date());
-            t.setScheduleDateStr(schDate);
-            t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
-            t.setRealExecDate(schDate);
-
-            t.setCreateBy(user);
-            t.setSflj(true);
-            t.setLate(false);
-            t.setDfsj(t.getFcsj());
-            t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
-            t.setJhlcOrig(t.getJhlc());
-            t.setCreateDate(new Date());
-            t.setUpdateDate(new Date());
-            t.setSpId(-1L);
+            sch.setGsName(BasicData.businessCodeNameMap.get(sch.getGsBm()));
+            sch.setFgsName(BasicData.businessFgsCodeNameMap.get(sch.getFgsBm() + "_" + sch.getGsBm()));
+            sch.setCreateDate(new Date());
+            sch.setScheduleDateStr(schDate);
+            sch.setScheduleDate(sdfyyyyMMdd.parse(schDate));
+            sch.setRealExecDate(schDate);
+
+            sch.setCreateBy(user);
+            sch.setSflj(true);
+            sch.setLate(false);
+            sch.setDfsj(sch.getFcsj());
+            sch.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + sch.getZdsj()).getTime());
+            sch.setJhlcOrig(sch.getJhlc());
+            sch.setCreateDate(new Date());
+            sch.setUpdateDate(new Date());
+            sch.setSpId(-1L);
             //起终点名称
-            String prefix = t.getXlBm() + "_" + t.getXlDir() + "_";
-            t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));
-            t.setZdzName(BasicData.getStationNameByCode(t.getZdzCode(), prefix));
+            String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+            sch.setQdzName(BasicData.getStationNameByCode(sch.getQdzCode(), prefix));
+            sch.setZdzName(BasicData.getStationNameByCode(sch.getZdzCode(), prefix));
             //计算班次实际执行时间
-            schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
+            schAttrCalculator.calcRealDate(sch).calcAllTimeByFcsj(sch);
             //处理计达跨24点
-            LineConfig conf = lineConfigData.get(t.getXlBm());
-            if (t.getZdsj().compareTo(conf.getStartOpt()) < 0) {
-                t.setZdsjT(sdfyyyyMMddHHmm.parse(t.getScheduleDateStr() + t.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
+            LineConfig conf = lineConfigData.get(sch.getXlBm());
+            if (sch.getZdsj().compareTo(conf.getStartOpt()) < 0) {
+                sch.setZdsjT(sdfyyyyMMddHHmm.parse(sch.getScheduleDateStr() + sch.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
             }
             //班次历时
-            t.setBcsj((int) ((t.getZdsjT() - t.getDfsjT()) / 1000 / 60));
-            if (t.getZdsjT() < t.getFcsjT()) {
+            sch.setBcsj((int) ((sch.getZdsjT() - sch.getDfsjT()) / 1000 / 60));
+            if (sch.getZdsjT() < sch.getFcsjT()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "起终点时间异常！");
                 return rs;
             }
-            t.setId(dayOfSchedule.getId());
+            sch.setId(dayOfSchedule.getId());
             //实时入库
-            super.save(t);
+            super.save(sch);
             // 加入缓存
-            dayOfSchedule.put(t);
+            dayOfSchedule.put(sch);
             //更新起点应到时间
-            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(t);
+            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch);
             //重新计算车辆当前执行班次
-            dayOfSchedule.reCalcExecPlan(t.getClZbh());
+            dayOfSchedule.reCalcExecPlan(sch.getClZbh());
             //记录站到场历时数据
-            Station2ParkBuffer.put(t);
+            Station2ParkBuffer.put(sch);
             rs.put("ts", ts);
-            rs.put("t", t);
+            rs.put("t", sch);
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -3257,6 +3265,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          * 对计划发车时间相同的班次进行排序 out最前 in最后
          */
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        SimpleDateFormat sdfnyr =new SimpleDateFormat("yyyy-MM-dd");
         String minfcsj = "02:00";
         List<Line> lineList = lineRepository.findLineByCode(line);
         if (lineList.size() > 0) {
@@ -3285,9 +3294,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 Calendar calendar = new GregorianCalendar();
                 calendar.setTime(s.getScheduleDate());
                 calendar.add(calendar.DATE, 1);
-                s.setScheduleDate(calendar.getTime());
+                Date date_sch= calendar.getTime();
                 try {
-                    fscjT = sdf.parse(sdf.format(s.getScheduleDate()) + " " + s.getFcsj()).getTime();
+                    fscjT = sdf.parse(sdfnyr.format(date_sch) + " " + s.getFcsj()).getTime();
                 } catch (ParseException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
@@ -3299,15 +3308,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 } catch (ParseException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
-                }
-                ;
+                };
             }
             s.setFcsjT(fscjT);
         }
         List<ScheduleRealInfo> listInfo2=new ArrayList<ScheduleRealInfo>();
         listInfo2.addAll(listInfo);
         Collections.sort(listInfo, new compareLpFcsjType());
-        System.out.println(listInfo);
         Collections.sort(listInfo2,new compareDirLpFcsjType());
         for (int i = 0; i < listInfo.size(); i++) {
             ScheduleRealInfo t = listInfo.get(i);
@@ -3446,6 +3453,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          * 对计划发车时间相同的班次进行排序 out最前 in最后
          */
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        SimpleDateFormat sdfnyr = new SimpleDateFormat("yyyy-MM-dd");
+
         String minfcsj = "02:00";
         List<Line> lineList = lineRepository.findLineByCode(line);
         if (lineList.size() > 0) {
@@ -3474,9 +3483,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 Calendar calendar = new GregorianCalendar();
                 calendar.setTime(s.getScheduleDate());
                 calendar.add(calendar.DATE, 1);
-                s.setScheduleDate(calendar.getTime());
+                Date date_sch=calendar.getTime();
                 try {
-                    fscjT = sdf.parse(sdf.format(s.getScheduleDate()) + " " + s.getFcsj()).getTime();
+                    fscjT = sdf.parse(sdfnyr.format(date_sch) + " " + s.getFcsj()).getTime();
                 } catch (ParseException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
@@ -3765,6 +3774,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             boolean fage = true;
             String company = "";
             String bCompany = "";
+            String lineName="";
             List<ScheduleRealInfo> listS = new ArrayList<ScheduleRealInfo>();
             for (ScheduleRealInfo scheduleRealInfo : lists) {
                 if (scheduleRealInfo.getjGh().equals(jName)
@@ -3775,6 +3785,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         //根据线路代码获取公司
                         company = scheduleRealInfo.getGsBm();
                         bCompany = scheduleRealInfo.getFgsBm();
+                        lineName = scheduleRealInfo.getXlName();
                         fage = false;
                     }
                     Set<ChildTaskPlan> cts = scheduleRealInfo.getcTasks();
@@ -3789,6 +3800,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             yesterdayDataList.get(x).put("company", company);
             yesterdayDataList.get(x).put("bCompany", bCompany);
+            yesterdayDataList.get(x).put("lineName", lineName);
             Double ljgl = culateMieageService.culateLjgl(listS);
             Double sjgl = culateMieageService.culateSjgl(listS);
             Double ksgl = culateMieageService.culateKsgl(listS);
@@ -4964,6 +4976,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String state = map.get("state").toString();
         String type = map.get("type").toString();
         String genre =map.get("genre").toString();
+        String df="";
+        if(map.get("df")!=null){
+        	df=map.get("df").toString();
+        }		
+
         List<Map<String, Object>> dataList2 = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> dataList3 = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> list1 = this.statisticsDaily(line, date, xlName, null);
@@ -5096,9 +5113,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 Long zdsj_ = Long.parseLong(zdsj_s[0]) * 60 + Long.parseLong(zdsj_s[1]);
                 Long zdsjActual_ = Long.parseLong(zdsjActual_s[0]) * 60 + Long.parseLong(zdsjActual_s[1]);
                 if ((zdsj_ - zdsjActual_) > 0) {
-                    zdsjk = String.valueOf(zdsj_ - zdsjActual_);
+                	if(zdsj_ - zdsjActual_>1200){
+                		zdsjm=String.valueOf(1440-(zdsj_-zdsjActual_));
+                	}else{
+                        zdsjk = String.valueOf(zdsj_ - zdsjActual_);
+                	}
                 } else {
-                    zdsjm = String.valueOf(zdsjActual_ - zdsj_);
+                	if(zdsjActual_ - zdsj_>1200){
+                		zdsjk =String.valueOf(1440-(zdsjActual_ - zdsj_));
+                	}else{
+                		zdsjm = String.valueOf(zdsjActual_ - zdsj_);
+                	}
                 }
             }
             tempMap.put("zdsjk" + x, zdsjk);
@@ -5117,17 +5142,48 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             tempMap.put("fcsjActual" + x, fcsjActuralstr);
             String fcsjk = "";
             String fcsjm = "";
+            String dfsjk ="";
+            String dfsjm="";
             if (!fcsjActural.equals("")) {
-                String[] zdsj_s = schedule.getFcsj().split(":");
+                String[] fcsj_s = schedule.getFcsj().split(":");
                 String[] fcsjActural_s = fcsjActural.split(":");
-                Long zdsj_ = Long.parseLong(zdsj_s[0]) * 60 + Long.parseLong(zdsj_s[1]);
+                Long fcsj_ = Long.parseLong(fcsj_s[0]) * 60 + Long.parseLong(fcsj_s[1]);
                 Long fcsjActural_ = Long.parseLong(fcsjActural_s[0]) * 60 + Long.parseLong(fcsjActural_s[1]);
-                if ((zdsj_ - fcsjActural_) > 0) {
-                    fcsjk = String.valueOf(zdsj_ - fcsjActural_);
+                if ((fcsj_ - fcsjActural_) > 0) {
+                	if(fcsj_ - fcsjActural_>1200){
+                		fcsjm=String.valueOf(1440-(fcsj_ - fcsjActural_));
+                	}else{
+                		fcsjk = String.valueOf(fcsj_ - fcsjActural_);
+                	}
+                } else {
+                	if(fcsjActural_ - fcsj_>1200){
+                		fcsjk =String.valueOf(1440-(fcsjActural_ - fcsj_));
+                	}
+                	else{
+                		fcsjm = String.valueOf(fcsjActural_ - fcsj_);
+                	}
+                }
+                String[] dfsj_s =schedule.getDfsj().split(":");
+                Long dfsj_ = Long.parseLong(dfsj_s[0]) * 60 + Long.parseLong(dfsj_s[1]);
+                if ((dfsj_ - fcsjActural_) > 0) {
+                	if(dfsj_ - fcsjActural_>1200){
+                		dfsjm=String.valueOf(1440-(dfsj_ - fcsjActural_));
+                	}else{
+                		dfsjk = String.valueOf(dfsj_ - fcsjActural_);
+                	}
                 } else {
-                    fcsjm = String.valueOf(fcsjActural_ - zdsj_);
+                	if(fcsjActural_ - dfsj_>1200){
+                		dfsjk=  String.valueOf(1440-(fcsjActural_ - dfsj_));
+                	}else{
+                    	dfsjm = String.valueOf(fcsjActural_ - dfsj_);
+                	}
                 }
             }
+            if(df.equals("df")){
+            	 tempMap.put("dfsj"+x,schedule.getDfsj());
+            	 tempMap.put("dfsjk" + x, dfsjk);
+                 tempMap.put("dfsjm" + x, dfsjm.equals("0")?"":dfsjm);
+            }
             tempMap.put("fcsjk" + x, fcsjk);
             tempMap.put("fcsjm" + x, fcsjm.equals("0")?"":fcsjm);
             tempMap.put("remarks" + x, schedule.getRemark() != null ? schedule.getRemark() : "");
@@ -5146,6 +5202,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 tempMap.put("fcsjActual1", "");
                 tempMap.put("fcsjk1", "");
                 tempMap.put("fcsjm1", "");
+                if(df.equals("df")){
+               	 tempMap.put("dfsj1","");
+               	 tempMap.put("dfsjk1" , "");
+                 tempMap.put("dfsjm1" , "");
+                }
                 tempMap.put("remarks1", "");
             }
             if (tempMap.get("lpName2") == null) {
@@ -5159,6 +5220,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 tempMap.put("fcsjActual2", "");
                 tempMap.put("fcsjk2", "");
                 tempMap.put("fcsjm2", "");
+                if(df.equals("df")){
+              	 tempMap.put("dfsj2","");
+              	 tempMap.put("dfsjk2" , "");
+                 tempMap.put("dfsjm2" , "");
+                }
                 tempMap.put("remarks2", "");
             }
             dataList3.add(tempMap);
@@ -5205,6 +5271,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     sdfSimple = new SimpleDateFormat("yyyyMM");
                     sourcePath = path + "mould/scheduleDaily_m.xls";
                 }
+                if(df.equals("df")){
+                	sourcePath =path + "mould/scheduleDaily_df.xls";
+                }
                 ee.excelReplace(listI, new Object[]{nMap}, sourcePath,
                         path + "export/" + sdfSimple.format(sdfMonth.parse(date)) + lineName + "调度日报.xls");
             } catch (Exception e) {
@@ -12,4 +12,5 @@ public interface CalcSheetService extends BaseService&lt;CalcSheet, Integer&gt;{
 	public List<CalcSheet> calcListSheet(Map<String, Object> map);
 	public List<Sheet>  calcSheet(Map<String, Object> map);
 	public List<Map<String, Object>> calcTurnoutrate(Map<String, Object> map);
+	public List<Map<String, Object>> calcTurnoutrateZgf(Map<String, Object> map);
 }
@@ -5,6 +5,7 @@ import java.util.Map;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -56,4 +57,6 @@ public interface ReportService {
 	 List<Map<String, Object>> countDjg(Map<String, Object> map);
 	 Map<String, Object> online(Map<String, Object> map);
+	 
+	 List<Singledata> singledatatj(Map<String, Object> map);
  }
@@ -774,6 +774,91 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		}
 		return fage;
 	}
+	 
+	@Override
+	public List<Map<String,Object>> calcTurnoutrateZgf(Map<String, Object> map){
+		final DecimalFormat df = new DecimalFormat("0.00");
+		String line="";
+		if(map.get("line")!=null){
+			line =map.get("line").toString().trim();
+		}
+		String gs="";
+		if(map.get("gsdmTurn")!=null){
+			gs=map.get("gsdmTurn").toString().trim();
+		}
+		String fgs="";
+		if(map.get("fgsdmTurn")!=null){
+			fgs=map.get("fgsdmTurn").toString().trim();
+		}
+//		String nature="0";
+//		if(map.get("nature")!=null){
+//			nature=map.get("nature").toString();
+//		}
+//    	Map<String, Boolean> lineMap=lineService.lineNature();
+
+		String startDate=map.get("startDate").toString();
+		String endDate=map.get("endDate").toString();
+		String date=startDate+"-"+endDate;
+		if(startDate.equals(endDate)){
+			date=startDate;
+		}else{
+			date=startDate+"-"+endDate;
+		}
+		String type=map.get("type").toString();
+		final String dates=date;
+		String sql_="";
+		if(line.equals("")){
+			sql_= " and gsdm ='"+gs+"' and fgsdm like '%"+fgs+"%'";
+		}else{
+			sql_=" and xl='"+line+"'";
+		}
+		String sql=" select gsdm,fgsdm,xl,xl_name,sum(jhcc) as jhcc,sum(sjcc) as sjcc,"
+				+ " sum(jhcczgf) as jhcczgf, sum(sjcczgf) as sjcczgf "
+				+ " from bsth_c_calc_sheet where date >='"+startDate+"' and date <='"+endDate+"'"
+				+ sql_
+				+ " group by gsdm,fgsdm,xl,xl_name";
+		List<Map<String, Object>> lists=jdbcTemplate.query(sql, 
+				 new RowMapper<Map<String, Object>>(){
+			 @Override 
+			 public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 Map<String, Object> s=new HashMap<String,Object>();
+				 s.put("rq",dates);
+				 s.put("gsdm", rs.getString("gsdm"));
+				 s.put("fgsdm", rs.getString("fgsdm"));
+				 s.put("gsName", BasicData.businessCodeNameMap.get(rs.getString("gsdm")));
+				 s.put("fgsName", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsdm")+"_"+rs.getString("gsdm")));
+				 s.put("xl", rs.getString("xl"));
+				 s.put("xlName", rs.getString("xl_name"));
+				 s.put("jhcc", rs.getInt("jhcc"));
+				 s.put("sjcc", rs.getInt("sjcc"));
+				 s.put("sjcczgf", rs.getInt("sjcczgf"));
+				 s.put("jhcczgf", rs.getInt("jhcczgf"));
+				 if(rs.getInt("jhcc")>0){
+					 s.put("ccl",df.format((float)rs.getInt("sjcc")/rs.getInt("jhcc")*100)+"%");
+				 }else{
+					 s.put("ccl", "0.00%");
+				 }
+				 if(rs.getInt("jhcczgf")>0){
+					 s.put("cclzgf", df.format((float)rs.getInt("sjcczgf")/rs.getInt("jhcczgf")*100)+"%");
+				 }else{
+					 s.put("cclzgf","0.00%");
+				 }
+				 s.put("sm", "");
+				 return s;
+			 }
+		});
+		if (type.equals("export")) {
+			String lineName=map.get("lineName").toString();
+			ReportUtils ee = new ReportUtils();
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			listI.add(lists.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/calcTurnoutrateZgf.xls", path + "export/"
+					+ dates + "-" + lineName + "-营运线路出车率统计表.xls");
+		}
+		return lists;
+	}
+	 
 	@Override
 	public List<Map<String, Object>> calcTurnoutrate(Map<String, Object> map) {
     	final DecimalFormat df = new DecimalFormat("0.00");
@@ -6,6 +6,7 @@ import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
 import com.bsth.entity.mcy_forms.Daily;
+import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -52,6 +53,9 @@ public class ReportServiceImpl implements ReportService{
 	private Logger logger = LoggerFactory.getLogger(this.getClass());
+	SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+            sdfSimple = new SimpleDateFormat("yyyyMMdd");
+	
 	@Autowired
 	JdbcTemplate jdbcTemplate;
@@ -65,7 +69,10 @@ public class ReportServiceImpl implements ReportService{
 	LineRepository lineRepository;
 	@Autowired
 	StationRouteRepository stationRouteRepository;
-
+	@Autowired
+	CulateMileageService culateMileageService;
+	
+	
 	@Override
 	public List<ScheduleRealInfo> queryListBczx(String line, String date,String clzbh) {
 		// TODO Auto-generated method stub
@@ -3549,6 +3556,393 @@ public class ReportServiceImpl implements ReportService{
 		}
 		return list;
 	}
+	@Override
+	public List<Singledata> singledatatj(Map<String, Object> map) {
+		String sfyy="";
+		if(map.get("sfyy")!=null){
+			sfyy=map.get("sfyy").toString();
+		}
+		String gsdm="";
+		if(map.get("gsdmSing")!=null){
+			gsdm=map.get("gsdmSing").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdmSing")!=null){
+			fgsdm=map.get("fgsdmSing").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		String tjtype=map.get("tjtype").toString();
+		String xlbm=map.get("line").toString().trim();
+		String startDate = map.get("startDate").toString();
+		String endDate = map.get("endDate").toString();
+
+		List<ScheduleRealInfo> listReal=new ArrayList<ScheduleRealInfo>();
+		if(xlbm.equals("")){
+			listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj(xlbm, startDate, endDate, gsdm, fgsdm);
+		}else{
+			listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj2(xlbm, startDate, endDate);
+		}
+		List<Singledata> list=new ArrayList<Singledata>();
+		List<Singledata> list_=new ArrayList<Singledata>();
+		if(tjtype.equals("jsy")){
+			//油统计
+			String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.fgs_bm"
+					+ " from bsth_c_s_sp_info_real r where "
+					+ " r.schedule_date_str >= '"+startDate+"'"
+					+ " and r.schedule_date_str<='"+endDate+"'";
+			if(xlbm.length() != 0){
+				sql += " and r.xl_bm = '"+xlbm+"'";
+			}
+			if(gsdm.length() != 0){
+				sql += " and r.gs_bm ='"+gsdm+"'";
+			}
+			if(fgsdm.length() != 0){
+				sql += " and r.fgs_bm ='"+fgsdm+"'";
+			}
+		    sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh order by r.xl_bm,r.cl_zbh";
+		    
+		    list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
+				@Override
+				public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Singledata sin = new Singledata();
+					sin.setxL(arg0.getString("xl_bm"));
+					sin.setJsy(arg0.getString("j_gh"));
+					sin.setClzbh(arg0.getString("cl_zbh"));
+					sin.setgS(arg0.getString("fgs_bm"));
+					return sin;
+				}
+			});
+
+		    
+		    String linesql="";
+		    if(!xlbm.equals("")){
+		    	linesql +=" and xlbm ='"+xlbm+"' ";
+		    }
+		    if(!gsdm.equals("")){
+		    	linesql +=" and ssgsdm ='"+gsdm+"' ";
+		    }
+		    if(!fgsdm.equals("")){
+		    	linesql +=" and fgsdm ='"+fgsdm+"' ";
+		    }
+			/*String nysql="SELECT id,xlbm,nbbm,jsy,jzl as jzl,yh as yh,sh as sh,fgsdm FROM bsth_c_ylb"
+					+ " WHERE rq >= '"+startDate+"' and rq <='"+endDate+"'"
+					+ linesql
+					+ " union"
+					+ "  SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh,fgsdm FROM bsth_c_dlb"
+					+ " WHERE rq = '"+startDate+"' and rq <='"+endDate+"'"
+					+ linesql;*/
+		    
+		    String nysql="SELECT 'yh' as type,xlbm,nbbm,jsy,sum(jzl*1000)/1000 as jzl,"
+		    		+ " sum(yh*1000)/1000 as yh,"
+		    		+ " sum(sh*1000)/1000 as sh FROM "
+		    		+ "bsth_c_ylb  where  rq>='"+startDate+"' "
+		    		+ " and rq <='"+endDate+"' " +linesql
+		    		+ " group by xlbm ,nbbm,jsy "
+		    		+ " union SELECT 'dh' as type,xlbm,nbbm,jsy, "
+		    		+ " sum(cdl*1000)/1000 as jzl,sum(hd*1000)/1000 as yh,"
+		    		+ " sum(sh * 1000) / 1000 AS sh"
+		    		+ " FROM  bsth_c_dlb where rq>='"+startDate+"' "
+		    		+ " and rq <='"+endDate+"'" +linesql
+		    		+ " group by xlbm ,nbbm,jsy" ;
+
+			List<Singledata> listNy = jdbcTemplate.query(nysql, new RowMapper<Singledata>() {
+				@Override
+				public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Singledata sin = new Singledata();
+					sin.setxL(arg0.getString("xlbm"));
+					sin.setJsy(arg0.getString("jsy"));
+					sin.setClzbh(arg0.getString("nbbm"));
+					sin.setJzl(arg0.getString("jzl"));
+					sin.setHyl(arg0.getString("yh"));
+					sin.setUnyyyl(arg0.getString("sh"));
+					return sin;
+				}
+			});
+			//统计油，电表中手动添加的或者有加注没里程的数据
+			for (int i = 0; i < listNy.size(); i++) {
+				Singledata sin_=listNy.get(i);
+				String jsy=sin_.getJsy();
+				String line=sin_.getxL();
+				String clzbh=sin_.getClzbh();
+				boolean fages=true;
+				for (int j = 0; j < list.size(); j++) {
+					Singledata sin=list.get(j);
+					String jsy_=sin.getJsy();
+					String line_=sin.getxL();
+					String clzbh_=sin.getClzbh();
+					if(jsy.equals(jsy_)
+					 &&line.equals(line_)
+					 &&clzbh.equals(clzbh_)){
+						fages=false;
+					}
+				}
+				if(fages){
+					Singledata s=new Singledata();
+					s.setJsy(jsy);
+					s.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+					s.setClzbh(clzbh);
+					s.setSgh("");
+					s.setsName("");
+					s.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+					s.setxL(line);
+					s.setXlmc(BasicData.lineCodeAllNameMap.get(line));
+					s.setJzl(sin_.getJzl());
+					s.setHyl(sin_.getHyl());
+					s.setUnyyyl(sin_.getUnyyyl());
+					s.setJhlc("0.0");
+					s.setEmptMileage("0.0");
+					s.setJhjl("0.0");
+					if(startDate.equals(endDate))
+						s.setrQ(startDate);
+					else
+						s.setrQ(startDate+"-"+endDate);
+
+					list_.add(s);
+				}
+			}
+			for (int  i= 0; i < list.size(); i++) {
+				Singledata sin=list.get(i);
+				String jsy=sin.getJsy();
+				String line=sin.getxL();
+				String clzbh=sin.getClzbh();
+				double jzl=0.0;
+				double yh=0.0;
+				double sh=0.0;
+				for (int j = 0; j < listNy.size(); j++) {
+					Singledata y=listNy.get(j);
+					if(y.getJsy().equals(jsy)
+					  &&y.getClzbh().equals(clzbh)
+					  &&y.getxL().equals(line)){
+						jzl=Arith.add(jzl, y.getJzl());
+						yh=Arith.add(yh, y.getHyl());
+						sh=Arith.add(sh, y.getUnyyyl());
+					}
+				}
+				sin.setHyl(String.valueOf(yh));
+				sin.setJzl(String.valueOf(jzl));
+				sin.setUnyyyl(String.valueOf(sh));
+				
+				List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+				List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
+				for (int j = 0; j < listReal.size(); j++) {
+					ScheduleRealInfo s=listReal.get(j);
+					if(s.getjGh().equals(jsy)
+						&& s.getClZbh().equals(clzbh)
+						&&s.getXlBm().equals(line)){
+							newList.add(s);
+							Set<ChildTaskPlan> cts = s.getcTasks();
+				            if(cts != null && cts.size() > 0){
+				            	newList_.add(s);
+				            }else{
+					            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+					            	newList_.add(s);
+					            }
+				            }
+					}
+				}
+				double jhgl=culateMileageService.culateJhgl(newList);
+				double jhjcc=culateMileageService.culateJhJccgl(newList);
+				double yygl=culateMileageService.culateSjgl(newList_);
+				double ljgl=culateMileageService.culateLjgl(newList_);
+				double ksgl=culateMileageService.culateKsgl(newList_);
+				double jcgl=culateMileageService.culateJccgl(newList_);
+				
+				double zyygl=Arith.add(yygl, ljgl);
+				double zksgl=Arith.add(ksgl, jcgl);
+				sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
+				sin.setEmptMileage(String.valueOf(zksgl));
+				sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
+				if(newList.size()>0){
+					sin.setXlmc(newList.get(0).getXlName());
+					sin.setjName(newList.get(0).getjName());
+				}else{
+					sin.setXlmc(BasicData.lineCodeAllNameMap.get(line));
+					sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+
+				}	
+				if(startDate.equals(endDate))
+					sin.setrQ(startDate);
+				else
+					sin.setrQ(startDate+"-"+endDate);
+//				sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+				sin.setSgh("");
+				sin.setsName("");
+				sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+				list_.add(sin);
+				
+			}
+		}else{
+			String sql="select r.s_gh,r.s_name, "
+					+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm"
+					+ " from bsth_c_s_sp_info_real r where "
+					+ " r.schedule_date_str >= '"+startDate+"'"
+					+ " schedule_date_str <='"+endDate+"'"
+					+ " and r.s_gh !='' and r.s_gh is not null ";
+			if(!xlbm.equals("")){
+				sql += " and r.xl_bm = '"+xlbm+"'";
+			}
+			if(!gsdm.equals("")){
+				sql += " and r.gs_bm = '"+gsdm+"'";
+			}
+			if(!fgsdm.equals("")){
+				sql += " and r.fgs_bm = '"+fgsdm+"'";
+			}
+		    sql += " group  by  r.s_gh,r.s_name,"
+		       		+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
+		
+			list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
+				//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				@Override
+				public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Singledata sin = new Singledata();
+//					sin.setrQ(startDate);
+					sin.setxL(arg0.getString("xl_bm"));
+					sin.setClzbh(arg0.getString("cl_zbh"));
+					sin.setSgh(arg0.getString("s_gh"));
+					sin.setsName(arg0.getString("s_name"));
+					sin.setgS(arg0.getString("fgs_bm"));
+					return sin;
+				}
+			});
+			
+			String spy="";
+			if(map.get("map")!=null){
+				spy=map.get("spy").toString();
+			}
+			for (int i = 0; i < list.size(); i++) {
+				Singledata sin=list.get(i);
+				sin.setrQ(startDate+"-"+endDate);
+				String jsy=sin.getSgh();
+				String line=sin.getxL();
+				String clzbh=sin.getClzbh();
+				List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+				List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
+
+				for (int j = 0; j < listReal.size(); j++) {
+					ScheduleRealInfo s=listReal.get(j);
+					if(s.getsGh().equals(jsy) && s.getClZbh().equals(clzbh)
+							&&s.getXlBm().equals(line)){
+						newList.add(s);
+						 Set<ChildTaskPlan> cts = s.getcTasks();
+				            if(cts != null && cts.size() > 0){
+				            	newList_.add(s);
+				            }else{
+					            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+					            	newList_.add(s);
+					            }
+				            }
+					}
+				}
+				double jhgl=culateMileageService.culateJhgl(newList);;
+				double jhjcc=culateMileageService.culateJhJccgl(newList);
+				double yygl=0.0;
+				double ljgl=0.0;
+				double zksgl=0.0;
+				if(spy.equals("zrw")){
+					yygl=culateMileageService.culateSjgl_spy(newList_);
+					ljgl=culateMileageService.culateLjgl_spy(newList_);
+					zksgl=culateMileageService.culateSjfyylc_spy(newList_);
+				}else{
+					yygl=culateMileageService.culateSjgl(newList_);
+					ljgl=culateMileageService.culateLjgl(newList_);
+					double ksgl=culateMileageService.culateKsgl(newList_);
+					double jcgl=culateMileageService.culateJccgl(newList_);
+					 zksgl=Arith.add(ksgl, jcgl);
+				}
+				double zyygl=Arith.add(yygl, ljgl);
+				sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
+				sin.setEmptMileage(String.valueOf(zksgl));
+				sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
+				if(newList.size()>0)
+					sin.setXlmc(newList.get(0).getXlName());
+				else
+					sin.setXlmc(BasicData.lineCodeAllNameMap.get(line));
+				sin.setClzbh(clzbh);
+				sin.setJsy("");
+				sin.setjName("");
+				sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+				sin.setHyl("");
+				sin.setJzl("");
+				sin.setUnyyyl("");
+				list_.add(sin);
+			}
+		}
+		
+		/*Map<String, Boolean> lineNature = lineService.lineNature();
+		List<Singledata> resList = new ArrayList<Singledata>();
+		for(Singledata s : list_){
+			String xlBm = s.getxL();
+			if(sfyy.length() != 0){
+				if(sfyy.equals("0")){
+					resList.add(s);
+				} else if(sfyy.equals("1")){
+					if(lineNature.containsKey(xlBm) && lineNature.get(xlBm)){
+						resList.add(s);
+					}
+				} else {
+					if(lineNature.containsKey(xlBm) && !lineNature.get(xlBm)){
+						resList.add(s);
+					}
+				}
+			} else {
+				resList.add(s);
+			}
+		}*/
+		
+		
+		 if (type.equals("export")) {
+		        List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		        ReportUtils ee = new ReportUtils();
+		        
+		        List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+				int i = 1;
+				for (Singledata l : list_) {
+					Map<String, Object> m = new HashMap<String, Object>();
+					m.put("i", i);
+					m.put("rQ", l.getrQ());
+					m.put("gS", l.getgS());
+					m.put("xL", l.getXlmc());
+					m.put("clzbh", l.getClzbh());
+					m.put("jsy", l.getJsy());
+					m.put("jName", l.getjName());
+					m.put("sgh", l.getSgh());
+					m.put("sName", l.getsName());
+					m.put("jhlc", l.getJhlc());
+					m.put("emptMileage", l.getEmptMileage());
+					m.put("hyl", l.getHyl());
+					m.put("jzl", l.getJzl());
+					m.put("unyyyl", l.getUnyyyl());
+					m.put("jhjl", l.getJhjl());
+					resList.add(m);
+					
+					i++;
+				}
+		        
+	            listI.add(resList.iterator());
+	            try {
+	            	String exportDate="";
+	  	            if(startDate.equals(endDate)){
+	  	            	exportDate =sdfSimple.format(sdfMonth.parse(startDate)) ;
+	  	            }else{
+	  	            	exportDate =sdfSimple.format(sdfMonth.parse(startDate))+"-"+sdfSimple.format(sdfMonth.parse(endDate)) ;
+	  	            }
+	  	          String  lineName = ""; 
+	  	          if(map.containsKey("lineName"))
+	  				lineName = map.get("lineName").toString();
+	  	          
+	  	          String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+	  	          ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls",
+	  					path + "export/" +exportDate
+	  					+ "-" + lineName + "-路单统计.xls");
+	            } catch (ParseException e) {
+	                e.printStackTrace();
+	            }
+	        }
+		return list_;
+	}
 }
@@ -10,7 +10,10 @@ import java.util.List;
  * Created by xu on 16/5/9.
  */
 public interface CarConfigInfoService extends BService<CarConfigInfo, Long> {
+    // 判定车辆是否配置在其他线路上
     void validate_cars(CarConfigInfo carConfigInfo) throws ScheduleException;
+    // 判定车辆是否配置在其他线路上2
+    void validate_cars(Integer xlId, Integer clId) throws ScheduleException;
     // 判定车辆是否配置在当前线路中
     void validate_cars_config(CarConfigInfo carConfigInfo) throws ScheduleException;
     // 判定车辆所属公司和当前用户的所属公司
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.service.schedule.rules.ttinfo2.Result;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.rule.ValidateRuleResult;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.Result;
 import java.util.Date;
@@ -26,4 +27,13 @@ public interface SchedulePlanService extends BService&lt;SchedulePlan, Long&gt; {
      * @return
      */
     Result validateTTInfo(Integer xlid, Date from, Date to);
+
+    /**
+     * 验证规则。
+     * @param xlId 线路id
+     * @param from 排班计划开始时间
+     * @param to 排班计划结束时间
+     * @return
+     */
+    ValidateRuleResult validateRule(Integer xlId, Date from, Date to);
 }
 \ No newline at end of file
@@ -130,6 +130,18 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
     }
     @Override
+    public void validate_cars(Integer xlId, Integer clId) throws ScheduleException {
+        Map<String, Object> param = new HashMap<>();
+        param.put("cl.id_eq", clId);
+        List<CarConfigInfo> carConfigInfos = list(param);
+        for (CarConfigInfo carConfigInfo : carConfigInfos) {
+            if (!carConfigInfo.getXl().getId().equals(xlId)) {
+                throw new ScheduleException("车辆不配置在当前线路下，配置在" + carConfigInfo.getXl().getName() + "线路中！");
+            }
+        }
+    }
+
+    @Override
     public void validate_cars_config(CarConfigInfo carConfigInfo) throws ScheduleException {
         Map<String, Object> param = new HashMap<>();
         param.put("xl.id_eq", carConfigInfo.getXl().getId());
 package com.bsth.service.schedule.impl;
+import com.bsth.entity.CarDevice;
 import com.bsth.entity.Cars;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.service.schedule.CarDeviceService;
 import com.bsth.service.schedule.CarsService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsFile;
@@ -12,7 +16,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import java.io.File;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 /**
@@ -24,6 +30,48 @@ public class CarsServiceImpl extends BServiceImpl&lt;Cars, Integer&gt; implements Cars
     @Qualifier(value = "cars_dataTool")
     private DataToolsService dataToolsService;
+    @Autowired
+    @Qualifier(value = "carDeviceServiceImpl_sc")
+    private CarDeviceService carDeviceService;
+
+    @Autowired
+    private CarConfigInfoRepository carConfigInfoRepository;
+
+    @Override
+    public Cars save(Cars cars) {
+        if (cars.getId() != null && cars.getScrapState()) { // 更新车辆信息，报废车辆
+            // 1、作废的车辆，修改报废号
+            String eCode = cars.getEquipmentCode();
+            cars.setEquipmentCode("BF-" + eCode);
+            cars.setScrapCode("BF-" + cars.getEquipmentCode());
+            // 2、添加一条相关的设备替换记录
+            // 查找在哪条线路上
+            List<CarConfigInfo> carConfigInfoList = carConfigInfoRepository.findByClId(cars.getId());
+            for (CarConfigInfo carConfigInfo : carConfigInfoList) {
+                CarDevice carDevice = new CarDevice();
+                carDevice.setGsName(cars.getCompany());
+                carDevice.setCompany(cars.getBusinessCode());
+                carDevice.setBrancheCompany(cars.getBrancheCompanyCode());
+                carDevice.setCl(cars.getId());
+                carDevice.setClZbh(cars.getInsideCode());
+                carDevice.setXl(carConfigInfo.getXl().getId());
+                carDevice.setXlName(carConfigInfo.getXl().getName());
+                carDevice.setXlBm(carConfigInfo.getXl().getLineCode());
+                carDevice.setOldDeviceNo(eCode);
+                carDevice.setNewDeviceNo("BF-" + eCode);
+                carDevice.setIsCancel(false);
+
+                carDevice.setCreateBy(cars.getCreateBy());
+                carDevice.setUpdateBy(cars.getUpdateBy());
+                carDevice.setCreateDate(new Date());
+                carDevice.setUpdateDate(new Date());
+                carDeviceService.save(carDevice);
+            }
+        }
+
+        return super.save(cars);
+    }
+
     @Override
     public void importData(File file, Map<String, Object> params) throws ScheduleException {
         dataToolsService.importData(file, params);
 package com.bsth.service.schedule.impl;
+import com.bsth.entity.Line;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.repository.BusinessRepository;
@@ -7,10 +8,11 @@ import com.bsth.repository.LineRepository;
 import com.bsth.repository.schedule.*;
 import com.bsth.service.schedule.SchedulePlanService;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.plan.DroolsSchedulePlan;
-import com.bsth.service.schedule.rules.ScheduleRuleService;
-import com.bsth.service.schedule.rules.ttinfo2.CalcuParam;
-import com.bsth.service.schedule.rules.ttinfo2.Result;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.rule.ValidateRuleResult;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.CalcuParam;
+import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.Result;
+import com.bsth.service.schedule.impl.plan.DroolsSchedulePlan;
+import com.bsth.service.schedule.impl.plan.ScheduleRuleService;
 import org.joda.time.DateTime;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
@@ -42,6 +44,10 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     private KieBase preKBase;
     @Autowired
+    @Qualifier("KBase3")
+    private KieBase validateKBase;
+
+    @Autowired
     private ScheduleRule1FlatRepository scheduleRule1FlatRepository;
     @Autowired
     private TTInfoRepository ttInfoRepository;
@@ -52,6 +58,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     @Autowired
     private CarConfigInfoRepository carConfigInfoRepository;
     @Autowired
+    private GuideboardInfoRepository guideboardInfoRepository;
+    @Autowired
     private EmployeeConfigInfoRepository employeeConfigInfoRepository;
     @Autowired
     private BusinessRepository businessRepository;
@@ -146,22 +154,25 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     public Result validateTTInfo(Integer xlid, Date from, Date to) {
         // 构造drools session->载入数据->启动规则->计算->销毁session
         // 创建session，内部配置的是stateful
-        KieSession session = coreKBase.newKieSession();
+        KieSession session = validateKBase.newKieSession();
         // 设置gloable对象，在drl中通过别名使用
         session.setGlobal("log", logger);
-        session.setGlobal("lineRepository", lineRepository);
         session.setGlobal("tTInfoDetailRepository", ttInfoDetailRepository);
         Result rs = new Result(); // 输出gloable对象
         session.setGlobal("rs", rs);
         // 载入数据
+        Line line = lineRepository.findOne(xlid);
+        session.insert(line);
+
         CalcuParam calcuParam = new CalcuParam(
                 new DateTime(from), new DateTime(to), xlid);
         session.insert(calcuParam);
-        List<TTInfo> ttInfos = (List<TTInfo>) ttInfoRepository.findAll();
-        for (TTInfo ttInfo: ttInfos)
-                session.insert(ttInfo);
+        List<TTInfo> ttInfos = ttInfoRepository.findByXlId(xlid);
+        for (TTInfo ttInfo: ttInfos) {
+            session.insert(ttInfo);
+        }
         // 执行rule
         session.fireAllRules();
@@ -171,4 +182,30 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         return rs;
     }
+
+    @Override
+    public ValidateRuleResult validateRule(Integer xlId, Date from, Date to) {
+        KieSession session = validateKBase.newKieSession();
+        session.setGlobal("LOG", logger);
+        session.setGlobal("ccRepo", carConfigInfoRepository);
+        session.setGlobal("lpRepo", guideboardInfoRepository);
+        session.setGlobal("ecRepo", employeeConfigInfoRepository);
+        session.setGlobal("ruleRepo", scheduleRule1FlatRepository);
+
+        ValidateRuleResult result = new ValidateRuleResult();
+        session.setGlobal("result", result);
+
+        com.bsth.service.schedule.impl.plan.kBase3.validate.rule.CalcuParam calcuParam =
+                new com.bsth.service.schedule.impl.plan.kBase3.validate.rule.CalcuParam();
+        calcuParam.setXlId(xlId);
+        calcuParam.setFromDate(new DateTime(from));
+        calcuParam.setToDate(new DateTime(to));
+        session.insert(calcuParam);
+
+        session.fireAllRules();
+
+        session.dispose();;
+
+        return result;
+    }
 }
-package com.bsth.service.schedule.plan;
+package com.bsth.service.schedule.impl.plan;
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.SchedulePlan;
@@ -8,17 +8,16 @@ import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.repository.BusinessRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.schedule.*;
-import com.bsth.service.schedule.rules.ScheduleRuleService;
-import com.bsth.service.schedule.rules.plan.PlanCalcuParam_input;
-import com.bsth.service.schedule.rules.plan.PlanResult;
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
-import com.bsth.service.schedule.rules.rerun.RerunRule_param;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
-import com.bsth.service.schedule.rules.ttinfo.*;
-import com.bsth.service.schedule.rules.validate.ValidateParam;
-import com.bsth.service.schedule.rules.validate.ValidateResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.plan.PlanCalcuParam_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.plan.PlanResult;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_param;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleCalcuParam_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.*;
+import com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidateParam;
+import com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidateResults_output;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.kie.api.KieBase;
-package com.bsth.service.schedule.rules;
+package com.bsth.service.schedule.impl.plan;
 import org.kie.api.KieBase;
 import org.kie.api.KieBaseConfiguration;
@@ -56,27 +56,24 @@ public class MyDroolsConfiguration {
         // 3.2、写入drl（写法超多，有点混乱）
         // 这里使用文件的形式写入，TODO：以后考虑从数据库中读drl写入
         // 注意kfs写的时候如果指定path，强制为src/main/resources/加上文件名，还有就是文件名不要重复否则会覆盖的
-        kfs.write("src/main/resources/functions.drl", kieServices.getResources()
+        kfs.write("src/main/resources/kBase1_core_shiftloop.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/functions.drl"), "UTF-8"));
-        kfs.write("src/main/resources/shiftloop_fb_2.drl", kieServices.getResources()
+                        "/rules/kBase1_core_shiftloop.drl"), "UTF-8"));
+        kfs.write("src/main/resources/kBase1_core_ttinfo.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/shiftloop_fb_2.drl"), "UTF-8"));
-        kfs.write("src/main/resources/ttinfo.drl", kieServices.getResources()
+                        "/rules/kBase1_core_ttinfo.drl"), "UTF-8"));
+        kfs.write("src/main/resources/kBase1_core_plan.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/ttinfo.drl"), "UTF-8"));
-        kfs.write("src/main/resources/ttinfo2.drl", kieServices.getResources()
+                        "/rules/kBase1_core_plan.drl"), "UTF-8"));
+        kfs.write("src/main/resources/kBase1_core_rerun.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/ttinfo2.drl"), "UTF-8"));
-        kfs.write("src/main/resources/plan.drl", kieServices.getResources()
+                        "/rules/kBase1_core_rerun.drl"), "UTF-8"));
+        kfs.write("src/main/resources/kBase1_core_validate.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/plan.drl"), "UTF-8"));
-        kfs.write("src/main/resources/rerun.drl", kieServices.getResources()
+                        "/rules/kBase1_core_validate.drl"), "UTF-8"));
+        kfs.write("src/main/resources/kBase1_core_functions.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/rerun.drl"), "UTF-8"));
-        kfs.write("src/main/resources/validplan.drl", kieServices.getResources()
-                .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/validplan.drl"), "UTF-8"));
+                        "/rules/kBase1_core_functions.drl"), "UTF-8"));
         // TODO：还有其他drl....
         // 4、创建KieBuilder，使用KieFileSystem构建
@@ -134,9 +131,9 @@ public class MyDroolsConfiguration {
         // 这里使用文件的形式写入，TODO：以后考虑从数据库中读drl写入
         // 注意kfs写的时候如果指定path，强制为src/main/resources/加上文件名，还有就是文件名不要重复否则会覆盖的
-        kfs.write("src/main/resources/ruleWrap.drl", kieServices.getResources()
+        kfs.write("src/main/resources/kBase2_wrap_rule.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/ruleWrap.drl"), "UTF-8"));
+                        "/rules/kBase2_wrap_rule.drl"), "UTF-8"));
         // TODO：还有其他drl....
@@ -161,4 +158,52 @@ public class MyDroolsConfiguration {
         return kieBase;
     }
+
+    /**
+     * 验证相关的drl知识库。
+     * @return
+     */
+    @Bean(name = "KBase3")
+    public KieBase myKieBase3() {
+        KieServices kieServices = KieServices.Factory.get();
+        KieModuleModel kieModuleModel = kieServices.newKieModuleModel();
+        KieBaseModel kieBaseModel = kieModuleModel.newKieBaseModel("KBase3")
+                .setDefault(true)
+                .setEqualsBehavior(EqualityBehaviorOption.EQUALITY)
+                .setEventProcessingMode(EventProcessingOption.STREAM);
+        kieBaseModel.newKieSessionModel("KSession1")
+                .setDefault(true)
+                .setType(KieSessionModel.KieSessionType.STATEFUL)
+                .setClockType(ClockTypeOption.get("realtime"));
+
+        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+        kieFileSystem.writeKModuleXML(kieModuleModel.toXML());
+
+        kieFileSystem.write(
+                "src/main/resources/kBase3_validate_timetable.drl",
+                kieServices.getResources().newInputStreamResource(
+                        this.getClass().getResourceAsStream("/rules/kBase3_validate_timetable.drl"),
+                        "UTF-8"));
+        kieFileSystem.write(
+                "src/main/resources/kbase3_validate_rule.drl",
+                kieServices.getResources().newInputStreamResource(
+                        this.getClass().getResourceAsStream("/rules/kBase3_validate_rule.drl"),
+                        "UTF-8"));
+
+        KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem).buildAll();
+        Results results = kieBuilder.getResults();
+        if (results.hasMessages(Message.Level.ERROR)) {
+            throw new IllegalStateException("构建drools6错误：" + results.getMessages());
+        }
+
+        ReleaseId releaseId = kieServices.getRepository().getDefaultReleaseId();
+        KieContainer kieContainer = kieServices.newKieContainer(releaseId);
+
+        KieBaseConfiguration kieBaseConfiguration = kieServices.newKieBaseConfiguration();
+        KieBase kieBase = kieContainer.newKieBase("KBase3", kieBaseConfiguration);
+
+        return kieBase;
+
+    }
+
 }
-package com.bsth.service.schedule.rules;
+package com.bsth.service.schedule.impl.plan;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_input;
 import java.util.Date;
 import java.util.List;
-package com.bsth.service.schedule.rules;
+package com.bsth.service.schedule.impl.plan;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
-import com.bsth.service.schedule.rules.rerun.RerunRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.rerun.RerunRule_input;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-package com.bsth.service.schedule.rules.plan;
+package com.bsth.service.schedule.impl.plan.kBase1.core.plan;
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleResults_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.TTInfoResults_output;
 /**
  * 排班规则-规则输入参数。
-package com.bsth.service.schedule.rules.plan;
+package com.bsth.service.schedule.impl.plan.kBase1.core.plan;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-package com.bsth.service.schedule.rules.rerun;
+package com.bsth.service.schedule.impl.plan.kBase1.core.rerun;
 /**
  * Created by xu on 17/4/26.
-package com.bsth.service.schedule.rules.rerun;
+package com.bsth.service.schedule.impl.plan.kBase1.core.rerun;
 import java.util.Set;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
 import com.bsth.entity.schedule.TTInfoDetail;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
 import com.bsth.entity.schedule.TTInfoDetail;
 import org.joda.time.LocalTime;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
 import com.bsth.entity.schedule.TTInfoDetail;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
 import com.bsth.entity.schedule.SchedulePlan;
 import org.joda.time.DateTime;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
 import org.joda.time.DateTime;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
 import org.apache.commons.lang3.StringUtils;
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
 /**
  * 排班规则_输入_输出_类型。
-package com.bsth.service.schedule.rules.shiftloop;
+package com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.google.common.base.Splitter;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
 import org.joda.time.DateTime;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
 import java.util.ArrayList;
 import java.util.List;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.ScheduleRule_input;
 import org.joda.time.DateTime;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
 import org.joda.time.DateTime;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
 import org.joda.time.DateTime;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-package com.bsth.service.schedule.rules.ttinfo;
+package com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo;
 import com.bsth.entity.schedule.TTInfo;
 import org.apache.commons.lang3.StringUtils;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResult_output;
 import org.kie.api.runtime.rule.AccumulateFunction;
 import java.io.*;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import org.kie.api.runtime.rule.AccumulateFunction;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
 import org.joda.time.DateTime;
 import org.joda.time.Period;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
+import com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResult_output;
 import java.util.Date;
 import java.util.List;
-package com.bsth.service.schedule.rules.validate;
+package com.bsth.service.schedule.impl.plan.kBase1.core.validate;
 import java.util.ArrayList;
 import java.util.Date;
+package com.bsth.service.schedule.impl.plan.kBase3.validate.rule;
+
+import org.joda.time.DateTime;
+
+/**
+ * 计算用参数。
+ */
+public class CalcuParam {
+    /** 线路Id */
+    private Integer xlId;
+
+    /** 计划开始计算日期 */
+    private DateTime fromDate;
+    /** 计划结束计算日期 */
+    private DateTime toDate;
+
+    public Integer getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(Integer xlId) {
+        this.xlId = xlId;
+    }
+
+    public DateTime getFromDate() {
+        return fromDate;
+    }
+
+    public void setFromDate(DateTime fromDate) {
+        this.fromDate = fromDate;
+    }
+
+    public DateTime getToDate() {
+        return toDate;
+    }
+
+    public void setToDate(DateTime toDate) {
+        this.toDate = toDate;
+    }
+}
+package com.bsth.service.schedule.impl.plan.kBase3.validate.rule;
+
+
+import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.schedule.GuideboardInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 查找错误函数。
+ */
+public class ErrorInfoFunction implements AccumulateFunction {
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+
+    }
+
+    protected static class ErrorInfoContext implements Externalizable {
+        /** 错误数量 */
+        public Integer errorCount = 0;
+        /** 错误Map，Map<规则id，errorInfo> */
+        public Map<Long, ValidateRuleResult.ErrorInfo> errorInfoMap = new HashMap<>();
+
+        public ErrorInfoContext() {
+
+        }
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            errorCount = in.readInt();
+            errorInfoMap = (Map<Long, ValidateRuleResult.ErrorInfo>) in.readObject();
+
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeInt(errorCount);
+            out.writeObject(errorInfoMap);
+        }
+
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new ErrorInfoContext();
+    }
+
+    @Override
+    public void init(Serializable serializable) throws Exception {
+        ErrorInfoContext errorInfoContext = (ErrorInfoContext) serializable;
+        errorInfoContext.errorCount = 0;
+        errorInfoContext.errorInfoMap = new HashMap<>();
+    }
+
+    @Override
+    public void accumulate(Serializable serializable, Object o) {
+        ErrorInfoContext errorInfoContext = (ErrorInfoContext) serializable;
+        WrapInput wrapInput = (WrapInput) o;
+
+        ValidateRuleResult.ErrorInfo errorInfo = new ValidateRuleResult.ErrorInfo();
+        errorInfo.setRuleId(wrapInput.getRuleId());
+        errorInfo.setClZbh(wrapInput.getClZbh());
+        errorInfo.setQyrq(wrapInput.getQyrq());
+
+        // 1、车辆配置验证
+        if (StringUtils.isNotEmpty(wrapInput.getClZbh())) { // 自编号不能为空
+            if (wrapInput.getCcInfos().get(wrapInput.getClZbh()) == null) { // 车辆配置不在当前线路上
+                errorInfo.getErrorDescList().add("车辆配置不在当前线路，请重新编辑保存！");
+            }
+        } else {
+            errorInfo.getErrorDescList().add("自编号不能为空，请重新编辑保存！");
+        }
+
+        // 2、路牌id，路牌名字，路牌起始索引验证
+        if (StringUtils.isNotEmpty(wrapInput.getLpIds()) &&
+                StringUtils.isNotEmpty(wrapInput.getLpNames())) { // 冗余的路牌id和路牌名字都不能为空
+            String[] lpIds = wrapInput.getLpIds().split(",");
+            String[] lpNames = wrapInput.getLpNames().split(",");
+            if (lpIds.length == lpNames.length) { // 路牌id和路牌名字个数一致
+                for (int i = 0; i < lpIds.length; i++) {
+                    if (!NumberUtils.isDigits(lpIds[i])) { // 冗余路牌id必须是数字
+                        errorInfo.getErrorDescList().add("冗余路牌id必须是数字，请重新编辑保存！");
+                        break;
+                    }
+
+                    GuideboardInfo lpInfo = wrapInput.getLpInfos().get(NumberUtils.toLong(lpIds[i]));
+                    if (lpInfo == null) { // 路牌不在当前线路上
+                        errorInfo.getErrorDescList().add("路牌不在当前线路上，请重新编辑保存！");
+                    } else {
+                        if (StringUtils.isEmpty(lpNames[i]) ||
+                                !(lpNames[i].equals(lpInfo.getLpName()))) { // 路牌id和路牌名字不对应
+                            errorInfo.getErrorDescList().add("路牌id和路牌名字不对应，请重新编辑保存！");
+                            break;
+                        }
+                    }
+                }
+
+                if (wrapInput.getLpStartIndex() < 1 ||
+                        wrapInput.getLpStartIndex() > lpIds.length) { // 路牌起始索引溢出
+                    errorInfo.getErrorDescList().add("路牌起始索引溢出，请重新编辑保存！");
+                }
+            } else {
+                errorInfo.getErrorDescList().add("路牌id和路牌名字个数不一致，请重新编辑保存！");
+            }
+        } else {
+            errorInfo.getErrorDescList().add("冗余的路牌id和路牌名字都不能为空，请重新编辑保存！");
+        }
+
+        // 3、人员配置，搭班编码，人员起始索引验证
+        if (StringUtils.isNotEmpty(wrapInput.getEcIds()) &&
+                StringUtils.isNotEmpty(wrapInput.getEcDbbms())) { // 冗余的人员配置id和人员搭班编码都不能为空
+            String[] ecIds = wrapInput.getEcIds().split(",");
+            String[] ecDbbms = wrapInput.getEcDbbms().split(",");
+            if (ecIds.length == ecDbbms.length) { // 人员配置id和搭班编码个数一致
+                for (int i = 0; i < ecIds.length; i++) {
+                    if (ecIds[i].contains("-")) { // 分班标识
+                        String[] fb_ecIds = ecIds[i].split("-");
+                        String[] fb_ecDbbms = ecDbbms[i].split("-");
+                        if (fb_ecIds.length != 2 || fb_ecDbbms.length != 2) { // 只能早晚分班
+                            errorInfo.getErrorDescList().add("只能早晚分班，请重新编辑保存！");
+                            break;
+                        } else {
+                            EmployeeConfigInfo fb_ecInfo1 = wrapInput.getEcInfos().get(NumberUtils.toLong(fb_ecIds[0]));
+                            EmployeeConfigInfo fb_ecInfo2 = wrapInput.getEcInfos().get(NumberUtils.toLong(fb_ecIds[1]));
+                            if (fb_ecInfo1 == null || fb_ecInfo2 == null) { // 分班的人员配置不在当前线路
+                                errorInfo.getErrorDescList().add("分班的人员配置不在当前线路，请重新编辑保存！");
+                                break;
+                            } else {
+                                if (StringUtils.isEmpty(fb_ecDbbms[0]) ||
+                                        StringUtils.isEmpty(fb_ecDbbms[1]) ||
+                                        !(fb_ecDbbms[0].equals(fb_ecInfo1.getDbbm())) ||
+                                        !(fb_ecDbbms[1].equals(fb_ecInfo2.getDbbm()))) { // 分班人员配置id和搭班编码不对应
+                                    errorInfo.getErrorDescList().add("分班人员配置id和搭班编码不对应，请重新编辑保存！");
+                                    break;
+                                }
+                            }
+                        }
+
+                    } else {
+                        if (!NumberUtils.isDigits(ecIds[i])) { // 冗余的人员配置id必须是数字
+                            errorInfo.getErrorDescList().add("冗余的人员配置id必须是数字，请重新编辑保存！");
+                            break;
+                        }
+
+                        EmployeeConfigInfo ecInfo = wrapInput.getEcInfos().get(NumberUtils.toLong(ecIds[i]));
+                        if (ecInfo == null) { // 人员配置不在当前线路
+                            errorInfo.getErrorDescList().add("人员配置不在当前线路，请重新编辑保存！");
+                            break;
+                        } else {
+                            if (StringUtils.isEmpty(ecDbbms[i]) ||
+                                    !(ecDbbms[i].equals(ecInfo.getDbbm()))) { // 人员配置id和搭班编码不对应
+                                errorInfo.getErrorDescList().add("人员配置id和搭班编码不对应，请重新编辑保存！");
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (wrapInput.getEcStartIndex() < 1 ||
+                        wrapInput.getEcStartIndex() > ecIds.length) { // 人员起始索引溢出
+                    errorInfo.getErrorDescList().add("人员起始索引溢出，请重新编辑保存！");
+                }
+            } else {
+                errorInfo.getErrorDescList().add("人员配置id和搭班编码个数不一致，请重新编辑保存！");
+            }
+        }
+
+        if (errorInfo.getErrorDescList().size() > 0) {
+            errorInfoContext.errorCount ++;
+            errorInfoContext.errorInfoMap.put(wrapInput.getRuleId(), errorInfo);
+        }
+
+    }
+
+    @Override
+    public void reverse(Serializable serializable, Object o) throws Exception {
+        ErrorInfoContext errorInfoContext = (ErrorInfoContext) serializable;
+        WrapInput wrapInput = (WrapInput) o;
+
+        if (errorInfoContext.errorInfoMap.get(wrapInput.getRuleId()) != null) {
+            errorInfoContext.errorInfoMap.remove(wrapInput.getRuleId());
+            errorInfoContext.errorCount --;
+        }
+    }
+
+    @Override
+    public Object getResult(Serializable serializable) throws Exception {
+        ErrorInfoContext errorInfoContext = (ErrorInfoContext) serializable;
+        return errorInfoContext.errorInfoMap;
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return true;
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return Map.class;
+    }
+
+}
+package com.bsth.service.schedule.impl.plan.kBase3.validate.rule;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 输出结果值。
+ */
+public class ValidateRuleResult {
+    /** 线路id */
+    private Integer xlId;
+    /** 规则总数量 */
+    private Integer count;
+    /** 启用的规则数量 */
+    private Integer qyCount;
+    /** 启用规则中的错误数量 */
+    private Integer qyErrorCount;
+    /** 错误列表 */
+    private List<ErrorInfo> errorInfos = new ArrayList<>();
+
+    public Integer getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(Integer xlId) {
+        this.xlId = xlId;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    public Integer getQyCount() {
+        return qyCount;
+    }
+
+    public void setQyCount(Integer qyCount) {
+        this.qyCount = qyCount;
+    }
+
+    public Integer getQyErrorCount() {
+        return qyErrorCount;
+    }
+
+    public void setQyErrorCount(Integer qyErrorCount) {
+        this.qyErrorCount = qyErrorCount;
+    }
+
+    public List<ErrorInfo> getErrorInfos() {
+        return errorInfos;
+    }
+
+    public void setErrorInfos(List<ErrorInfo> errorInfos) {
+        this.errorInfos = errorInfos;
+    }
+
+    public static class ErrorInfo {
+        /** 规则id */
+        private Long ruleId;
+        /** 车辆自编号 */
+        private String clZbh;
+        /** 启用日期 */
+        private Date qyrq;
+        /** 错误描述 */
+        private List<String> errorDescList = new ArrayList<>();
+
+        public Long getRuleId() {
+            return ruleId;
+        }
+
+        public void setRuleId(Long ruleId) {
+            this.ruleId = ruleId;
+        }
+
+        public String getClZbh() {
+            return clZbh;
+        }
+
+        public void setClZbh(String clZbh) {
+            this.clZbh = clZbh;
+        }
+
+        public Date getQyrq() {
+            return qyrq;
+        }
+
+        public void setQyrq(Date qyrq) {
+            this.qyrq = qyrq;
+        }
+
+        public List<String> getErrorDescList() {
+            return errorDescList;
+        }
+
+        public void setErrorDescList(List<String> errorDescList) {
+            this.errorDescList = errorDescList;
+        }
+    }
+}
+package com.bsth.service.schedule.impl.plan.kBase3.validate.rule;
+
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+
+/**
+ * 聚合输入的待判定数据。
+ */
+public class WrapInput {
+    /** 线路Id */
+    private Integer xlId;
+    /** 车辆自编号 */
+    private String clZbh;
+    /** 路牌id列表 */
+    private String lpIds;
+    /** 路牌名字列表 */
+    private String lpNames;
+    /** 人员配置列表 */
+    private String ecIds;
+    /** 人员搭班编码列表 */
+    private String ecDbbms;
+    /** 路牌循环起始索引 */
+    private Integer lpStartIndex;
+    /** 人员循环起始索引 */
+    private Integer ecStartIndex;
+    /** 规则id */
+    private Long ruleId;
+    /** 启用日期 */
+    private Date qyrq;
+
+    private Map<String, CarConfigInfo> ccInfos = new HashMap<>();
+    private Map<Long, GuideboardInfo> lpInfos = new HashMap<>();
+    private Map<Long, EmployeeConfigInfo> ecInfos = new HashMap<>();
+
+    public WrapInput(ScheduleRule1Flat r,
+                     Map<String, CarConfigInfo> cc,
+                     Map<Long, GuideboardInfo> lp,
+                     Map<Long, EmployeeConfigInfo> ec) {
+        this.xlId = r.getXl().getId();
+        this.clZbh = r.getCarConfigInfo().getCl().getInsideCode();
+        this.lpIds = r.getLpIds();
+        this.lpNames = r.getLpNames();
+        this.ecIds = r.getRyConfigIds();
+        this.ecDbbms = r.getRyDbbms();
+        this.lpStartIndex = r.getLpStart();
+        this.ecStartIndex = r.getRyStart();
+        this.ruleId = r.getId();
+        this.qyrq = r.getQyrq();
+
+        if (!CollectionUtils.isEmpty(cc)) {
+            this.ccInfos.putAll(cc);
+        }
+        if (!CollectionUtils.isEmpty(lp)) {
+            this.lpInfos.putAll(lp);
+        }
+        if (!CollectionUtils.isEmpty(ec)) {
+            this.ecInfos.putAll(ec);
+        }
+
+    }
+
+    public Integer getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(Integer xlId) {
+        this.xlId = xlId;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getLpIds() {
+        return lpIds;
+    }
+
+    public void setLpIds(String lpIds) {
+        this.lpIds = lpIds;
+    }
+
+    public String getLpNames() {
+        return lpNames;
+    }
+
+    public void setLpNames(String lpNames) {
+        this.lpNames = lpNames;
+    }
+
+    public String getEcIds() {
+        return ecIds;
+    }
+
+    public void setEcIds(String ecIds) {
+        this.ecIds = ecIds;
+    }
+
+    public String getEcDbbms() {
+        return ecDbbms;
+    }
+
+    public void setEcDbbms(String ecDbbms) {
+        this.ecDbbms = ecDbbms;
+    }
+
+    public Integer getLpStartIndex() {
+        return lpStartIndex;
+    }
+
+    public void setLpStartIndex(Integer lpStartIndex) {
+        this.lpStartIndex = lpStartIndex;
+    }
+
+    public Integer getEcStartIndex() {
+        return ecStartIndex;
+    }
+
+    public void setEcStartIndex(Integer ecStartIndex) {
+        this.ecStartIndex = ecStartIndex;
+    }
+
+    public Long getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(Long ruleId) {
+        this.ruleId = ruleId;
+    }
+
+    public Date getQyrq() {
+        return qyrq;
+    }
+
+    public void setQyrq(Date qyrq) {
+        this.qyrq = qyrq;
+    }
+
+    public Map<String, CarConfigInfo> getCcInfos() {
+        return ccInfos;
+    }
+
+    public void setCcInfos(Map<String, CarConfigInfo> ccInfos) {
+        this.ccInfos = ccInfos;
+    }
+
+    public Map<Long, GuideboardInfo> getLpInfos() {
+        return lpInfos;
+    }
+
+    public void setLpInfos(Map<Long, GuideboardInfo> lpInfos) {
+        this.lpInfos = lpInfos;
+    }
+
+    public Map<Long, EmployeeConfigInfo> getEcInfos() {
+        return ecInfos;
+    }
+
+    public void setEcInfos(Map<Long, EmployeeConfigInfo> ecInfos) {
+        this.ecInfos = ecInfos;
+    }
+}
-package com.bsth.service.schedule.rules.ttinfo2;
+package com.bsth.service.schedule.impl.plan.kBase3.validate.timetable;
 import org.joda.time.DateTime;
-package com.bsth.service.schedule.rules.ttinfo2;
+package com.bsth.service.schedule.impl.plan.kBase3.validate.timetable;
 import com.bsth.entity.schedule.TTInfoDetail;
 import org.apache.commons.lang3.StringUtils;
-package com.bsth.service.schedule.rules.ttinfo2;
+package com.bsth.service.schedule.impl.plan.kBase3.validate.timetable;
 import java.util.ArrayList;
 import java.util.List;
@@ -22,6 +22,8 @@ public class Result {
         private Long ttid;
         /** 时刻表名字 */
         private String ttname;
+        /** 线路版本 */
+        private Integer lineVersion;
         /** 所有班次数 */
         private Long allbc;
@@ -90,5 +92,13 @@ public class Result {
         public void setErrorbc(Long errorbc) {
             this.errorbc = errorbc;
         }
+
+        public Integer getLineVersion() {
+            return lineVersion;
+        }
+
+        public void setLineVersion(Integer lineVersion) {
+            this.lineVersion = lineVersion;
+        }
     }
 }
@@ -17,15 +17,22 @@ spring.datasource.max-idle=8
 spring.datasource.min-idle=8
 spring.datasource.initial-size=5
+spring.datasource.max-wait=10000
+spring.datasource.remove-abandoned=true
+spring.datasource.remove-abandoned-timeout=120
+
 spring.datasource.test-on-borrow=true
 spring.datasource.test-on-connect=true
 spring.datasource.test-on-return=true
 spring.datasource.test-while-idle=true
 spring.datasource.validation-query=select 1
+spring.datasource.time-between-eviction-runs-millis=1800000
 ## gps client data
 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
 http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive = http://10.10.200.79:8080/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://10.10.200.79:8080/transport_server/message/
+## maintenance report
+http.report.url = http://116.247.73.122:9098/jgjwsystem_j2ee/
 \ No newline at end of file
 spring.profiles: dev,prod
-spring.profiles.active: dev
+spring.profiles.active: prod
 spring.view.suffix=.html
 server.session-timeout=-1
-<?xml version="1.0" encoding="UTF-8"?>
-<transformation>
-  <info>
-    <name>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x51fa;</name>
-    <description>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x51fa;</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>cgsbm_in</name>
-            <default_value/>
-            <description>&#x5206;&#x516c;&#x53f8;&#x7f16;&#x7801;</description>
-        </parameter>
-        <parameter>
-            <name>filepath</name>
-            <default_value/>
-            <description>excel&#x6587;&#x4ef6;&#x8def;&#x5f84;</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;08&#x2f;05 16&#x3a;42&#x3a;22.753</created_date>
-  <modified_user>-</modified_user>
-  <modified_date>2016&#x2f;08&#x2f;05 16&#x3a;42&#x3a;22.753</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>&#x516c;&#x53f8;&#x67e5;&#x8be2;</from><to>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</from><to>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</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>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x8868;&#x8f93;&#x5165;</from><to>&#x6dfb;&#x52a0;&#x67e5;&#x8be2;&#x5e38;&#x91cf;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</from><to>&#x662f;&#x5426;&#x7535;&#x8f66;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x662f;&#x5426;&#x7535;&#x8f66;</from><to>Excel&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop>
-  </order>
-  <step>
-    <name>Excel&#x8f93;&#x51fa;</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;filepath&#x7d;</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>yyyyMMddHHmmss</date_time_format>
-      <sheetname>&#x5de5;&#x4f5c;&#x8868;1</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>&#x662f;&#x5426;&#x7535;&#x8f66;</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>498</xloc>
-      <yloc>348</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>business_code</name>
-        <field>business_code</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>business_name</name>
-        <rename>gs</rename>
-        <default/>
-        <type>String</type>
-      </value>
-    </lookup>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>364</xloc>
-      <yloc>60</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>business_code</name>
-        <field>up_code</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>branche_company_code</name>
-        <field>business_code</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>business_name</name>
-        <rename>fgs</rename>
-        <default/>
-        <type>String</type>
-      </value>
-    </lookup>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>491</xloc>
-      <yloc>60</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
-    <type>SelectValues</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <fields>      <field>        <name>car_plate</name>
-        <rename>&#x8f66;&#x724c;&#x53f7;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>inside_code</name>
-        <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>gs</name>
-        <rename>&#x6240;&#x5c5e;&#x516c;&#x53f8;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>fgs</name>
-        <rename>&#x6240;&#x5c5e;&#x5206;&#x516c;&#x53f8;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>supplier_name</name>
-        <rename>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>equipment_code</name>
-        <rename>&#x8bbe;&#x5907;&#x7ec8;&#x7aef;&#x53f7;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>sfdc</name>
-        <rename>sfdc_cal</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>        <select_unspecified>N</select_unspecified>
-    </fields>     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>495</xloc>
-      <yloc>173</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>227</xloc>
-      <yloc>59</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x8868;&#x8f93;&#x5165;</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <connection>bus_control_variable</connection>
-    <sql>SELECT &#x2a; FROM bsth_c_cars&#xa;&#xa;</sql>
-    <limit>0</limit>
-    <lookup/>
-    <execute_each_row>N</execute_each_row>
-    <variables_active>Y</variables_active>
-    <lazy_conversion_active>N</lazy_conversion_active>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>88</xloc>
-      <yloc>59</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x662f;&#x5426;&#x7535;&#x8f66;</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 &#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x5426;&#x22;&#x3b;&#xa;&#xa;if&#x28;sfdc_cal&#x29; &#x7b;&#xa;	&#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x662f;&#x22;&#x3b;&#xa;&#x7d;&#xa;</jsScript_script>
-      </jsScript>    </jsScripts>    <fields>      <field>        <name>&#x662f;&#x5426;&#x7535;&#x8f66;</name>
-        <rename>&#x662f;&#x5426;&#x7535;&#x8f66;</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>695</xloc>
-      <yloc>173</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step_error_handling>
-  </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;&#x51fa;</name>
+    <description>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x51fa;</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>QUERY</name>
+            <default_value/>
+            <description>&#x67e5;&#x8be2;</description>
+        </parameter>
+        <parameter>
+            <name>cgsbm_in</name>
+            <default_value/>
+            <description>&#x5206;&#x516c;&#x53f8;&#x7f16;&#x7801;</description>
+        </parameter>
+        <parameter>
+            <name>filepath</name>
+            <default_value>1&#x3d;1</default_value>
+            <description>excel&#x6587;&#x4ef6;&#x8def;&#x5f84;</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;08&#x2f;05 16&#x3a;42&#x3a;22.753</created_date>
+  <modified_user>-</modified_user>
+  <modified_date>2016&#x2f;08&#x2f;05 16&#x3a;42&#x3a;22.753</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>JGJW_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10d485a8d6</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>NHJW_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>nhjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10d09aa5cd</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>PDGJ_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>pdgj</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10ce96a8d0</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>SNJW_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>snjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10cd9ca5cd</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>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>
+  <connection>
+    <name>YGJW_VM</name>
+    <server>192.168.198.240</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>ygjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10c795a5cd</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>&#x516c;&#x53f8;jgjw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10d485a8d6</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>&#x516c;&#x53f8;snjw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>snjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10cd9ca5cd</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>&#x516c;&#x53f8;ygjw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>ygjw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10c795a5cd</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>
+  <order>
+  <hop> <from>&#x516c;&#x53f8;&#x67e5;&#x8be2;</from><to>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5206;&#x516c;&#x53f8;&#x67e5;&#x8be2;</from><to>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</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>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x8868;&#x8f93;&#x5165;</from><to>&#x6dfb;&#x52a0;&#x67e5;&#x8be2;&#x5e38;&#x91cf;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</from><to>&#x662f;&#x5426;&#x7535;&#x8f66;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x662f;&#x5426;&#x7535;&#x8f66;</from><to>Excel&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop>
+  </order>
+  <step>
+    <name>Excel&#x8f93;&#x51fa;</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;filepath&#x7d;</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>yyyyMMddHHmmss</date_time_format>
+      <sheetname>&#x5de5;&#x4f5c;&#x8868;1</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>&#x662f;&#x5426;&#x7535;&#x8f66;</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>498</xloc>
+      <yloc>348</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>business_code</name>
+        <field>business_code</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>business_name</name>
+        <rename>gs</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>364</xloc>
+      <yloc>60</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>business_code</name>
+        <field>up_code</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>branche_company_code</name>
+        <field>business_code</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>business_name</name>
+        <rename>fgs</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>491</xloc>
+      <yloc>60</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>      <field>        <name>car_plate</name>
+        <rename>&#x8f66;&#x724c;&#x53f7;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>inside_code</name>
+        <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>gs</name>
+        <rename>&#x6240;&#x5c5e;&#x516c;&#x53f8;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>fgs</name>
+        <rename>&#x6240;&#x5c5e;&#x5206;&#x516c;&#x53f8;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>supplier_name</name>
+        <rename>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>equipment_code</name>
+        <rename>&#x8bbe;&#x5907;&#x7ec8;&#x7aef;&#x53f7;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>sfdc</name>
+        <rename>sfdc_cal</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>        <select_unspecified>N</select_unspecified>
+    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>495</xloc>
+      <yloc>173</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x662f;&#x5426;&#x7535;&#x8f66;</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 &#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x5426;&#x22;&#x3b;&#xa;&#xa;if&#x28;sfdc_cal &#x3d;&#x3d; 0&#x29; &#x7b;&#xa;	&#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x5426;&#x22;&#x3b;&#xa;&#x7d; else if &#x28;sfdc_cal &#x3d;&#x3d; 1&#x29; &#x7b;&#xa;	&#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x662f;&#x22;&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	&#x662f;&#x5426;&#x7535;&#x8f66; &#x3d; &#x22;&#x5426;&#x22;&#x3b;&#xa;&#x7d;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>&#x662f;&#x5426;&#x7535;&#x8f66;</name>
+        <rename>&#x662f;&#x5426;&#x7535;&#x8f66;</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>695</xloc>
+      <yloc>173</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>227</xloc>
+      <yloc>59</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x8868;&#x8f93;&#x5165;</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <sql>SELECT &#x2a; FROM bsth_c_cars&#xa;where &#x24;&#x7b;QUERY&#x7d;</sql>
+    <limit>0</limit>
+    <lookup/>
+    <execute_each_row>N</execute_each_row>
+    <variables_active>Y</variables_active>
+    <lazy_conversion_active>N</lazy_conversion_active>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>88</xloc>
+      <yloc>59</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step_error_handling>
+  </step_error_handling>
+   <slave-step-copy-partition-distribution>
+</slave-step-copy-partition-distribution>
+   <slave_transformation>N</slave_transformation>
+
+</transformation>
-package com.bsth.service.schedule;
-
-import accumulate com.bsth.service.schedule.rules.ttinfo2.ErrorBcCountFunction ecount;
-import accumulate com.bsth.service.schedule.rules.shiftloop.GidsCountFunction gidscount;
-import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbTimeFunction gidfbtime;
-import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbFcnoFunction gidfbfcno;
-import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
-import accumulate com.bsth.service.schedule.rules.ttinfo.MinRuleQyrqFunction minruleqyrq;
-import accumulate com.bsth.service.schedule.rules.validate.ValidRepeatBcFunction vrb;
-import accumulate com.bsth.service.schedule.rules.validate.ValidWholeRerunBcFunction vwrb;
-import accumulate com.bsth.service.schedule.rules.validate.ValidWantLpFunction vwlp;
+package com.bsth.service.schedule.impl.plan.kBase1.core;
+
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidsCountFunction gidscount;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidFbTimeFunction gidfbtime;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidFbFcnoFunction gidfbfcno;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResultsFunction lpinforesult;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.MinRuleQyrqFunction minruleqyrq;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidRepeatBcFunction vrb;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWholeRerunBcFunction vwrb;
+import accumulate com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWantLpFunction vwlp;