Update

徐烜
2 parents 6a5549cf 3fa0edcc
Showing 51 changed files with 2972 additions and 978 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/OilStationSocietyController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/realcontrol/dto/LpData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/entity/realcontrol/OilStationSociety.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/entity/search/SearchOperator.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
src/main/java/com/bsth/repository/realcontrol/ChildTaskPlanRepository.java
src/main/java/com/bsth/repository/realcontrol/OilStationSocietyRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/service/forms/impl/CommonServiceImpl.java
@@ -21,6 +21,9 @@ public class Constants {
 	public static final String LOGIN_FAILURE = "/user/loginFailure";
 	public static final String CAPTCHA = "/captcha.jpg";
+	//对外的营运数据接口
+	public static final String SERVICE_INTERFACE = "/companyService/**";
+
 	/**
 	 * 线调部分子页面不做拦截，便于浏览器缓存
 	 */
@@ -119,8 +119,15 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		Direction d;
 		map.put("xlbm_like", map.get("xlbm_like").toString().trim());
-//		try {
 		String rq=map.get("rq").toString();
+		int lx=Integer.parseInt(map.get("sxtj").toString().trim());
+		if(lx>0){
+			map.put("nbbm_in", yblService.checkNbmmNum(rq, map.get("ssgsdm_like").toString(),
+					map.get("fgsdm_like").toString(), map.get("xlbm_like").toString(),
+					map.get("nbbm_eq").toString(),lx));
+		}
+//		try {
+		
 		if(!(rq=="")){
 //			
 //			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -155,6 +162,11 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return yblService.oilListMonth(line, date);
 	}
+	@RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
+	public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=yblService.sumYlb(map);
+		return list;
+	}
 	@RequestMapping(value = "/listExport",method = RequestMethod.POST)
 	public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
+package com.bsth.controller.realcontrol;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.realcontrol.OilStationSociety;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by panzhao on 2017/3/16.
+ */
+@RestController
+@RequestMapping("/oilStation")
+public class OilStationSocietyController extends BaseController<OilStationSociety, String>{
+}
@@ -279,13 +279,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
 	}
-	@RequestMapping(value = "/exportWaybill")
+	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
 			@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
 		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
 	}
-	@RequestMapping(value = "/exportWaybillQp")
+	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
 			,@RequestParam String date,@RequestParam String line) {
 		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
@@ -308,13 +308,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.findLine(line);
 	}
-	@RequestMapping(value="/findKMBC")
+	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
 	public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date,line);
 	}
-	@RequestMapping(value="/findKMBCQp")
+	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
 	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
@@ -344,13 +344,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @param lpName 路牌
 	 * @return
 	 */
-	@RequestMapping(value="/queryListWaybill")
+	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
 	}
-	@RequestMapping(value="/queryListWaybillQp")
+	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
 			@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
@@ -362,6 +362,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
 	}
+	@RequestMapping(value="/statisticsDailyTj")
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam String line, @RequestParam String date,
+			@RequestParam String date2,@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDailyTj(line, date,date2, xlName, type);
+	}
+	
 	@RequestMapping(value="/MapById",method = RequestMethod.GET)
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
 		return scheduleRealInfoService.MapById(id);
@@ -457,7 +463,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.scheduleDailyExport(map);
 	}
-	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.POST)
+	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
 	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
 		return scheduleRealInfoService.exportWaybillMore(map);
 	}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 对外的营运数据接口，主要输出当日的数据
+ * Created by panzhao on 2017/3/15.
+ */
+@RestController
+@RequestMapping("/companyService")
+public class ServiceDataInterface {
+
+    private final static String SECRE_KEY = "dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki";
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @RequestMapping("/getCurrentDayPlan")
+    public List<ScheduleRealInfo> getCurrentDayPlan(
+            @RequestParam String companyId,
+            @RequestParam String workId,
+            @RequestParam String secretKey) {
+
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)
+                    && sch.getjGh().equals(workId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    @RequestMapping("/returnCCInfo")
+    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+
+            if (sch.getBcType().equals("out")
+                    && sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    @RequestMapping("/returnJCInfo")
+    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getBcType().equals("in")
+                    && sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+}
@@ -22,7 +22,7 @@ public class LpData {
         this.zdzName = sch.getZdzName();
     }
-    public void appendTo(ScheduleRealInfo sch, int type, boolean changeRealTime) {
+    public void appendTo(ScheduleRealInfo sch, int type) {
         if (type == 0) {
             //只换人
@@ -33,11 +33,11 @@ public class LpData {
         } else if (type == 1) {
             //只换车
             sch.setClZbh(this.nbbm);
-
-            //换实际时间
+            changeRealTime(sch);
+            /*//换实际时间
             if(changeRealTime){
                 changeRealTime(sch);
-            }
+            }*/
         } else if (type == 2) {
             //换人并换车
@@ -48,9 +48,9 @@ public class LpData {
             sch.setClZbh(this.nbbm);
             //换实际时间
-            if(changeRealTime){
+            //if(changeRealTime){
                 changeRealTime(sch);
-            }
+            //}
         }
     }
@@ -378,9 +378,11 @@ public class DayOfSchedule implements CommandLineRunner {
                     sch.setZdsj(fmtHHmm.print(fmtHHmm.parseMillis(sch.getFcsj()) + (sch.getBcsj() * 60 * 1000)));
                     sch.setLate(false);
                 }
+
+                sch.setJhlcOrig(sch.getJhlc());
                 //计划里程为0，设置NULL
-                if (sch.getJhlc() != null && sch.getJhlc() == 0)
-                    sch.setJhlc(null);
+                //if (sch.getJhlc() != null && sch.getJhlc() == 0)
+                //    sch.setJhlc(null);
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -30,7 +30,7 @@ public class Ylb {
 	private Double jzlc=0.0;
 	private Double czyl=0.0;
 	private Double jzyl=0.0;
-	private Double jzl;
+	private Double jzl=0.0;
 	private int sfkt;
 	private String jhsj;
 	private Double yh=0.0;
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 社会加油站
+ * Created by panzhao on 2017/3/16.
+ */
+@Entity
+@Table(name = "bsth_c_oil_station")
+public class OilStationSociety {
+
+    @Id
+    private String lineCode;
+
+    /**
+     * 加油站名称
+     */
+    private String stationName;
+
+    /**
+     * 上行进场距离
+     */
+    private Double upInMile;
+    /**
+     * 上行出场距离
+     */
+    private Double upOutMile;
+
+    /**
+     * 下行进场距离
+     */
+    private Double downInMile;
+    /**
+     * 下行出场距离
+     */
+    private Double downOutMile;
+
+
+    /**
+     * 上行进场时间 分钟
+     */
+    private int upInTime;
+    /**
+     * 上行出场时间 分钟
+     */
+    private int upOutTime;
+
+    /**
+     * 下行进场时间 分钟
+     */
+    private int downInTime;
+    /**
+     * 下行出场时间 分钟
+     */
+    private int downOutTime;
+
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public Double getUpInMile() {
+        return upInMile;
+    }
+
+    public void setUpInMile(Double upInMile) {
+        this.upInMile = upInMile;
+    }
+
+    public Double getUpOutMile() {
+        return upOutMile;
+    }
+
+    public void setUpOutMile(Double upOutMile) {
+        this.upOutMile = upOutMile;
+    }
+
+    public Double getDownInMile() {
+        return downInMile;
+    }
+
+    public void setDownInMile(Double downInMile) {
+        this.downInMile = downInMile;
+    }
+
+    public Double getDownOutMile() {
+        return downOutMile;
+    }
+
+    public void setDownOutMile(Double downOutMile) {
+        this.downOutMile = downOutMile;
+    }
+
+    public int getUpInTime() {
+        return upInTime;
+    }
+
+    public void setUpInTime(int upInTime) {
+        this.upInTime = upInTime;
+    }
+
+    public int getUpOutTime() {
+        return upOutTime;
+    }
+
+    public void setUpOutTime(int upOutTime) {
+        this.upOutTime = upOutTime;
+    }
+
+    public int getDownInTime() {
+        return downInTime;
+    }
+
+    public void setDownInTime(int downInTime) {
+        this.downInTime = downInTime;
+    }
+
+    public int getDownOutTime() {
+        return downOutTime;
+    }
+
+    public void setDownOutTime(int downOutTime) {
+        this.downOutTime = downOutTime;
+    }
+}
@@ -88,7 +88,10 @@ public class ScheduleRealInfo {
 	/** 计划里程 */
 	private Double jhlc;
-	/** 实际里程 */
+	/** 原始计划里程 （原计调的数据） */
+	private Double jhlcOrig;
+
+	/** 实际里程  这个字段被废弃*/
 	private Double realMileage;
 	/** 实际里程 */
@@ -623,6 +626,11 @@ public class ScheduleRealInfo {
 		}
 	}
+	@Override
+	public int hashCode() {
+		return ("schedule_" + this.id).hashCode();
+	}
+
 	public String getQdzArrDateJH() {
 		return qdzArrDatejh;
 	}
@@ -757,6 +765,7 @@ public class ScheduleRealInfo {
 	}
 	public void destroy(){
+		this.jhlc = 0.0;
 		this.status = -1;
 	}
@@ -845,4 +854,22 @@ public class ScheduleRealInfo {
 	public void setRealMileage(Double realMileage) {
 		this.realMileage = realMileage;
 	}
+
+	public Double getJhlcOrig() {
+		return jhlcOrig;
+	}
+
+	public void setJhlcOrig(Double jhlcOrig) {
+		this.jhlcOrig = jhlcOrig;
+	}
+
+	public void reCalcLate() {
+		if(this.getStatus() == 0
+				&& this.getFcsjActual() == null
+			&& this.dfsjT < System.currentTimeMillis()){
+			this.setLate(true);
+		}
+		else
+			this.setLate(false);
+	}
 }
@@ -69,6 +69,11 @@ public class PredicatesBuilder {
 		return cb.in(expression).value(list);
 	}
+	
+	public static Predicate ins(CriteriaBuilder cb,Path<?> expression, List<String> list){
+		return cb.in(expression).value(list);
+	}
+	
 	public static Predicate gt(CriteriaBuilder cb,Path<Number> expression, Object object){
 		try {
 			return cb.gt(expression, nf.parse(object.toString()));
@@ -27,5 +27,6 @@ public enum SearchOperator {
 	isf,				//假 isFalse，boolean
 	ist,				//真 isTrue，boolean
 	date,				//时间
-	in					//数组
+	in,					//数组
+	ins                 //传参 List<String>
 }
@@ -16,7 +16,7 @@ public abstract class BaseFilter implements Filter {
 	/**
 	 * 白名单
 	 */
-	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA,
+	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
 			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS };
 	@Override
@@ -23,8 +23,9 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Modifying
 	@Query(value="SELECT a.*  FROM bsth_c_ylb a   where to_days(?1)-to_days(a.rq)=1"
 			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_ylb b where a.nbbm=b.nbbm and "
-			+ " to_days(?1)-to_days(b.rq)=1 )",nativeQuery=true)
-	List<Ylb> obtainYlbefore(String rq);
+			+ " to_days(?1)-to_days(b.rq)=1 ) and ssgsdm like %?2%  and fgsdm like %?3% and "
+			+ " xlbm like %?4% and nbbm like %?5% ",nativeQuery=true)
+	List<Ylb> obtainYlbefore(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
 	/**
 	 * 当天YLB信息
@@ -50,6 +51,41 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 */
 	@Transactional
 	@Modifying
-	@Query(value="select sum(jzl) as jzl,sum(zlc) as zlc ,sum(sh) as sh from bsth_c_ylb where  nbbm=?1 and rq=?2",nativeQuery=true)
-	List<Object[]> sumLcYl(String nbbm,Date rq);
+	@Query(value="select ifnull(jzl,0),ifnull(zlc,0),ifnull(sh,0) from bsth_c_ylb where  nbbm=?1 and rq=?2 and xlbm like %?3%",nativeQuery=true)
+	List<Object[]> sumLcYl(String nbbm,Date rq,String xlbm);
+	
+	/**
+	 * 
+	 * @param nbbm
+	 * @param rq
+	 * @param xlbm
+	 * @return
+	 */
+	@Transactional
+	@Modifying
+	@Query(value="select nbbm,count(nbbm) from bsth_c_ylb where to_days(?1)=to_days(rq) and "
+			+ " ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm like %?4%  and nbbm  like %?5% "
+			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
+	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	
+	@Query(value="select jzl,yh,sh from Ylb s "
+			+ " where to_days(?1)=to_days(s.rq)  "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3%"
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 ")
+	List<Object[]> sumYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	@Transactional
+	@Modifying
+	@Query(value="select ifnull(jzl,0),ifnull(yh,0),ifnull(sh,0) from bsth_c_ylb "
+			+ " where to_days(?1)=to_days(rq) "
+			+ " and ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm like %?4% "
+			+ " and nbbm like %?5%",nativeQuery=true)
+	List<Object[]> sumYlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
 }
@@ -19,8 +19,8 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	 */
 	@Transactional
 	@Modifying
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2",nativeQuery=true)
-	List<Ylxxb> obtainYlxx(String rq,int nylx);
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
+	List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
 	@Transactional
 	@Modifying
 package com.bsth.repository.realcontrol;
-import java.util.List;
-
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.repository.BaseRepository;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.stereotype.Repository;
-import com.bsth.entity.realcontrol.ChildTaskPlan;
-import com.bsth.repository.BaseRepository;
+import java.util.List;
 @Repository
 public interface ChildTaskPlanRepository extends BaseRepository<ChildTaskPlan, Long>{
@@ -15,4 +14,8 @@ public interface ChildTaskPlanRepository extends BaseRepository&lt;ChildTaskPlan, L
 	@EntityGraph(value = "childTaskPlan_schedule", type = EntityGraph.EntityGraphType.FETCH)
     @Override
     List<ChildTaskPlan> findAll(Specification<ChildTaskPlan> spec);
+
+    @EntityGraph(value = "childTaskPlan_schedule", type = EntityGraph.EntityGraphType.FETCH)
+    @Override
+    ChildTaskPlan findOne(Long id);
 }
+package com.bsth.repository.realcontrol;
+
+import com.bsth.entity.realcontrol.OilStationSociety;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/3/16.
+ */
+@Repository
+public interface OilStationSocietyRepository extends BaseRepository<OilStationSociety, String>{
+}
@@ -65,11 +65,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	int countByDate(String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value = "select s from ScheduleRealInfo s where s.scheduleDateStr = ?1")
+	@Query(value = "select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr = ?1")
 	List<ScheduleRealInfo> findByDate(String dateStr);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and cl_zbh=?3 order by bcs")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and cl_zbh=?3 order by bcs")
 	List<ScheduleRealInfo> findByDate2(String line,String date,String clzbh);
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.status = -1")
@@ -86,26 +86,31 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " and clZbh like %?5% order by s.fcsj")
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsj")
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsj")
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsj")
-	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date);
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh like %?1% and s.clZbh like %?2% and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') and s.gsBm like %?4% and s.fgsBm like %?5%  order by realExecDate,fcsj")
+	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date,String gsbm,String fgsbm);
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d')  order by bcs")
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d')  order by bcs")
 	List<ScheduleRealInfo> queryListWaybill4(String jName,String clZbh,String date,String enddate);
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleDaily(String line,String date);
 	@Query(value = "select count(*) from ScheduleRealInfo s where s.xlBm=?1 and s.scheduleDateStr=?2")
 	int countByLineCodeAndDate(String xlBm, String schDate);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value = "select s from ScheduleRealInfo s where s.xlBm=?1 and s.scheduleDateStr=?2")
+	@Query(value = "select DISTINCT s from ScheduleRealInfo s where s.xlBm=?1 and s.scheduleDateStr=?2")
 	List<ScheduleRealInfo> findByLineCodeAndDate(String xlBm, String schDate);
 	@Modifying
@@ -127,8 +132,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine3(String line,String date);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
-	List<Map<String,Object>> yesterdayDataList(String line,String date);
+	//按照时间段统计
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2);
+	
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
+	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm);
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
 	List<ScheduleRealInfo> setLD(String date);
@@ -36,7 +36,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS);
+                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS);
     }
     @Override
@@ -101,7 +101,7 @@ public class CommonServiceImpl implements CommonService{
 				 + " order by bcs";
-		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh ,  date);
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh ,  date,"","");
 		DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
@@ -15,6 +15,7 @@ import com.bsth.service.TrafficManageService;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.bsth.webService.trafficManage.geotool.services.InternalPortType;
+import com.bsth.webService.trafficManage.geotool.services.Internal;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
 import org.apache.commons.lang.time.DateUtils;
@@ -25,10 +26,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -188,6 +186,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			sBuffer.append("</XLs>");
 			System.out.println(sBuffer.toString());
 			if(sBuffer.indexOf("<XL>") != -1){
+				portType = new Internal().getInternalHttpSoap11Endpoint();
 				String portResult = portType.setXL(userNameXl, passwordXl, sBuffer.toString());
 				String portArray[] = portResult.split("\n");
 				if(portArray.length >= 4){
@@ -386,6 +385,24 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
+	 * 从文件中读取xml
+	 * @param fileName  例：D:/test.txt
+	 * @return
+	 * @throws Exception
+	 */
+	private String readXmlFromFile(String fileName) throws Exception {
+		StringBuffer sf = new StringBuffer("");
+		File file = new File(fileName);
+		InputStreamReader reader = new InputStreamReader(new FileInputStream(file),"utf-8");
+		BufferedReader bufferedReader = new BufferedReader(reader);
+		String lineTxt = "";
+		while((lineTxt = bufferedReader.readLine()) != null){
+			sf.append(lineTxt);
+		}
+		reader.close();
+		return sf.toString().replaceAll("\t","");
+	}
+	/**
 	 * 上传里程油耗
 	 * @return 上传成功标识
 	 */
@@ -890,7 +907,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			int nTotalMemory = ( int ) (currRuntime.totalMemory() / 1024 / 1024);
 			System.out.println("zzz:"+nFreeMemory + "M/" + nTotalMemory +"M(free/total)");
-
+			portType = new Internal().getInternalHttpSoap11Endpoint();
 			byte[] res = portType.downloadAllDataFile("down_pdgj", "down_pdgj123");
 			String filePath = "E:\\ygc";
 			BufferedOutputStream bos = null;
@@ -15,5 +15,9 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> checkYl(Map<String, Object> map);
+	Map<String, Object> sumYlb(Map<String, Object> map);
+	
 	List<Ylb> oilListMonth(String line,String date);
+	
+	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
 }
@@ -77,6 +77,10 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			 Cars c=carsList.get(i);
 			 carsMap.put(c.getInsideCode(), c.getSfdc());
 		}
+		 String gsbm="";
+			if(map2.get("ssgsdm_like")!=null){
+				gsbm=map2.get("ssgsdm_like").toString();
+			}
 		String rq=map2.get("rq").toString();
 		String line="";
 		if(map2.get("xlbm_eq")!=null){
@@ -91,14 +95,14 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		//当天DLB信息
 		List<Dlb> dlList=repository.obtainDl(rq);
 		//当天YLXXB信息
-		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1);
+		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,gsbm);
 		//当天加电信息表
 		List<Jdl> jdlList=jdlRepository.JdlList(rq);
 		//前一天所有车辆最后进场班次信息
 		List<Dlb> dlListBe=repository.obtainYlbefore(rq);
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
 		//从排班表中计算出行驶的总里程
-		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq);
+		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
 		List<Ylb> addList=new ArrayList<Ylb>();
 		List<Ylb> updateList=new ArrayList<Ylb>();
 		for(int x=0;x<listpb.size();x++){
@@ -244,14 +248,17 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 	public Map<String, Object> checkDl(Map<String, Object> map) {
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		String xlbm=map.get("xlbm_eq").toString();
-		
+		String gsbm="";
+		if(map.get("ssgsdm_like")!=null){
+			gsbm=map.get("ssgsdm_like").toString();
+		}
 		// TODO Auto-generated method stub
 		try{
 			//获取车辆存油信息
 //			List<Cyl> cylList=cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
 			String rq=map.get("rq").toString();
 			List<Dlb> dlbList=repository.obtainDl(rq);
-			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,1);
+			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,1,gsbm);
 			//当天加电信息表
 			List<Jdl> jdlList=jdlRepository.JdlList(rq);
 			for (int i = 0; i < ylxxbList.size(); i++) {
@@ -38,6 +38,7 @@ import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.YlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.Arith;
 import com.bsth.util.BatchSaveUtils;
 import com.github.abel533.echarts.code.Y;
@@ -97,10 +98,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			//当天YLXXB信息
 	//		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
 			//前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe=repository.obtainYlbefore(rq);
+			List<Ylb> ylListBe=repository.obtainYlbefore(rq,"","","","");
 			List<Cyl> clyList=cylRepository.obtainCyl("","");
 			//从排班表中计算出行驶的总里程
-			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("",rq);
+			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", rq, "", "", "", "");
 			for(int x=0;x<listpb.size();x++){
 				boolean sfdc=true;
@@ -222,14 +223,15 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// 当天YLB信息
 			List<Ylb> ylList = repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
 			// 当天YLXXB信息
-			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0);
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe = repository.obtainYlbefore(rq);
+			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
 			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 从排班表中计算出行驶的总里程
-			List<Map<String, Object>> listpb = scheduleRealInfoService.yesterdayDataList(line, rq);
+			List<Map<String, Object>> listpb = scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
 			List<Ylb> addList = new ArrayList<Ylb>();
 			List<Ylb> updateList = new ArrayList<Ylb>();
+			String ins="";
 			for (int x = 0; x < listpb.size(); x++) {
 				String type = "add";
 				boolean sfdc = true;
@@ -282,9 +284,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 												break;
 											}
 										}
-										
 									}
-									
 								}
 							}
 						}
@@ -299,9 +299,16 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						Ylxxb ylxxb = ylxxList.get(j);
 						if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
 								&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
-							jzl += ylxxb.getJzl();
+//							jzl += ylxxb.getJzl();
+							jzl =Arith.add(jzl, ylxxb.getJzl());
 						}
 					}
+					if(map.get("clZbh").toString().equals("W0A-212")){
+						System.out.println();
+					}
+					if(map.get("clZbh").toString().equals("W0A-211")){
+						System.out.println();
+					}
 					t.setJzl(jzl);
 					t.setNbbm(map.get("clZbh").toString());
 					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
@@ -312,29 +319,34 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
 					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
 					t.setRq(sdf.parse(rq));
-					/*
-					 * if(type.equals("add")){ addList.add(t); }else{
-					 * updateList.add(t); }
-					 */
-					repository.save(t);
+					
+					 if(type.equals("add")){
+						 addList.add(t); 
+					 }else{
+					     updateList.add(t); 
+					     ins += t.getId().toString()+",";
+					  }
+//					repository.save(t);
 					newMap.put("status", ResponseCode.SUCCESS);
 				}
 			}
+			if(addList.size()>0){ 
+				new BatchSaveUtils<Ylb>().saveList(addList, Ylb.class); 
+			}
+			
+			if(updateList.size()>0){
+				for (int i = 0; i < updateList.size(); i++) {
+					repository.save(updateList.get(i));
+				}
+			}
+			newMap.put("status", ResponseCode.SUCCESS);
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
 			newMap.put("status", ResponseCode.ERROR);
 			throw e;
 		}
-		/*
-		 * try { if(addList.size()>0){ new
-		 * BatchSaveUtils<Ylb>().saveList(addList, Ylb.class); }
-		 * 
-		 * if(updateList.size()>0){
-		 * 
-		 * } newMap.put("status", ResponseCode.SUCCESS); } catch (Exception e) {
-		 * // TODO: handle exception newMap.put("status", ResponseCode.ERROR); }
-		 */
+
 		return newMap;
 	}
@@ -383,15 +395,19 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					String nbbm_eq = ylb.getNbbm();
 					Date rq_eq = ylb.getRq();
 					// 得到一天总的加油和里程（根据车，时间）
-					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq);
+					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
 					// 保存总的加油量
-					Double jzl = Double.valueOf(sumList.get(0)[0].toString());
+					Double jzl = 0.0;
 					// 保存总的里程
-					Double zlc = Double.valueOf(sumList.get(0)[1].toString());
-					
-					Double zsh = Double.valueOf(sumList.get(0)[2].toString());
-					
-					jzl=jzl-zsh;
+					Double zlc = 0.0;
+					//保存总的损耗
+					Double zsh = 0.0;
+					for (int j = 0; j < sumList.size(); j++) {
+						jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
+						zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
+						zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
+					}
+					jzl = Arith.sub(jzl, zsh);
 					// 保留两位小数
 					DecimalFormat df = new DecimalFormat("#.00");
 					Double zyl = 0.0;
@@ -413,17 +429,23 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
 								Double yl = t.getCzyl();
 								Double jcyl = t.getCzyl();
-								zyl = jcyl + jzl - yl;
+//								zyl = jcyl + jzl - yl;
+								zyl =Arith.sub( Arith.add(jcyl, jzl),yl);
 								Double yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 								t.setYh(yh);
-								nextJzyl = t.getJzl() + t.getCzyl() - yh;
-								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+//								nextJzyl = t.getJzl() + t.getCzyl() - yh;
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
+//								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+								t.setJzyl(nextJzyl);
 							} else {
-								t.setCzyl(Double.parseDouble(df.format(nextJzyl)));
+//								t.setCzyl(Double.parseDouble(df.format(nextJzyl)));
+								t.setCzyl(nextJzyl);
 								Double yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 								t.setYh(yh);
-								nextJzyl = t.getJzl() + nextJzyl - yh;
-								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+//								nextJzyl = t.getJzl() + nextJzyl - yh;
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
+//								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+								t.setJzyl(nextJzyl);
 							}
 							repository.save(t);
 						}
@@ -484,20 +506,29 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			String nbbm_eq = ylb.getNbbm();
 			Date rq_eq = ylb.getRq();
 			// 得到一天总的加油和里程（根据车，时间）
-			List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq);
+			List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
 			// 保存总的加油量
-			Double jzl = Double.valueOf(sumList.get(0)[0].toString());
+			Double jzl = 0.0;
 			// 保存总的里程
-			Double zlc = Double.valueOf(sumList.get(0)[1].toString());
-			// 保存总的损耗
-			Double zsh = Double.valueOf(sumList.get(0)[2].toString());
+			Double zlc = 0.0;
+			//保存总的损耗
+			Double zsh = 0.0;
+			for (int j = 0; j < sumList.size(); j++) {
+				jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
+				zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
+				zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
+			}
+			jzl = Arith.sub(jzl, zsh);
 			//新的 损耗不等于 旧的损耗 总损耗从新算
-			if(ylb.getSh() - sh >0.0000001 || ylb.getSh()-sh <0.00000001){
-				zsh =zsh-ylb.getSh()+sh;
-				jzl =jzl-zsh;
+			if(Arith.sub(ylb.getSh(),sh )!=0){
+//				zsh =zsh-ylb.getSh()+sh;
+				zsh =Arith.add(Arith.sub(zsh, ylb.getSh()), sh);
+//				jzl =jzl-zsh;
+				jzl =Arith.sub(jzl, zsh);
 			}else{
-				jzl=jzl-zsh;
+//				jzl=jzl-zsh;
+				jzl =Arith.sub(jzl, zsh);
 			}
 			map.put("nbbm_eq", nbbm_eq);
 			map.put("rq_eq", rq_eq);
@@ -519,25 +550,31 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setShyy(shyy);
 					}
 					Double jcyl = t.getCzyl();
-					zyl = jcyl + jzl - yl;
+//					zyl = jcyl + jzl - yl;
+					zyl = Arith.sub(Arith.add(jcyl, jzl), yl);
 					Double yh = 0.0;
 					if (zlc > 0 && t.getZlc() > 0) {
 						yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 					}
 					t.setYh(yh);
-					nextJzyl = t.getJzl() + t.getCzyl() - yh-t.getSh();
-					t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+//					nextJzyl = t.getJzl() + t.getCzyl() - yh-t.getSh();
+					nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
+//					t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+					t.setJzyl(nextJzyl);
 				} else {
 					if(t.getId()==id){
 						t.setSh(sh);
 						t.setShyy(shyy);
 					}
 					if (t.getZlc() != 0) {
-						t.setCzyl(Double.parseDouble(df.format(nextJzyl)));
+//						t.setCzyl(Double.parseDouble(df.format(nextJzyl)));
+						t.setCzyl(nextJzyl);
 						Double yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 						t.setYh(yh);
-						nextJzyl = t.getJzl() + nextJzyl - yh-t.getSh();
-						t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+//						nextJzyl = t.getJzl() + nextJzyl - yh-t.getSh();
+						nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
+//						t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+						t.setJzyl(nextJzyl);
 					}
 				}
@@ -610,7 +647,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				nbbm=map.get("nbbm_eq").toString();
 			}
 			List<Ylb> ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
-			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0);
+			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
 			for (int i = 0; i < ylxxbList.size(); i++) {
 				Boolean fage=true;
 				Ylxxb y1=ylxxbList.get(i);
@@ -638,7 +675,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					for(int z=0;z<cylList.size();z++){
 						cyl=cylList.get(z);
 						if(t.getNbbm().equals(cyl.getNbbm())){
-							cyl.setCyl(cyl.getCyl()+t.getJzl());
+//							cyl.setCyl(cyl.getCyl()+t.getJzl());
+							cyl.setCyl(Arith.add(cyl.getCyl(),t.getJzl()));
 							cyl.setUpdatetime(t.getRq());
 							status=true;
 							break;
@@ -702,6 +740,106 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					});  
 		return list;
 	}
+
+	@Override
+	public StringBuffer checkNbmmNum(String rq, String gsbm, String fgsbm, String xlbm,String nbbm,int lx) {
+		StringBuffer stringList =new StringBuffer();
+		List<Object[]> objectList=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+		for (int i = 0; i < objectList.size(); i++) {
+			String clbm=objectList.get(i)[0].toString()+",";
+			int cs=Integer.parseInt(objectList.get(i)[1].toString());
+			//一车一单
+			if(lx==1){
+				if(cs==1){
+					stringList.append(clbm);
+				}
+			}
+			//一车多单
+			if(lx==2){
+				if(cs>1){
+					stringList.append(clbm);
+				}
+				
+			}
+		}
+		return stringList;
+	}
+	
+	
+
+	@Override
+	public Map<String, Object> sumYlb(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<String> stringList=new ArrayList<String>();
+		String rq=map.get("rq").toString();
+		String gsbm=map.get("ssgsdm_like").toString();
+		String fgsbm=map.get("fgsdm_like").toString();
+		String xlbm=map.get("xlbm_like").toString().trim();
+		String nbbm=map.get("nbbm_eq").toString();
+		String sxtj=map.get("sxtj").toString();
+		if(nbbm.trim()!=""){
+			stringList.add(nbbm);
+		}else{
+			if(!sxtj.equals("0")){
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+				
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+			}
+		}
+		List<Object[]> sumYlbList=new ArrayList<Object[]>();
+		if(sxtj.equals("0")){
+			sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm,nbbm);
+		}else{
+			if(stringList.size()>0){
+				
+//				String strings[]=new String[stringList.size()];
+//					for(int i=0;i<stringList.size();i++){
+//					strings[i]=stringList.get(i);
+//				}
+				sumYlbList=repository.sumYlb(rq, gsbm, fgsbm, xlbm, stringList);
+			}else{
+				sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm, nbbm);
+			}
+			
+		}
+		
+		Double jzl=0.0,yh=0.0,sh=0.0; 
+		for (int i = 0; i < sumYlbList.size(); i++) {
+			jzl = Arith.add(jzl, Double.valueOf(sumYlbList.get(i)[0].toString()));
+			yh = Arith.add(yh, Double.valueOf(sumYlbList.get(i)[1].toString()));
+			sh = Arith.add(sh, Double.valueOf(sumYlbList.get(i)[2].toString()));
+		}
+		
+		Map<String, Object> sumMap=new HashMap<String,Object>();
+		sumMap.put("jzl", jzl);
+		sumMap.put("yh", yh);
+		sumMap.put("sh", sh);
+//		String sql="select sum(jzl),sum(yh),sum(sh) from bsth_c_ylb "
+//				+ " where to_days('"+map.get("rq").toString()+"')=to_days(rq)  "
+//				+ " and ssgsdm like '%"+map.get("ssgsdm_like").toString()+"%' "
+//				+ " and fgsdm like '%"+map.get("fgsdm_like").toString()+"%' "
+//				+ " and xlbm like '%"+map.get("xlbm_like").toString()+ "%'"
+//				+ " and nbbm like '%"+map.get("nbbm_eq").toString()+"% '";
+//		if(map.get("nbbm_in")!=null){
+////			sql +=" and nbbm in ("
+//		}
+		return sumMap;
+	}
 }
+package com.bsth.service.realcontrol;
+
+import com.bsth.entity.realcontrol.OilStationSociety;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by panzhao on 2017/3/16.
+ */
+public interface OilStationSocietyService extends BaseService<OilStationSociety, String> {
+}
@@ -112,6 +112,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> statisticsDaily(String line, String date, String xlName, String type);
+	List<Map<String,Object>> statisticsDailyTj(String line, String date,String date2, String xlName, String type);
+	
 	//List<Object> scheduleDaily(String line,String date);
 	int countByLineCodeAndDate(String xlBm, String schDate);
@@ -126,7 +128,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> realScheduleList(String line,String date);
 	List<ScheduleRealInfo> realScheduleListQp(String line,String date);
-	List<Map<String,Object>> yesterdayDataList(String line,String date);
+	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String jGh,String nbbm);
 	List<Map<String,Object>> yesterdayDataList(String line);
@@ -156,7 +158,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> lpChangeMulti(String leftIdx, String rightIdx, int type);
-	void lpChange(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type, boolean changeRealTime);
+	void lpChange(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type);
     Map<String,Object> revokeRealArrive(Long id);
 }
@@ -9,6 +9,7 @@ import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ChildTaskPlanService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -45,8 +46,11 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         //保存起终点名称
         String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
-        t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
-        t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
+        if(StringUtils.isEmpty(t.getStartStationName()))
+            t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
+
+        if(StringUtils.isEmpty(t.getEndStationName()))
+            t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
         //先持久化子任务
         rs = super.save(t);
         //再关联主任务
+package com.bsth.service.realcontrol.impl;
+
+import com.bsth.entity.realcontrol.OilStationSociety;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.realcontrol.OilStationSocietyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by panzhao on 2017/3/16.
+ */
+@Service
+public class OilStationSocietyServiceImpl extends BaseServiceImpl<OilStationSociety, String> implements OilStationSocietyService {
+}
@@ -179,6 +179,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule.setBcType(bcType);
             }
+            //重新计算是否误点
+            schedule.reCalcLate();
+
             // 持久化到数据库
             dayOfSchedule.save(schedule);
@@ -391,14 +394,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             return rs;
         }
-        dayOfSchedule.delete(sch);
-        //ScheduleRealInfo sch = dayOfSchedule.delete(id);
         //数据库删除
         rs = super.delete(id);
-        //更新起点应到时间
-        List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
-        rs.put("ts", ts);
-        rs.put("delete", sch);
+        if(rs.get("status").equals(ResponseCode.SUCCESS)){
+            dayOfSchedule.delete(sch);
+            //更新起点应到时间
+            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
+            rs.put("ts", ts);
+            rs.put("delete", sch);
+        }
         return rs;
     }
@@ -853,6 +857,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 rs.put("msg", "未烂班，无法撤销！");
             } else {
                 sch.setStatus(0);
+                sch.setRemarks("");//清空备注
+                sch.setJhlc(sch.getJhlcOrig());
                 rs.put("status", ResponseCode.SUCCESS);
                 rs.put("t", sch);
@@ -1057,9 +1063,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 //修改班次里程
                 String jhlc = map.get("jhlc");
-                if (StringUtils.isNotEmpty(jhlc)
-                        && Double.parseDouble(jhlc) != sch.getJhlc()) {
-                    sch.setJhlc(Double.parseDouble(jhlc));
+                if (StringUtils.isNotEmpty(jhlc)) {
+                    if(Double.parseDouble(jhlc) == 0 && sch.getJhlcOrig() != 0)
+                        destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                    else
+                        sch.setJhlc(Double.parseDouble(jhlc));
                 }
             }
@@ -1097,6 +1105,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule = dayOfSchedule.get(jsonObj.getLong("id"));
                 //设置待发时间
                 schedule.setDfsjAll(dfsj);
+                //重新计算是否误点
+                schedule.reCalcLate();
                 dayOfSchedule.save(schedule);
             }
@@ -1215,7 +1225,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public Map<String, Object> findKMBC2(String jName, String clZbh, String date) {
-        List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh, date);
+        List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh, date,"","");
         DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
@@ -1290,7 +1300,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
         int jhbc = 0, cjbc = 0, ljbc = 0;
         double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
-        float addMileage = 0l, remMileage = 0l;
+        float addMileage = 0l, remMileage = 0l,addMileageYy = 0l,addMileageJc =0l;
         Map<String, Object> map = new HashMap<String, Object>();
         for (ScheduleRealInfo scheduleRealInfo : list) {
             if (scheduleRealInfo != null) {
@@ -1301,18 +1311,25 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
                 if (scheduleRealInfo.isSflj()) {
                     addMileage += tempJhlc;
-                    ljbc++;
+                    if (scheduleRealInfo.getBcType().equals("in")
+                            || scheduleRealInfo.getBcType().equals("out")) {
+                    	addMileageJc +=tempJhlc;
+                    }else{
+                    	 ljbc++;
+                    	addMileageYy +=tempJhlc;
+                    }
+                   
                 } else {
                     if (!(scheduleRealInfo.getBcType().equals("in")
                             || scheduleRealInfo.getBcType().equals("out"))) {
-                        jhbc++;
-                        jhlc += tempJhlc;
+                    	 jhbc++;
+                         jhlc += tempJhlc;
+                         if (scheduleRealInfo.getStatus() == -1) {
+                             remMileage += tempJhlc;
+                             cjbc++;
+                         }
                     }
-                    if (scheduleRealInfo.getStatus() == -1) {
-                        remMileage += tempJhlc;
-                        cjbc++;
-                    }
                 }
                 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
                 //计算营运里程，空驶里程
@@ -1358,15 +1375,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("jhlc", format.format(jhlc));
         map.put("remMileage", format.format(remMileage));
         map.put("addMileage", format.format(addMileage));
-        map.put("yygl", format.format(yygl));
+        map.put("yygl", format.format(yygl+addMileageYy));
         map.put("ksgl", format.format(ksgl));
-        map.put("realMileage", format.format(yygl + ksgl + jcclc));
+        map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
         map.put("jhbc", jhbc);
         map.put("cjbc", cjbc);
         map.put("ljbc", ljbc);
         map.put("sjbc", jhbc - cjbc + ljbc);
         map.put("jcclc", jcclc);
-        map.put("zkslc", format.format(ksgl + jcclc));
+        map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
         return map;
     }
@@ -1436,140 +1453,681 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
             Map<String, Object> m = new HashMap<String, Object>();
             ReportUtils ee = new ReportUtils();
-            m.put("dates", startDate + " 至 " + endDate);
-            List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            for (ScheduleRealInfo schedule : list) {
-                Map<String, Object> tempMap = new HashMap<String, Object>();
-                tempMap.put("xlName", schedule.getXlName() != null ? schedule.getXlName() : "");
-                tempMap.put("lpName", schedule.getLpName() != null ? schedule.getLpName() : "");
-                tempMap.put("clZbh", schedule.getClZbh() != null ? schedule.getClZbh() : "");
-                tempMap.put("jName", schedule.getjName() != null ? schedule.getjName() : "");
-                tempMap.put("sName", schedule.getsName() != null ? schedule.getsName() : "");
-                tempMap.put("fcsj", schedule.getFcsj() != null ? schedule.getFcsj() : "");
-                tempMap.put("fcsjActual", schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "");
-                tempMap.put("zdsj", schedule.getZdsj() != null ? schedule.getZdsj() : "");
-                tempMap.put("zdsjActual", schedule.getZdsjActual() != null ? schedule.getZdsjActual() : "");
-                if (schedule.getUpdateBy() != null) {
-                    if (schedule.getUpdateBy().getName() != null)
-                        tempMap.put("userName", schedule.getUpdateBy().getName());
-                    else
-                        tempMap.put("userName", "");
-                } else {
-                    tempMap.put("userName", "");
-                }
-                if (schedule.getUpdateDate() != null) {
-                    tempMap.put("updateDate", sdf.format(schedule.getUpdateDate()));
-                } else {
-                    tempMap.put("updateDate", "");
-                }
-                tempMap.put("remarks", schedule.getRemarks() != null ? schedule.getRemarks() : "");
-                tempList.add(tempMap);
-            }
+            m.put("dates", startDate + " 至 " + endDate);
+            List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            for (ScheduleRealInfo schedule : list) {
+                Map<String, Object> tempMap = new HashMap<String, Object>();
+                tempMap.put("xlName", schedule.getXlName() != null ? schedule.getXlName() : "");
+                tempMap.put("lpName", schedule.getLpName() != null ? schedule.getLpName() : "");
+                tempMap.put("clZbh", schedule.getClZbh() != null ? schedule.getClZbh() : "");
+                tempMap.put("jName", schedule.getjName() != null ? schedule.getjName() : "");
+                tempMap.put("sName", schedule.getsName() != null ? schedule.getsName() : "");
+                tempMap.put("fcsj", schedule.getFcsj() != null ? schedule.getFcsj() : "");
+                tempMap.put("fcsjActual", schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "");
+                tempMap.put("zdsj", schedule.getZdsj() != null ? schedule.getZdsj() : "");
+                tempMap.put("zdsjActual", schedule.getZdsjActual() != null ? schedule.getZdsjActual() : "");
+                if (schedule.getUpdateBy() != null) {
+                    if (schedule.getUpdateBy().getName() != null)
+                        tempMap.put("userName", schedule.getUpdateBy().getName());
+                    else
+                        tempMap.put("userName", "");
+                } else {
+                    tempMap.put("userName", "");
+                }
+                if (schedule.getUpdateDate() != null) {
+                    tempMap.put("updateDate", sdf.format(schedule.getUpdateDate()));
+                } else {
+                    tempMap.put("updateDate", "");
+                }
+                tempMap.put("remarks", schedule.getRemarks() != null ? schedule.getRemarks() : "");
+                tempList.add(tempMap);
+            }
+            try {
+                listI.add(tempList.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
+                        path + "export/修正报表" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            }
+            Map<String, Object> map = tempList.get(tempList.size() - 1);
+            System.out.println("tempMap:" + map);
+        }
+
+        return list;
+    }
+
+    @Override
+    public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
+                                                   String lpName, String date, String line) {
+        List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> list = null;
+        list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
+        for (int i = 0; i < list.size(); i++) {
+            ScheduleRealInfo s = list.get(i);
+            s.setAdjustExps(i + 1 + "");
+            String remarks = "";
+            if (s.getRemarks() != null) {
+                remarks += s.getRemarks();
+            }
+
+            Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+            if (!childTaskPlans.isEmpty()) {
+                s.setFcsjActual("");
+                s.setZdsjActual("");
+                s.setJhlc(0.0);
+            }
+
+            if (s.isDestroy()) {
+                s.setFcsjActual("");
+                s.setZdsjActual("");
+                s.setJhlc(0.0);
+                remarks += "(烂班)";
+                s.setRemarks(remarks);
+            }
+            listSchedule.add(s);
+            //计算营运里程，空驶里程
+            if (!childTaskPlans.isEmpty()) {
+            	 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+            	 while (it.hasNext()) {
+            		 ScheduleRealInfo t = new ScheduleRealInfo();
+                     ChildTaskPlan childTaskPlan = it.next();
+                     if (childTaskPlan.isDestroy()) {
+                    	 t.setFcsjActual("");
+                         t.setZdsjActual("");
+                         t.setJhlc(0.0);
+                     } else {
+                         t.setFcsjActual(childTaskPlan.getStartDate());
+                         t.setZdsjActual(childTaskPlan.getEndDate());
+                         t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                     }
+                     t.setQdzName(childTaskPlan.getStartStationName());
+                     t.setZdzName(childTaskPlan.getEndStationName());
+                     t.setRemarks(childTaskPlan.getRemarks());
+                     t.setAdjustExps("子");
+                     listSchedule.add(t);
+            	 }
+            	 /* String sqlPc = "select * from bsth_c_s_child_task where schedule=" + s.getId() + "  order by start_date ";
+                List<ScheduleRealInfo> lists = jdbcTemplate.query(sqlPc,
+                        new RowMapper<ScheduleRealInfo>() {
+                            @Override
+                            public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
+                                ScheduleRealInfo t = new ScheduleRealInfo();
+                                if (rs.getInt("destroy") == 0) {
+                                    t.setFcsjActual(rs.getString("start_date"));
+                                    t.setZdsjActual(rs.getString("end_date"));
+                                    t.setJhlc(rs.getDouble("mileage"));
+                                } else {
+                                    t.setFcsjActual("");
+                                    t.setZdsjActual("");
+                                    t.setJhlc(0.0);
+                                }
+                                t.setQdzName(rs.getString("start_station_name"));
+                                t.setZdzName(rs.getString("end_station_name"));
+                                t.setRemarks(rs.getString("remarks"));
+                                t.setAdjustExps("子");
+                                return t;
+                            }
+                        });
+                for (int j = 0; j < lists.size(); j++) {
+                    ScheduleRealInfo t = lists.get(j);
+                    listSchedule.add(t);
+                }*/
+            }
+        }
+
+        return listSchedule;
+    }
+
+    @Override
+    public Map<String, Object> removeChildTask(Long taskId) {
+        Map<String, Object> rs = new HashMap<>();
+        ChildTaskPlan chTask = cTaskPlanRepository.findOne(taskId);
+
+        ScheduleRealInfo sch = dayOfSchedule.get(chTask.getSchedule().getId());
+        try {
+
+            sch.getcTasks().remove(chTask);
+            scheduleRealInfoRepository.save(sch);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    @Override
+    public List<Map<String, Object>> statisticsDaily(String line, String date,
+                                                     String xlName, String type) {
+        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+        if (date.length() == 10)
+            list = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+        else if (date.length() == 7)
+            list = scheduleRealInfoRepository.scheduleByDateAndLine3(line, date);
+
+        List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+        DecimalFormat format = new DecimalFormat("0.00");
+        double jhlc = 0, tempJhlc = 0, childMileage = 0;
+        float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
+        //班次
+        int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0;
+        int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60;
+        int jhbc = 0, jhbc_m = 0, jhbc_a = 0;
+        int sjbc = 0, sjbc_m = 0, sjbc_a = 0;
+        int ljbc = 0, ljbc_m = 0, ljbc_a = 0;
+        int fzbc = 0, fzbc_m = 0, fzbc_a = 0;
+        int dtbc = 0, dtbc_m = 0, dtbc_a = 0;
+        int djg = 0, djg_m = 0, djg_a = 0, djg_time = 0;
+
+        double jhlcZ = 0, tempJhlcZ = 0, childMileageZ = 0;
+        float sjglZ = 0f, ssglZ = 0f, ssgl_lzZ = 0f, ssgl_dmZ = 0f,
+                ssgl_gzZ = 0f, ssgl_jfZ = 0f, ssgl_zsZ = 0f, ssgl_qrZ = 0f, ssgl_qcZ = 0f,
+                ssgl_kxZ = 0f, ssgl_qhZ = 0f, ssgl_ywZ = 0f, ssgl_otherZ = 0f, ljglZ = 0f;
+        //班次
+        int ssbcZ = 0, ssbc_lzZ = 0, ssbc_dmZ = 0, ssbc_gzZ = 0, ssbc_jfZ = 0, ssbc_zsZ = 0, ssbc_qrZ = 0, ssbc_qcZ = 0, ssbc_kxZ = 0, ssbc_qhZ = 0, ssbc_ywZ = 0, ssbc_otherZ = 0;
+        int jhbcZ = 0, jhbc_mZ = 0, jhbc_aZ = 0;
+        int sjbcZ = 0, sjbc_mZ = 0, sjbc_aZ = 0;
+        int ljbcZ = 0, ljbc_mZ = 0, ljbc_aZ = 0;
+        int fzbcZ = 0, fzbc_mZ = 0, fzbc_aZ = 0;
+        int dtbcZ = 0, dtbc_mZ = 0, dtbc_aZ = 0;
+        int djgZ = 0, djg_mZ = 0, djg_aZ = 0, djg_timeZ = 0;
+        Map<String, Object> map = null;
+        for (int i = 0; i < list.size(); i++) {
+            ScheduleRealInfo scheduleRealInfo = list.get(i);
+            if (scheduleRealInfo != null) {
+                Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+                //计算实际里程，少驶里程，计划里程=实际里程+少驶里程
+                if (childTaskPlans.isEmpty()) {
+                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                    //临加公里
+                    if (scheduleRealInfo.isSflj()) {
+                        ljgl += tempJhlc;
+                        ljglZ += tempJhlc;
+                    } else {
+                        jhlc += tempJhlc;
+                        jhlcZ += tempJhlc;
+                    }
+                    if (scheduleRealInfo.getStatus() == -1) {
+                        ssgl += tempJhlc;
+                        ssglZ += tempJhlc;
+                        ssbc++;
+                        ssbcZ++;
+                        if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) {
+                            ssgl_lz += tempJhlc;
+                            ssgl_lzZ += tempJhlc;
+                            ssbc_lz++;
+                            ssbc_lzZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) {
+                            ssgl_dm += tempJhlc;
+                            ssgl_dmZ += tempJhlc;
+                            ssbc_dm++;
+                            ssbc_dmZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) {
+                            ssgl_gz += tempJhlc;
+                            ssgl_gzZ += tempJhlc;
+                            ssbc_gz++;
+                            ssbc_gzZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) {
+                            ssgl_jf += tempJhlc;
+                            ssgl_jfZ += tempJhlc;
+                            ssbc_jf++;
+                            ssbc_jfZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) {
+                            ssgl_zs += tempJhlc;
+                            ssgl_zsZ += tempJhlc;
+                            ssbc_zs++;
+                            ssbc_zsZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) {
+                            ssgl_qr += tempJhlc;
+                            ssgl_qrZ += tempJhlc;
+                            ssbc_qr++;
+                            ssbc_qrZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) {
+                            ssgl_qc += tempJhlc;
+                            ssgl_qcZ += tempJhlc;
+                            ssbc_qc++;
+                            ssbc_qcZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) {
+                            ssgl_kx += tempJhlc;
+                            ssgl_kxZ += tempJhlc;
+                            ssbc_kx++;
+                            ssbc_kxZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) {
+                            ssgl_qh += tempJhlc;
+                            ssgl_qhZ += tempJhlc;
+                            ssbc_qh++;
+                            ssbc_qhZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) {
+                            ssgl_yw += tempJhlc;
+                            ssgl_ywZ += tempJhlc;
+                            ssbc_yw++;
+                            ssbc_ywZ++;
+                        } else {
+                            ssgl_other += tempJhlc;
+                            ssgl_otherZ += tempJhlc;
+                            ssbc_other++;
+                            ssbc_otherZ++;
+                        }
+                    } else {
+                        sjgl += tempJhlc;
+                        sjglZ += tempJhlc;
+                    }
+                } else {
+                    Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                    while (it.hasNext()) {
+                        ChildTaskPlan childTaskPlan = it.next();
+                        childMileage = childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+                        jhlc += childMileage;
+                        jhlcZ += childMileage;
+                        if (childTaskPlan.isDestroy()) {
+                            ssgl += childMileage;
+                            ssglZ += childMileage;
+                            ssbc++;
+                            ssbcZ++;
+                            if (childTaskPlan.getDestroyReason().equals("路阻")) {
+                                ssgl_lz += childTaskPlan.getMileage();
+                                ssgl_lzZ += childTaskPlan.getMileage();
+                                ssbc_lzZ++;
+                                ssbc_lzZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("吊慢")) {
+                                ssgl_dm += childTaskPlan.getMileage();
+                                ssgl_dmZ += childTaskPlan.getMileage();
+                                ssbc_dm++;
+                                ssbc_dmZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("故障")) {
+                                ssgl_gz += childTaskPlan.getMileage();
+                                ssgl_gzZ += childTaskPlan.getMileage();
+                                ssbc_gz++;
+                                ssbc_gzZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("纠纷")) {
+                                ssgl_jf += childTaskPlan.getMileage();
+                                ssgl_jfZ += childTaskPlan.getMileage();
+                                ssbc_jf++;
+                                ssbc_jfZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("肇事")) {
+                                ssgl_zs += childTaskPlan.getMileage();
+                                ssgl_zsZ += childTaskPlan.getMileage();
+                                ssbc_zs++;
+                                ssbc_zsZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("缺人")) {
+                                ssgl_qr += childTaskPlan.getMileage();
+                                ssgl_qrZ += childTaskPlan.getMileage();
+                                ssbc_qr++;
+                                ssbc_qrZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("缺车")) {
+                                ssgl_qc += childTaskPlan.getMileage();
+                                ssgl_qcZ += childTaskPlan.getMileage();
+                                ssbc_qc++;
+                                ssbc_qcZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("客稀")) {
+                                ssgl_kx += childTaskPlan.getMileage();
+                                ssgl_kxZ += childTaskPlan.getMileage();
+                                ssbc_kx++;
+                                ssbc_kxZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("气候")) {
+                                ssgl_qh += childTaskPlan.getMileage();
+                                ssgl_qhZ += childTaskPlan.getMileage();
+                                ssbc_qh++;
+                                ssbc_qhZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("援外")) {
+                                ssgl_yw += childTaskPlan.getMileage();
+                                ssgl_ywZ += childTaskPlan.getMileage();
+                                ssbc_yw++;
+                                ssbc_ywZ++;
+                            } else {
+                                ssgl_other += childTaskPlan.getMileage();
+                                ssgl_otherZ += childTaskPlan.getMileage();
+                                ssbc_other++;
+                                ssbc_otherZ++;
+                            }
+                        } else {
+                            sjgl += childMileage;
+                            sjglZ += childMileage;
+                        }
+                    }
+                }
+
+                //班次
+                jhbc++;
+                jhbcZ++;
+                String[] fcsj = scheduleRealInfo.getFcsj().split(":");
+                String[] fcsjActual = (scheduleRealInfo.getFcsjActual() == null ? "0:00" : scheduleRealInfo.getFcsjActual()).split(":");
+                if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_1) {
+                    jhbc_m++;
+                    jhbc_mZ++;
+                } else if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_3) {
+                    jhbc_a++;
+                    jhbc_aZ++;
+                }
+                if (scheduleRealInfo.getStatus() != -1) {
+                    sjbc++;
+                    sjbcZ++;
+                    if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
+                        sjbc_m++;
+                        sjbc_mZ++;
+                    } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
+                        sjbc_a++;
+                        sjbc_aZ++;
+                    }
+                }
+                if (scheduleRealInfo.isSflj()) {
+                    ljbc++;
+                    ljbcZ++;
+                    if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
+                        ljbc_m++;
+                        ljbc_mZ++;
+                    } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
+                        ljbc_a++;
+                        ljbc_aZ++;
+                    }
+                }
+                if (scheduleRealInfo.getBcType().equals("venting")) {
+                    fzbc++;
+                    fzbcZ++;
+                    if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
+                        fzbc_m++;
+                        fzbc_mZ++;
+                    } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
+                        fzbc_a++;
+                        fzbc_aZ++;
+                    }
+                }
+
+                if (i < list.size() - 1) {
+                    if (!scheduleRealInfo.getXlBm().equals(list.get(i + 1).getXlBm())) {
+                        map = new HashMap<String, Object>();
+                        map.put("xlName", scheduleRealInfo.getXlName());
+                        map.put("jhlc", format.format(jhlc));
+                        map.put("sjgl", format.format(sjgl));
+                        map.put("ssgl", format.format(ssgl));
+                        map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
+                        map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
+                        map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
+                        map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
+                        map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
+                        map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
+                        map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
+                        map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
+                        map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
+                        map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
+                        map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+                        map.put("ssbc", ssbc);
+                        map.put("ssbc_lz", ssbc_lz);
+                        map.put("ssbc_dm", ssbc_dm);
+                        map.put("ssbc_gz", ssbc_gz);
+                        map.put("ssbc_jf", ssbc_jf);
+                        map.put("ssbc_zs", ssbc_zs);
+                        map.put("ssbc_qr", ssbc_qr);
+                        map.put("ssbc_qc", ssbc_qc);
+                        map.put("ssbc_kx", ssbc_kx);
+                        map.put("ssbc_qh", ssbc_qh);
+                        map.put("ssbc_yw", ssbc_yw);
+                        map.put("ssbc_other", ssbc_other);
+                        map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+                        map.put("jhbc", jhbc);
+                        map.put("jhbc_m", jhbc_m);
+                        map.put("jhbc_a", jhbc_a);
+                        map.put("sjbc", sjbc);
+                        map.put("sjbc_m", sjbc_m);
+                        map.put("sjbc_a", sjbc_a);
+                        map.put("ljbc", ljbc);
+                        map.put("ljbc_m", ljbc_m);
+                        map.put("ljbc_a", ljbc_a);
+                        map.put("fzbc", fzbc);
+                        map.put("fzbc_m", fzbc_m);
+                        map.put("fzbc_a", fzbc_a);
+                        map.put("dtbc", dtbc);
+                        map.put("dtbc_m", dtbc_m);
+                        map.put("dtbc_a", dtbc_a);
+                        map.put("djg", djg);
+                        map.put("djg_m", djg_m);
+                        map.put("djg_a", djg_a);
+                        map.put("djg_time", djg_time);
+                        lMap.add(map);
+                        jhlc = 0;
+                        tempJhlc = 0;
+                        childMileage = 0;
+                        sjgl = 0f;
+                        ssgl = 0f;
+                        ssgl_lz = 0f;
+                        ssgl_dm = 0f;
+                        ssgl_gz = 0f;
+                        ssgl_jf = 0f;
+                        ssgl_zs = 0f;
+                        ssgl_qr = 0f;
+                        ssgl_qc = 0f;
+                        ssgl_kx = 0f;
+                        ssgl_qh = 0f;
+                        ssgl_yw = 0f;
+                        ssgl_other = 0f;
+                        ljgl = 0f;
+                        //班次
+                        jhbc = 0;
+                        jhbc_m = 0;
+                        jhbc_a = 0;
+                        sjbc = 0;
+                        sjbc_m = 0;
+                        sjbc_a = 0;
+                        ljbc = 0;
+                        ljbc_m = 0;
+                        ljbc_a = 0;
+                        fzbc = 0;
+                        fzbc_m = 0;
+                        fzbc_a = 0;
+                        dtbc = 0;
+                        dtbc_m = 0;
+                        dtbc_a = 0;
+                        djg = 0;
+                        djg_m = 0;
+                        djg_a = 0;
+                        djg_time = 0;
+                    }
+                } else {
+                    map = new HashMap<String, Object>();
+                    map.put("xlName", scheduleRealInfo.getXlName());
+                    map.put("jhlc", format.format(jhlc));
+                    map.put("sjgl", format.format(sjgl));
+                    map.put("ssgl", format.format(ssgl));
+                    map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
+                    map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
+                    map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
+                    map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
+                    map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
+                    map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
+                    map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
+                    map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
+                    map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
+                    map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
+                    map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+                    map.put("ssbc", ssbc);
+                    map.put("ssbc_lz", ssbc_lz);
+                    map.put("ssbc_dm", ssbc_dm);
+                    map.put("ssbc_gz", ssbc_gz);
+                    map.put("ssbc_jf", ssbc_jf);
+                    map.put("ssbc_zs", ssbc_zs);
+                    map.put("ssbc_qr", ssbc_qr);
+                    map.put("ssbc_qc", ssbc_qc);
+                    map.put("ssbc_kx", ssbc_kx);
+                    map.put("ssbc_qh", ssbc_qh);
+                    map.put("ssbc_yw", ssbc_yw);
+                    map.put("ssbc_other", ssbc_other);
+                    map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+                    map.put("jhbc", jhbc);
+                    map.put("jhbc_m", jhbc_m);
+                    map.put("jhbc_a", jhbc_a);
+                    map.put("sjbc", sjbc);
+                    map.put("sjbc_m", sjbc_m);
+                    map.put("sjbc_a", sjbc_a);
+                    map.put("ljbc", ljbc);
+                    map.put("ljbc_m", ljbc_m);
+                    map.put("ljbc_a", ljbc_a);
+                    map.put("fzbc", fzbc);
+                    map.put("fzbc_m", fzbc_m);
+                    map.put("fzbc_a", fzbc_a);
+                    map.put("dtbc", dtbc);
+                    map.put("dtbc_m", dtbc_m);
+                    map.put("dtbc_a", dtbc_a);
+                    map.put("djg", djg);
+                    map.put("djg_m", djg_m);
+                    map.put("djg_a", djg_a);
+                    map.put("djg_time", djg_time);
+                    lMap.add(map);
+                    jhlc = 0;
+                    tempJhlc = 0;
+                    childMileage = 0;
+                    sjgl = 0f;
+                    ssgl = 0f;
+                    ssgl_lz = 0f;
+                    ssgl_dm = 0f;
+                    ssgl_gz = 0f;
+                    ssgl_jf = 0f;
+                    ssgl_zs = 0f;
+                    ssgl_qr = 0f;
+                    ssgl_qc = 0f;
+                    ssgl_kx = 0f;
+                    ssgl_qh = 0f;
+                    ssgl_yw = 0f;
+                    ssgl_other = 0f;
+                    ljgl = 0f;
+                    //班次
+                    jhbc = 0;
+                    jhbc_m = 0;
+                    jhbc_a = 0;
+                    sjbc = 0;
+                    sjbc_m = 0;
+                    sjbc_a = 0;
+                    ljbc = 0;
+                    ljbc_m = 0;
+                    ljbc_a = 0;
+                    fzbc = 0;
+                    fzbc_m = 0;
+                    fzbc_a = 0;
+                    dtbc = 0;
+                    dtbc_m = 0;
+                    dtbc_a = 0;
+                    djg = 0;
+                    djg_m = 0;
+                    djg_a = 0;
+                    djg_time = 0;
+                }
+            }
+        }
+        map = new HashMap<String, Object>();
+        map.put("xlName", "合计");
+        map.put("jhlc", format.format(jhlcZ));
+        map.put("sjgl", format.format(sjglZ));
+        map.put("ssgl", format.format(ssglZ));
+        map.put("ssgl_lz", ssgl_lzZ == 0 ? 0 : format.format(ssgl_lzZ));
+        map.put("ssgl_dm", ssgl_dmZ == 0 ? 0 : format.format(ssgl_dmZ));
+        map.put("ssgl_gz", ssgl_gzZ == 0 ? 0 : format.format(ssgl_gzZ));
+        map.put("ssgl_jf", ssgl_jfZ == 0 ? 0 : format.format(ssgl_jfZ));
+        map.put("ssgl_zs", ssgl_zsZ == 0 ? 0 : format.format(ssgl_zsZ));
+        map.put("ssgl_qr", ssgl_qrZ == 0 ? 0 : format.format(ssgl_qrZ));
+        map.put("ssgl_qc", ssgl_qcZ == 0 ? 0 : format.format(ssgl_qcZ));
+        map.put("ssgl_kx", ssgl_kxZ == 0 ? 0 : format.format(ssgl_kxZ));
+        map.put("ssgl_qh", ssgl_qhZ == 0 ? 0 : format.format(ssgl_qhZ));
+        map.put("ssgl_yw", ssgl_ywZ == 0 ? 0 : format.format(ssgl_ywZ));
+        map.put("ssgl_other", ssgl_otherZ == 0 ? 0 : format.format(ssgl_otherZ));
+        map.put("ssbc", ssbcZ);
+        map.put("ssbc_lz", ssbc_lzZ);
+        map.put("ssbc_dm", ssbc_lzZ);
+        map.put("ssbc_gz", ssbc_gzZ);
+        map.put("ssbc_jf", ssbc_jfZ);
+        map.put("ssbc_zs", ssbc_zsZ);
+        map.put("ssbc_qr", ssbc_qrZ);
+        map.put("ssbc_qc", ssbc_qcZ);
+        map.put("ssbc_kx", ssbc_qcZ);
+        map.put("ssbc_qh", ssbc_qhZ);
+        map.put("ssbc_yw", ssbc_ywZ);
+        map.put("ssbc_other", ssbc_otherZ);
+        map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ));
+        map.put("jhbc", jhbcZ);
+        map.put("jhbc_m", jhbc_mZ);
+        map.put("jhbc_a", jhbc_aZ);
+        map.put("sjbc", sjbcZ);
+        map.put("sjbc_m", sjbc_mZ);
+        map.put("sjbc_a", sjbc_aZ);
+        map.put("ljbc", ljbcZ);
+        map.put("ljbc_m", ljbc_mZ);
+        map.put("ljbc_a", ljbc_aZ);
+        map.put("fzbc", fzbcZ);
+        map.put("fzbc_m", fzbc_mZ);
+        map.put("fzbc_a", fzbc_aZ);
+        map.put("dtbc", dtbcZ);
+        map.put("dtbc_m", dtbc_mZ);
+        map.put("dtbc_a", dtbc_aZ);
+        map.put("djg", djgZ);
+        map.put("djg_m", djg_mZ);
+        map.put("djg_a", djg_aZ);
+        map.put("djg_time", djg_timeZ);
+        lMap.add(map);
+       /* for (int i = 0; i < lMap.size(); i++) {
+        	Map<String, Object> m=lMap.get(i);
+//        	m.get(""))
+        	jhlc +=  Double.parseDouble(m.get("jhlc").toString());
+        	sjgl +=   Double.parseDouble(m.get("sjgl").toString());
+        	ssgl += Double.parseDouble( m.get("ssgl").toString());
+        	ssgl_lz += Double.parseDouble( m.get("ssgl_lz").toString());
+        	ssgl_dm += Double.parseDouble(m.get("ssgl_dm").toString());
+        	ssgl_gz += Double.parseDouble( m.get("ssgl_gz").toString());
+        	ssgl_jf += m.get("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
+            m.get("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
+            m.get("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
+            m.get("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
+            m.get("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
+            m.get("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
+            m.get("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
+            m.get("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+            m.get("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+            m.get("jhbc", jhbc);
+            m.get("jhbc_m", jhbc_m);
+            m.get("jhbc_a", jhbc_a);
+            m.get("sjbc", sjbc);
+            m.get("sjbc_m", sjbc_m);
+            m.get("sjbc_a", sjbc_a);
+            m.get("ljbc", ljbc);
+            m.get("ljbc_m", ljbc_m);
+            m.get("ljbc_a", ljbc_a);
+            m.get("fzbc", fzbc);
+            m.get("fzbc_m", fzbc_m);
+            m.get("fzbc_a", fzbc_a);
+            m.get("dtbc", dtbc);
+            m.get("dtbc_m", dtbc_m);
+            m.get("dtbc_a", dtbc_a);
+            m.get("djg", djg);
+            m.get("djg_m", djg_m);
+            m.get("djg_a", djg_a);
+            m.get("djg_time", djg_time);
+		}*/
+
+        if (type != null && type.length() != 0 && type.equals("export")) {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            ReportUtils ee = new ReportUtils();
             try {
-                listI.add(tempList.iterator());
+                listI.add(lMap.iterator());
                 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
-                        path + "export/修正报表" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
+                        path + "export/统计日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
             } catch (Exception e) {
                 // TODO: handle exception
                 e.printStackTrace();
             }
-            Map<String, Object> map = tempList.get(tempList.size() - 1);
-            System.out.println("tempMap:" + map);
-        }
-
-        return list;
-    }
-
-    @Override
-    public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
-                                                   String lpName, String date, String line) {
-        List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
-        List<ScheduleRealInfo> list = null;
-        list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
-        for (int i = 0; i < list.size(); i++) {
-            ScheduleRealInfo s = list.get(i);
-            s.setAdjustExps(i + 1 + "");
-            String remarks = "";
-            if (s.getRemarks() != null) {
-                remarks += s.getRemarks();
-            }
-
-            Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
-            if (!childTaskPlans.isEmpty()) {
-                s.setFcsjActual("");
-                s.setZdsjActual("");
-            }
-
-            if (s.isDestroy()) {
-                s.setFcsjActual("");
-                s.setZdsjActual("");
-                s.setJhlc(0.0);
-                remarks += "(烂班)";
-                s.setRemarks(remarks);
-            }
-            listSchedule.add(s);
-            //计算营运里程，空驶里程
-            if (!childTaskPlans.isEmpty()) {
-                String sqlPc = "select * from bsth_c_s_child_task where schedule=" + s.getId() + "  order by start_date ";
-                List<ScheduleRealInfo> lists = jdbcTemplate.query(sqlPc,
-                        new RowMapper<ScheduleRealInfo>() {
-                            @Override
-                            public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
-                                ScheduleRealInfo t = new ScheduleRealInfo();
-                                if (rs.getInt("destroy") == 0) {
-                                    t.setFcsjActual(rs.getString("start_date"));
-                                    t.setZdsjActual(rs.getString("end_date"));
-                                    t.setJhlc(rs.getDouble("mileage"));
-                                } else {
-                                    t.setFcsjActual("");
-                                    t.setZdsjActual("");
-                                    t.setJhlc(0.0);
-                                }
-                                t.setQdzName(rs.getString("start_station_name"));
-                                t.setZdzName(rs.getString("end_station_name"));
-                                t.setRemarks(rs.getString("remarks"));
-                                t.setAdjustExps("子");
-                                return t;
-                            }
-                        });
-                for (int j = 0; j < lists.size(); j++) {
-                    ScheduleRealInfo t = lists.get(j);
-                    listSchedule.add(t);
-                }
-            }
         }
-        return listSchedule;
-    }
-
-    @Override
-    public Map<String, Object> removeChildTask(Long taskId) {
-        Map<String, Object> rs = new HashMap<>();
-        ChildTaskPlan chTask = cTaskPlanRepository.findOne(taskId);
-
-        ScheduleRealInfo sch = dayOfSchedule.get(chTask.getSchedule().getId());
-        try {
-
-            sch.getcTasks().remove(chTask);
-            scheduleRealInfoRepository.save(sch);
-            rs.put("status", ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-        }
-        return rs;
+        return lMap;
     }
-
+    
     @Override
-    public List<Map<String, Object>> statisticsDaily(String line, String date,
+    public List<Map<String, Object>> statisticsDailyTj(String line, String date,String date2,
                                                      String xlName, String type) {
         List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-        if (date.length() == 10)
-            list = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
-        else if (date.length() == 7)
-            list = scheduleRealInfoRepository.scheduleByDateAndLine3(line, date);
+            list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2);
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         DecimalFormat format = new DecimalFormat("0.00");
@@ -2331,119 +2889,113 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return list;
     }
-    public List<Map<String, Object>> yesterdayDataList(String line, String date) {
+    public List<Map<String, Object>> yesterdayDataList(String line, String date,String gsbm,String fgsbm,String jGh,String nbbm) {
+//    	Arith arith=new Arith();
         //前一天日期
 //		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
 //		String date = "2016-09-20";
-        List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date);
-//		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+    	  System.out.println("shijian1:"+new Date());
+        List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm);
+        System.out.println("shijian2:"+new Date());
+        //		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+        List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
+        System.out.println("shijian3:"+new Date());
         for (int x = 0; x < yesterdayDataList.size(); x++) {
             String jName = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
-            List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh, date);
+           
             double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
-            float addMileage = 0l, remMileage = 0l;
+            double addMileage = 0, remMileage = 0;
             Map<String, Object> map = new HashMap<String, Object>();
             boolean fage = true;
+            String company="";
+            String bCompany="";
             for (ScheduleRealInfo scheduleRealInfo : lists) {
-                if (fage) {
-                    //根据线路代码获取公司
-                    Line li = lineRepository.findByLineCode(scheduleRealInfo.getXlBm());
-                    yesterdayDataList.get(x).put("company", li.getCompany());
-                    yesterdayDataList.get(x).put("bCompany", li.getBrancheCompany());
-                    fage = false;
-                }
-                if (scheduleRealInfo != null) {
-                    //计划里程（主任务过滤掉临加班次），
-                    //烂班里程（主任务烂班），
-                    //临加里程（主任务临加），
-                    //计划班次，烂班班次，增加班次
-                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
-                    if (scheduleRealInfo.isSflj()) {
-                        addMileage += tempJhlc;
-                    } else {
-                        if (!(scheduleRealInfo.getBcType().equals("in")
-                                || scheduleRealInfo.getBcType().equals("out"))) {
-                            jhlc += tempJhlc;
-                        }
-
-                        if (scheduleRealInfo.getStatus() == -1) {
-                            remMileage += tempJhlc;
-                        }
-                    }
-                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-                    //计算营运里程，空驶里程
-                    if (childTaskPlans.isEmpty()) {
-                        if (scheduleRealInfo.getBcType().equals("in") ||
-                                scheduleRealInfo.getBcType().equals("out")) {
-                        	if (scheduleRealInfo.getStatus() != -1) {
-                        		jcclc += tempJhlc;
-                        	}
-                        }
-                        //主任务 放空班次属于营运
-//						else if(scheduleRealInfo.getBcType().equals("venting")){
-//							ksgl += tempJhlc;
-//						}
-                        else {
-                            if (scheduleRealInfo.getStatus() != -1) {
-                                yygl += tempJhlc;
-                            }
-                        }
-                    } else {
-                        Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                        while (it.hasNext()) {
-                            ChildTaskPlan childTaskPlan = it.next();
-                            if (childTaskPlan.getMileageType().equals("empty")) {
-                                if (childTaskPlan.isDestroy()) {
-                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                                } else {
-                                    ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                                }
-                            } else {
-                                if (childTaskPlan.isDestroy()) {
-                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                                } else {
-                                    yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                                }
-                            }
-                        }
-                    }
-                }
+            	if(scheduleRealInfo.getjGh().equals(jName) && scheduleRealInfo.getClZbh().equals(clZbh)){
+	                if (fage) {
+	                    //根据线路代码获取公司
+	                	company=scheduleRealInfo.getGsBm();
+	                	bCompany=scheduleRealInfo.getFgsBm();
+	                    fage = false;
+	                }
+	                if (scheduleRealInfo != null) {
+	                    //计划里程（主任务过滤掉临加班次），
+	                    //烂班里程（主任务烂班），
+	                    //临加里程（主任务临加），
+	                    //计划班次，烂班班次，增加班次
+	                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+	                    if (scheduleRealInfo.isSflj()) {
+	                    	if(scheduleRealInfo.getStatus() == -1){
+//	                    		addMileage += tempJhlc;
+	                    		addMileage =Arith.add(addMileage, tempJhlc);
+	                    	}
+	                    } else {
+	                        if (!(scheduleRealInfo.getBcType().equals("in")
+	                                || scheduleRealInfo.getBcType().equals("out"))) {
+//	                            jhlc += tempJhlc;
+	                            jhlc =Arith.add(jhlc,tempJhlc);
+	                        }
+	
+	                        if (scheduleRealInfo.getStatus() == -1) {
+//	                            remMileage += tempJhlc;
+	                            remMileage =Arith.add(remMileage,tempJhlc);
+	                        }
+	                    }
+	                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+	                    //计算营运里程，空驶里程
+	                    if (childTaskPlans.isEmpty()) {
+	                        if (scheduleRealInfo.getBcType().equals("in") ||
+	                                scheduleRealInfo.getBcType().equals("out")) {
+	                        	if (scheduleRealInfo.getStatus() != -1) {
+//	                        		jcclc += tempJhlc;
+	                        		jcclc=Arith.add(jcclc,tempJhlc);
+	                        	}
+	                        }
+	                        //主任务 放空班次属于营运
+	//						else if(scheduleRealInfo.getBcType().equals("venting")){
+	//							ksgl += tempJhlc;
+	//						}
+	                        else {
+	                            if (scheduleRealInfo.getStatus() != -1) {
+//	                                yygl += tempJhlc;
+	                                yygl=Arith.add(yygl,tempJhlc);
+	                            }
+	                        }
+	                    } else {
+	                        Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                        while (it.hasNext()) {
+	                            ChildTaskPlan childTaskPlan = it.next();
+	                            if (childTaskPlan.getMileageType().equals("empty")) {
+	                                if (childTaskPlan.isDestroy()) {
+//	                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+	                                    remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
+	                                } else {
+//	                                    ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+	                                    ksgl += Arith.add(ksgl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
+	                                }
+	                            } else {
+	                                if (childTaskPlan.isDestroy()) {
+//	                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+	                                    remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
+
+	                                } else {
+//	                                    yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+	                                    yygl=Arith.add(yygl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
+
+	                                }
+	                            }
+	                        }
+	                    }
+	                }
+	            }
             }
+            yesterdayDataList.get(x).put("company", company);
+            yesterdayDataList.get(x).put("bCompany", bCompany);
+            Double zgl=Arith.add(yygl,ksgl);
+            yesterdayDataList.get(x).put("totalKilometers", Arith.add(zgl, jcclc));
-            yesterdayDataList.get(x).put("totalKilometers", yygl + ksgl + jcclc);
-
-        }
-		
-		/*	for(ScheduleRealInfo scheduleRealInfo:list){
-			if(scheduleRealInfo != null){
-				for(int i=0;i<yesterdayDataList.size();i++){
-					if(scheduleRealInfo.getXlBm().equals(yesterdayDataList.get(i).get("xlBm")) && scheduleRealInfo.getClZbh().equals(yesterdayDataList.get(i).get("clZbh"))
-							&& scheduleRealInfo.getjGh().equals(yesterdayDataList.get(i).get("jGh"))){
-						//根据线路代码获取公司
-						Line li = lineRepository.findByLineCode(scheduleRealInfo.getXlBm());
-						yesterdayDataList.get(i).put("company", li.getCompany());
-						yesterdayDataList.get(i).put("bCompany", li.getBrancheCompany());
-						//计算总公里
-						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-						//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
-						if(childTaskPlans.isEmpty()){
-							if(scheduleRealInfo.getStatus() == 2){
-								yesterdayDataList.get(i).put("totalKilometers", scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc()+(double)(yesterdayDataList.get(i).get("totalKilometers")==null?0.0:yesterdayDataList.get(i).get("totalKilometers")));
-							}
-						}else{
-							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-							while(it.hasNext()){
-								ChildTaskPlan childTaskPlan = it.next();
-								if(!childTaskPlan.isDestroy()){
-									yesterdayDataList.get(i).put("totalKilometers", childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage()+(double)(yesterdayDataList.get(i).get("totalKilometers")==null?0.0:yesterdayDataList.get(i).get("totalKilometers")));
-								}
-							}
-						}
-					}	
-				}
-			}
-		}*/
+        }
+        System.out.println();
         //增加顺序号
         for (int i = 0; i < yesterdayDataList.size(); i++) {
             if (i == 0) {
@@ -3118,7 +3670,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         }
                         if (!c.isDestroy()) {
-                            sjlc += c.getMileage() == null ? 0 : c.getMileage();
+                        	if(c.getMileageType().equals("service")){
+                        		sjlc += c.getMileage() == null ? 0 : c.getMileage();
+                        	}
                         }
                     }
@@ -3593,17 +4147,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             ScheduleRealInfo leftSch, rightSch = null;
-            boolean changeRealTime = true;
             for (int i = 0; i < largeList.size(); i++) {
                 leftSch = largeList.get(i);
                 if (i < smallList.size()) {
                     rightSch = smallList.get(i);
                     ts.add(rightSch);
-                } else
-                    changeRealTime = false;
+                } else{
+                    //不对称时多出来的
+                    lpChangeByLeft(leftSch, largeList.get(i - 1), type);
+                    ts.add(leftSch);
+                    cars.add(leftSch.getClZbh());
+                    continue;
+                }
                 //调换路牌
-                lpChange(leftSch, rightSch, type, changeRealTime);
+                lpChange(leftSch, rightSch, type);
                 ts.add(leftSch);
                 cars.add(leftSch.getClZbh());
@@ -3639,19 +4197,38 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
     @Override
-    public void lpChange(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type, boolean changeRealTime) {
+    public void lpChange(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type) {
         LpData leftData = new LpData(leftSch);
         LpData rightData = new LpData(rightSch);
-        leftData.appendTo(rightSch, type, changeRealTime);
-        rightData.appendTo(leftSch, type, changeRealTime);
+        leftData.appendTo(rightSch, type);
+        rightData.appendTo(leftSch, type);
+
+        if(type > 0){
+            //更新车辆和班次映射信息
+            dayOfSchedule.removeNbbm2SchMapp(leftSch, leftData.getNbbm());
+            dayOfSchedule.removeNbbm2SchMapp(rightSch, rightData.getNbbm());
-        //更新车辆和班次映射信息
-        dayOfSchedule.removeNbbm2SchMapp(leftSch, leftData.getNbbm());
-        dayOfSchedule.removeNbbm2SchMapp(rightSch, rightData.getNbbm());
+            dayOfSchedule.addNbbm2SchMapp(leftSch, rightData.getNbbm());
+            dayOfSchedule.addNbbm2SchMapp(rightSch, leftData.getNbbm());
+        }
+    }
+
+    /**
+     * 更换左边班次的路牌，右边不变
+     * @param leftSch
+     * @param rightSch
+     * @param type
+     */
+    public void lpChangeByLeft(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type) {
+        LpData rightData = new LpData(rightSch);
-        dayOfSchedule.addNbbm2SchMapp(leftSch, rightData.getNbbm());
-        dayOfSchedule.addNbbm2SchMapp(rightSch, leftData.getNbbm());
+        rightData.appendTo(leftSch, type);
+
+        if(type > 0){
+            //更新车辆和班次映射信息
+            dayOfSchedule.addNbbm2SchMapp(leftSch, rightData.getNbbm());
+        }
     }
     @Override
-package com.bsth.service.schedule.rules.plan;
-
-import com.bsth.entity.schedule.SchedulePlanInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 计划输出。
- */
-public class PlanResult {
-    private List<SchedulePlanInfo> schedulePlanInfos = new ArrayList<>();
-
-    public PlanResult() {
-    }
-
-    public void add(SchedulePlanInfo schedulePlanInfo) {
-        schedulePlanInfos.add(schedulePlanInfo);
-    }
-
-    public List<SchedulePlanInfo> getSchedulePlanInfos() {
-        return schedulePlanInfos;
-    }
-
-    public void setSchedulePlanInfos(List<SchedulePlanInfo> schedulePlanInfos) {
-        this.schedulePlanInfos = schedulePlanInfos;
-    }
-}
+package com.bsth.service.schedule.rules.plan;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 计划输出。
+ */
+public class PlanResult {
+    private List<SchedulePlanInfo> schedulePlanInfos = new ArrayList<>();
+
+    public PlanResult() {
+    }
+
+    public void add(SchedulePlanInfo schedulePlanInfo) {
+        schedulePlanInfos.add(schedulePlanInfo);
+    }
+
+    public List<SchedulePlanInfo> getSchedulePlanInfos() {
+        return schedulePlanInfos;
+    }
+
+    public void setSchedulePlanInfos(List<SchedulePlanInfo> schedulePlanInfos) {
+        this.schedulePlanInfos = schedulePlanInfos;
+    }
+}
-排班计划规则，构造计划明细输出
-1、使用shiftloop.drl和ttinfo.drl的输出作为输入，进行规则计算
+排班计划规则，构造计划明细输出
+1、使用shiftloop.drl和ttinfo.drl的输出作为输入，进行规则计算
 2、计算后输出排班明细列表
 \ No newline at end of file
+package com.bsth.util;
+
+import java.math.BigDecimal;
+
+public class Arith {
+	 /**   
+	    * 由于Java的简单类型不能够精确的对浮点数进行运算，这个工具类提供精   
+	    * 确的浮点数运算，包括加减乘除和四舍五入。   
+	    */    
+	    //默认除法运算精度    
+	    private static final int DEF_DIV_SCALE = 10;    
+	           
+	    //这个类不能实例化    
+	    private Arith(){    
+	    }    
+	  
+	    /**   
+	     * 提供精确的加法运算。   
+	     * @param v1 被加数   
+	     * @param v2 加数   
+	     * @return 两个参数的和   
+	     */    
+	    public static double add(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(Double.toString(v1));    
+	        BigDecimal b2 = new BigDecimal(Double.toString(v2));    
+	        return b1.add(b2).doubleValue();    
+	    }    
+	       
+	    /**   
+	     * 提供精确的减法运算。   
+	     * @param v1 被减数   
+	     * @param v2 减数   
+	     * @return 两个参数的差   
+	     */    
+	    public static double sub(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(Double.toString(v1));    
+	        BigDecimal b2 = new BigDecimal(Double.toString(v2));    
+	        return b1.subtract(b2).doubleValue();    
+	    }    
+	       
+	    /**   
+	     * 提供精确的乘法运算。   
+	     * @param v1 被乘数   
+	     * @param v2 乘数   
+	     * @return 两个参数的积   
+	     */    
+	    public static double mul(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(Double.toString(v1));    
+	        BigDecimal b2 = new BigDecimal(Double.toString(v2));    
+	        return b1.multiply(b2).doubleValue();    
+	    }    
+	  
+	    /**   
+	     * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到   
+	     * 小数点以后10位，以后的数字四舍五入。   
+	     * @param v1 被除数   
+	     * @param v2 除数   
+	     * @return 两个参数的商   
+	     */    
+	    public static double div(double v1,double v2){    
+	        return div(v1,v2,DEF_DIV_SCALE);    
+	    }    
+	  
+	    /**   
+	     * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指   
+	     * 定精度，以后的数字四舍五入。   
+	     * @param v1 被除数   
+	     * @param v2 除数   
+	     * @param scale 表示表示需要精确到小数点以后几位。   
+	     * @return 两个参数的商   
+	     */    
+	    public static double div(double v1,double v2,int scale){    
+	        if(scale<0){    
+	            throw new IllegalArgumentException(    
+	                "The scale must be a positive integer or zero");    
+	        }    
+	        BigDecimal b1 = new BigDecimal(Double.toString(v1));    
+	        BigDecimal b2 = new BigDecimal(Double.toString(v2));    
+	        return b1.divide(b2,scale,BigDecimal.ROUND_HALF_UP).doubleValue();    
+	    }    
+	  
+	    /**   
+	     * 提供精确的小数位四舍五入处理。   
+	     * @param v 需要四舍五入的数字   
+	     * @param scale 小数点后保留几位   
+	     * @return 四舍五入后的结果   
+	     */    
+	    public static double round(double v,int scale){    
+	        if(scale<0){    
+	            throw new IllegalArgumentException(    
+	                "The scale must be a positive integer or zero");    
+	        }    
+	        BigDecimal b = new BigDecimal(Double.toString(v));    
+	        BigDecimal one = new BigDecimal("1");    
+	        return b.divide(one,scale,BigDecimal.ROUND_HALF_UP).doubleValue();    
+	    }    
+	       
+	   /**   
+	    * 提供精确的类型转换(Float)   
+	    * @param v 需要被转换的数字   
+	    * @return 返回转换结果   
+	    */    
+	    public static float convertsToFloat(double v){    
+	        BigDecimal b = new BigDecimal(v);    
+	        return b.floatValue();    
+	    }    
+	       
+	    /**   
+	    * 提供精确的类型转换(Int)不进行四舍五入   
+	    * @param v 需要被转换的数字   
+	    * @return 返回转换结果   
+	    */    
+	    public static int convertsToInt(double v){    
+	        BigDecimal b = new BigDecimal(v);    
+	        return b.intValue();    
+	    }    
+	  
+	    /**   
+	    * 提供精确的类型转换(Long)   
+	    * @param v 需要被转换的数字   
+	    * @return 返回转换结果   
+	    */    
+	    public static long convertsToLong(double v){    
+	        BigDecimal b = new BigDecimal(v);    
+	        return b.longValue();    
+	    }    
+	  
+	    /**   
+	    * 返回两个数中大的一个值   
+	    * @param v1 需要被对比的第一个数   
+	    * @param v2 需要被对比的第二个数   
+	    * @return 返回两个数中大的一个值   
+	    */    
+	    public static double returnMax(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(v1);    
+	        BigDecimal b2 = new BigDecimal(v2);    
+	        return b1.max(b2).doubleValue();    
+	    }    
+	  
+	    /**   
+	    * 返回两个数中小的一个值   
+	    * @param v1 需要被对比的第一个数   
+	    * @param v2 需要被对比的第二个数   
+	    * @return 返回两个数中小的一个值   
+	    */    
+	    public static double returnMin(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(v1);    
+	        BigDecimal b2 = new BigDecimal(v2);    
+	        return b1.min(b2).doubleValue();    
+	    }    
+	  
+	    /**   
+	    * 精确对比两个数字   
+	    * @param v1 需要被对比的第一个数   
+	    * @param v2 需要被对比的第二个数   
+	    * @return 如果两个数一样则返回0，如果第一个数比第二个数大则返回1，反之返回-1   
+	    */    
+	        public static int compareTo(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(v1);    
+	        BigDecimal b2 = new BigDecimal(v2);    
+	        return b1.compareTo(b2);    
+	    }   
+}
@@ -356,3 +356,4 @@ end
+
-package com.bsth.service.schedule.shiftloop;
-
-import org.joda.time.*;
-import java.util.*;
-
-import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
-
-import org.slf4j.Logger;
-
-global Logger log;
-
-/*
-    存在（翻班格式）
-*/
-
-//------------------------- 第一阶段、计算规则准备数据（天数） ----------------------------//
-
-declare Calcu_days_result
-    ruleId : String // 规则Id
-    qyrq_days : Integer // 开始日期离启用日期的天数
-    sdays : Integer // 总共需要排班的天数
-    calcu_start_date : DateTime // 开始计算日期
-    calcu_end_date : DateTime // 结束计算日期
-end
-
-/*
-    计算启用日期，开始计算日期，结束计算日期，相差天数
-    1、规则启用日期小于开始计算日期
-    2、规则启用日期大于等于开始日期，小于等于结束日期
-*/
-rule "calcu_days_1"
-    salience 100
-    when
-        ScheduleCalcuParam_input(
-            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
-            $fromDate : fromDate,
-            $toDate : toDate
-        )
-        ScheduleRule_input($ruleId : ruleId, $qyrq : qyrq)
-        eval($qyrq.isBefore($fromDate))
-    then
-        // 构造Calcu_days_result对象，进行下一阶段计算
-        Calcu_days_result cdr = new Calcu_days_result();
-        cdr.setRuleId($ruleId);
-        Period p1 = new Period($qyrq, $fromDate, PeriodType.days());
-        cdr.setQyrq_days(p1.getDays());
-        Period p2 = new Period($fromDate, $toDate, PeriodType.days());
-        cdr.setSdays(p2.getDays() + 1);
-        cdr.setCalcu_start_date($fromDate);
-        cdr.setCalcu_end_date($toDate);
-
-        log.info("开始日期离启用日期的天数 qyrq_days={}", p1.getDays());
-        log.info("总共需要排班的天数 sdays={}", (p2.getDays() + 1));
-
-        insert(cdr); // 插入fact数据，进入下一个阶段
-end
-
-rule "calcu_days_2"
-    salience 100
-    when
-        ScheduleCalcuParam_input(
-            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
-            $fromDate : fromDate,
-            $toDate : toDate
-        )
-        ScheduleRule_input($ruleId : ruleId, $qyrq : qyrq)
-        eval((!$qyrq.isBefore($fromDate)) && (!$qyrq.isAfter($toDate)))
-    then
-        // 构造Calcu_days_result对象，进行下一阶段计算
-        Calcu_days_result cdr = new Calcu_days_result();
-        cdr.setRuleId($ruleId);
-        cdr.setQyrq_days(0);
-        Period p2 = new Period($qyrq, $toDate, PeriodType.days());
-        cdr.setSdays(Integer.valueOf(p2.getDays() + 1));
-        cdr.setCalcu_start_date($qyrq);
-        cdr.setCalcu_end_date($toDate);
-
-        log.info("开始日期离启用日期的天数 qyrq_days=0");
-        log.info("总共需要排班的天数 sdays={}", (p2.getDays() + 1));
-
-        insert(cdr); // 插入fact数据，进入下一个阶段
-end
-
-//------------------------- 第二阶段、计算规则准备数据2（起始索引） ----------------------------//
-
-//----------------------- 路牌范围循环计算 ------------------------//
-
-declare Calcu_guideboard_index_result
-    ruleId : String // 规则Id
-    calcu_index : Integer // 计算之后的起始索引
-end
-
-// 启用日期等于开始日期
-rule "calcu_guideboard_index_qyrq_eq_startrq"
-    when
-        $calcu_days_result : Calcu_days_result(
-            qyrq_days == 0,
-            $ruleId: ruleId
-        )
-        $scheduleRule_input : ScheduleRule_input(
-            ruleId == $ruleId,
-            $oindex : startGbdIndex
-        )
-    then
-        Calcu_guideboard_index_result cgir = new Calcu_guideboard_index_result();
-        cgir.setRuleId($ruleId);
-        cgir.setCalcu_index($oindex);
-
-        log.info("calcu_guideboard_index_qyrq_eq_startrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
-
-        insert(cgir);
-end
-
-// 开始日期大于启用日期
-rule "calcu_guideboard_index_startrq_gt_qyrq"
-    when
-        $calcu_days_result : Calcu_days_result(
-            qyrq_days > 0,
-            $ruleId: ruleId, $qyrq_days: qyrq_days,
-            $calcu_start_date: calcu_start_date
-        )
-        $scheduleRule_input : ScheduleRule_input(
-            ruleId == $ruleId,
-            $qyrq: qyrq,
-            $rangesize : guideboardIds.size(),
-            $oindex : startGbdIndex,
-            $weekdays: weekdays
-        )
-    then
-        // 开始时间
-        DateTime initDate = $qyrq;
-        int index = $oindex;
-        int resultIndex = index;
-
-        while (!initDate.isAfter($calcu_start_date)) {
-            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
-                resultIndex = index;
-                index = (index + 1) % $rangesize;
-            }
-            initDate = initDate.plusDays(1);
-        }
-
-        Calcu_guideboard_index_result cgir = new Calcu_guideboard_index_result();
-        cgir.setRuleId($ruleId);
-        cgir.setCalcu_index(resultIndex);
-
-        log.info("calcu_guideboard_index_startrq_gt_qyrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
-
-        insert(cgir);
-end
-
-//----------------------- 人员范围循环计算 ------------------------//
-
-declare Calcu_employee_index_result
-    ruleId : String // 规则Id
-    calcu_index : Integer // 计算之后的起始索引
-end
-
-// 启用日期等于开始日期
-rule "calcu_employee_index_qyrq_eq_startrq"
-    when
-        $calcu_days_result : Calcu_days_result(
-            qyrq_days == 0,
-            $ruleId: ruleId)
-        $scheduleRule_input : ScheduleRule_input(
-            ruleId == $ruleId,
-            $oindex : startEIndex)
-    then
-        Calcu_employee_index_result cgir = new Calcu_employee_index_result();
-        cgir.setRuleId($ruleId);
-        cgir.setCalcu_index($oindex);
-
-        log.info("calcu_employee_index_qyrq_eq_startrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
-
-        insert(cgir);
-end
-
-// 开始日期大于启用日期
-rule "calcu_employee_index_startrq_gt_qyrq"
-    when
-        $calcu_days_result : Calcu_days_result(
-            qyrq_days > 0,
-            $ruleId: ruleId, $qyrq_days: qyrq_days,
-            $calcu_start_date: calcu_start_date
-        )
-        $scheduleRule_input : ScheduleRule_input(
-            ruleId == $ruleId,
-            $qyrq: qyrq,
-            $rangesize : employeeConfigIds.size(),
-            $oindex : startEIndex,
-            $weekdays: weekdays
-        )
-    then
-        // 开始时间
-        DateTime initDate = $qyrq;
-        int index = $oindex;
-        int resultIndex = index;
-
-        while (!initDate.isAfter($calcu_start_date)) {
-            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
-                resultIndex = index;
-                index = (index + 1) % $rangesize;
-            }
-            initDate = initDate.plusDays(1);
-        }
-
-        Calcu_employee_index_result cgir = new Calcu_employee_index_result();
-        cgir.setRuleId($ruleId);
-        cgir.setCalcu_index(resultIndex);
-
-        log.info("calcu_employee_index_startrq_gt_qyrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
-
-        insert(cgir);
-
-end
-
-//------------------------- 第三阶段、循环计算 ------------------------//
-
-//----------------------- 路牌范围循环计算 ------------------------//
-declare loop_guideboard_result
-    ruleId : String // 规则id
-    go_list : List // 路牌循环的列表
-end
-
-// 循环路牌计算
-rule "Calcu_loop_guideboard_result"
-    when
-        Calcu_days_result(
-            $ruleId: ruleId,
-            $startDate : calcu_start_date,
-            $calcu_end_date: calcu_end_date
-        )
-        $ruleData : ScheduleRule_input(
-            ruleId == $ruleId,
-            $rangesize : guideboardIds.size(),
-            $weekdays: weekdays
-        )
-        $indexData : Calcu_guideboard_index_result(
-            ruleId == $ruleId
-        )
-    then
-        DateTime initDate = $startDate; // 开始时间
-        DateTime endDate = $calcu_end_date; // 结束实际
-        List<ScheduleResult_output> scheduleResult_outputs =
-            new ArrayList<ScheduleResult_output>();
-
-        int i = $indexData.getCalcu_index();
-        if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue() == false) {
-            i = (i + 1) % $rangesize;
-        }
-
-        while (!initDate.isAfter(endDate)) {
-            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
-                ScheduleResult_output ro = new ScheduleResult_output();
-                ro.setRuleId($ruleId);
-                ro.setSd(initDate);
-                ro.setGuideboardId($ruleData.getGuideboardIds().get(i));
-                ro.setCarConfigId($ruleData.getCarConfigId());
-                scheduleResult_outputs.add(ro);
-
-                i = (i + 1) % $rangesize;
-            }
-
-            initDate = initDate.plusDays(1);
-        }
-
-        loop_guideboard_result clgr = new loop_guideboard_result();
-        clgr.setRuleId($ruleId);
-        clgr.setGo_list(scheduleResult_outputs);
-
-        log.info(String.valueOf(scheduleResult_outputs.size()));
-
-        insert(clgr);
-
-end
-
-//----------------------- 人员范围循环计算 ------------------------//
-declare loop_employee_result
-    ruleId : String // 规则id
-    eo_list : List // 人员循环的列表
-end
-
-// 循环人员计算
-rule "Calcu_loop_employee_result"
-    when
-        Calcu_days_result(
-            $ruleId: ruleId,
-            $startDate : calcu_start_date,
-            $calcu_end_date: calcu_end_date
-        )
-        $ruleData : ScheduleRule_input(
-            ruleId == $ruleId,
-            $rangesize : employeeConfigIds.size(),
-            $weekdays: weekdays
-        )
-        $indexData : Calcu_employee_index_result(
-            ruleId == $ruleId
-        )
-    then
-        DateTime initDate = $startDate; // 开始时间
-        DateTime endDate = $calcu_end_date; // 结束实际
-        List<ScheduleResult_output> scheduleResult_outputs =
-            new ArrayList<ScheduleResult_output>();
-
-        int i = $indexData.getCalcu_index();
-        if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue() == false) {
-            i = (i + 1) % $rangesize;
-        }
-
-        while (!initDate.isAfter(endDate)) {
-            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
-                ScheduleResult_output ro = new ScheduleResult_output();
-                ro.setRuleId($ruleId);
-                ro.setSd(initDate);
-                ro.setEmployeeConfigId($ruleData.getEmployeeConfigIds().get(i));
-                ro.setCarConfigId($ruleData.getCarConfigId());
-                scheduleResult_outputs.add(ro);
-
-                i = (i + 1) % $rangesize;
-            }
-
-            initDate = initDate.plusDays(1);
-        }
-
-        loop_employee_result clgr = new loop_employee_result();
-        clgr.setRuleId($ruleId);
-        clgr.setEo_list(scheduleResult_outputs);
-
-        log.info(String.valueOf(scheduleResult_outputs.size()));
-
-        insert(clgr);
-end
-
-//------------------------- 第四阶段、范围组循环计算 ----------------------------//
-
-global ScheduleResults_output scheduleResult;
-
-rule "output"
-    when
-        loop_guideboard_result(
-            go_list.size() > 0,
-            $ruleId : ruleId, $go_list : go_list
-        )
-        loop_employee_result(
-            ruleId == $ruleId,
-            eo_list.size() == $go_list.size(),
-            $eo_list : eo_list
-        )
-    then
-        for (int i = 0; i < $go_list.size(); i++) {
-            ScheduleResult_output go = (ScheduleResult_output) $go_list.get(i);
-            ScheduleResult_output eo = (ScheduleResult_output) $eo_list.get(i);
-            go.setEmployeeConfigId(eo.getEmployeeConfigId());
-            scheduleResult.getResults().add(go);
-        }
-
-end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+package com.bsth.service.schedule.shiftloop;
+
+import org.joda.time.*;
+import java.util.*;
+
+import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+
+import org.slf4j.Logger;
+
+global Logger log;
+
+/*
+    存在（翻班格式）
+*/
+
+//------------------------- 第一阶段、计算规则准备数据（天数） ----------------------------//
+
+declare Calcu_days_result
+    ruleId : String // 规则Id
+    qyrq_days : Integer // 开始日期离启用日期的天数
+    sdays : Integer // 总共需要排班的天数
+    calcu_start_date : DateTime // 开始计算日期
+    calcu_end_date : DateTime // 结束计算日期
+end
+
+/*
+    计算启用日期，开始计算日期，结束计算日期，相差天数
+    1、规则启用日期小于开始计算日期
+    2、规则启用日期大于等于开始日期，小于等于结束日期
+*/
+rule "calcu_days_1"
+    salience 100
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate
+        )
+        ScheduleRule_input($ruleId : ruleId, $qyrq : qyrq)
+        eval($qyrq.isBefore($fromDate))
+    then
+        // 构造Calcu_days_result对象，进行下一阶段计算
+        Calcu_days_result cdr = new Calcu_days_result();
+        cdr.setRuleId($ruleId);
+        Period p1 = new Period($qyrq, $fromDate, PeriodType.days());
+        cdr.setQyrq_days(p1.getDays());
+        Period p2 = new Period($fromDate, $toDate, PeriodType.days());
+        cdr.setSdays(p2.getDays() + 1);
+        cdr.setCalcu_start_date($fromDate);
+        cdr.setCalcu_end_date($toDate);
+
+        log.info("开始日期离启用日期的天数 qyrq_days={}", p1.getDays());
+        log.info("总共需要排班的天数 sdays={}", (p2.getDays() + 1));
+
+        insert(cdr); // 插入fact数据，进入下一个阶段
+end
+
+rule "calcu_days_2"
+    salience 100
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate
+        )
+        ScheduleRule_input($ruleId : ruleId, $qyrq : qyrq)
+        eval((!$qyrq.isBefore($fromDate)) && (!$qyrq.isAfter($toDate)))
+    then
+        // 构造Calcu_days_result对象，进行下一阶段计算
+        Calcu_days_result cdr = new Calcu_days_result();
+        cdr.setRuleId($ruleId);
+        cdr.setQyrq_days(0);
+        Period p2 = new Period($qyrq, $toDate, PeriodType.days());
+        cdr.setSdays(Integer.valueOf(p2.getDays() + 1));
+        cdr.setCalcu_start_date($qyrq);
+        cdr.setCalcu_end_date($toDate);
+
+        log.info("开始日期离启用日期的天数 qyrq_days=0");
+        log.info("总共需要排班的天数 sdays={}", (p2.getDays() + 1));
+
+        insert(cdr); // 插入fact数据，进入下一个阶段
+end
+
+//------------------------- 第二阶段、计算规则准备数据2（起始索引） ----------------------------//
+
+//----------------------- 路牌范围循环计算 ------------------------//
+
+declare Calcu_guideboard_index_result
+    ruleId : String // 规则Id
+    calcu_index : Integer // 计算之后的起始索引
+end
+
+// 启用日期等于开始日期
+rule "calcu_guideboard_index_qyrq_eq_startrq"
+    when
+        $calcu_days_result : Calcu_days_result(
+            qyrq_days == 0,
+            $ruleId: ruleId
+        )
+        $scheduleRule_input : ScheduleRule_input(
+            ruleId == $ruleId,
+            $oindex : startGbdIndex
+        )
+    then
+        Calcu_guideboard_index_result cgir = new Calcu_guideboard_index_result();
+        cgir.setRuleId($ruleId);
+        cgir.setCalcu_index($oindex);
+
+        log.info("calcu_guideboard_index_qyrq_eq_startrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
+
+        insert(cgir);
+end
+
+// 开始日期大于启用日期
+rule "calcu_guideboard_index_startrq_gt_qyrq"
+    when
+        $calcu_days_result : Calcu_days_result(
+            qyrq_days > 0,
+            $ruleId: ruleId, $qyrq_days: qyrq_days,
+            $calcu_start_date: calcu_start_date
+        )
+        $scheduleRule_input : ScheduleRule_input(
+            ruleId == $ruleId,
+            $qyrq: qyrq,
+            $rangesize : guideboardIds.size(),
+            $oindex : startGbdIndex,
+            $weekdays: weekdays
+        )
+    then
+        // 开始时间
+        DateTime initDate = $qyrq;
+        int index = $oindex;
+        int resultIndex = index;
+
+        while (!initDate.isAfter($calcu_start_date)) {
+            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
+                resultIndex = index;
+                index = (index + 1) % $rangesize;
+            }
+            initDate = initDate.plusDays(1);
+        }
+
+        Calcu_guideboard_index_result cgir = new Calcu_guideboard_index_result();
+        cgir.setRuleId($ruleId);
+        cgir.setCalcu_index(resultIndex);
+
+        log.info("calcu_guideboard_index_startrq_gt_qyrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
+
+        insert(cgir);
+end
+
+//----------------------- 人员范围循环计算 ------------------------//
+
+declare Calcu_employee_index_result
+    ruleId : String // 规则Id
+    calcu_index : Integer // 计算之后的起始索引
+end
+
+// 启用日期等于开始日期
+rule "calcu_employee_index_qyrq_eq_startrq"
+    when
+        $calcu_days_result : Calcu_days_result(
+            qyrq_days == 0,
+            $ruleId: ruleId)
+        $scheduleRule_input : ScheduleRule_input(
+            ruleId == $ruleId,
+            $oindex : startEIndex)
+    then
+        Calcu_employee_index_result cgir = new Calcu_employee_index_result();
+        cgir.setRuleId($ruleId);
+        cgir.setCalcu_index($oindex);
+
+        log.info("calcu_employee_index_qyrq_eq_startrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
+
+        insert(cgir);
+end
+
+// 开始日期大于启用日期
+rule "calcu_employee_index_startrq_gt_qyrq"
+    when
+        $calcu_days_result : Calcu_days_result(
+            qyrq_days > 0,
+            $ruleId: ruleId, $qyrq_days: qyrq_days,
+            $calcu_start_date: calcu_start_date
+        )
+        $scheduleRule_input : ScheduleRule_input(
+            ruleId == $ruleId,
+            $qyrq: qyrq,
+            $rangesize : employeeConfigIds.size(),
+            $oindex : startEIndex,
+            $weekdays: weekdays
+        )
+    then
+        // 开始时间
+        DateTime initDate = $qyrq;
+        int index = $oindex;
+        int resultIndex = index;
+
+        while (!initDate.isAfter($calcu_start_date)) {
+            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
+                resultIndex = index;
+                index = (index + 1) % $rangesize;
+            }
+            initDate = initDate.plusDays(1);
+        }
+
+        Calcu_employee_index_result cgir = new Calcu_employee_index_result();
+        cgir.setRuleId($ruleId);
+        cgir.setCalcu_index(resultIndex);
+
+        log.info("calcu_employee_index_startrq_gt_qyrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
+
+        insert(cgir);
+
+end
+
+//------------------------- 第三阶段、循环计算 ------------------------//
+
+//----------------------- 路牌范围循环计算 ------------------------//
+declare loop_guideboard_result
+    ruleId : String // 规则id
+    go_list : List // 路牌循环的列表
+end
+
+// 循环路牌计算
+rule "Calcu_loop_guideboard_result"
+    when
+        Calcu_days_result(
+            $ruleId: ruleId,
+            $startDate : calcu_start_date,
+            $calcu_end_date: calcu_end_date
+        )
+        $ruleData : ScheduleRule_input(
+            ruleId == $ruleId,
+            $rangesize : guideboardIds.size(),
+            $weekdays: weekdays
+        )
+        $indexData : Calcu_guideboard_index_result(
+            ruleId == $ruleId
+        )
+    then
+        DateTime initDate = $startDate; // 开始时间
+        DateTime endDate = $calcu_end_date; // 结束实际
+        List<ScheduleResult_output> scheduleResult_outputs =
+            new ArrayList<ScheduleResult_output>();
+
+        int i = $indexData.getCalcu_index();
+        if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue() == false) {
+            i = (i + 1) % $rangesize;
+        }
+
+        while (!initDate.isAfter(endDate)) {
+            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
+                ScheduleResult_output ro = new ScheduleResult_output();
+                ro.setRuleId($ruleId);
+                ro.setSd(initDate);
+                ro.setGuideboardId($ruleData.getGuideboardIds().get(i));
+                ro.setCarConfigId($ruleData.getCarConfigId());
+                scheduleResult_outputs.add(ro);
+
+                i = (i + 1) % $rangesize;
+            }
+
+            initDate = initDate.plusDays(1);
+        }
+
+        loop_guideboard_result clgr = new loop_guideboard_result();
+        clgr.setRuleId($ruleId);
+        clgr.setGo_list(scheduleResult_outputs);
+
+        log.info(String.valueOf(scheduleResult_outputs.size()));
+
+        insert(clgr);
+
+end
+
+//----------------------- 人员范围循环计算 ------------------------//
+declare loop_employee_result
+    ruleId : String // 规则id
+    eo_list : List // 人员循环的列表
+end
+
+// 循环人员计算
+rule "Calcu_loop_employee_result"
+    when
+        Calcu_days_result(
+            $ruleId: ruleId,
+            $startDate : calcu_start_date,
+            $calcu_end_date: calcu_end_date
+        )
+        $ruleData : ScheduleRule_input(
+            ruleId == $ruleId,
+            $rangesize : employeeConfigIds.size(),
+            $weekdays: weekdays
+        )
+        $indexData : Calcu_employee_index_result(
+            ruleId == $ruleId
+        )
+    then
+        DateTime initDate = $startDate; // 开始时间
+        DateTime endDate = $calcu_end_date; // 结束实际
+        List<ScheduleResult_output> scheduleResult_outputs =
+            new ArrayList<ScheduleResult_output>();
+
+        int i = $indexData.getCalcu_index();
+        if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue() == false) {
+            i = (i + 1) % $rangesize;
+        }
+
+        while (!initDate.isAfter(endDate)) {
+            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
+                ScheduleResult_output ro = new ScheduleResult_output();
+                ro.setRuleId($ruleId);
+                ro.setSd(initDate);
+                ro.setEmployeeConfigId($ruleData.getEmployeeConfigIds().get(i));
+                ro.setCarConfigId($ruleData.getCarConfigId());
+                scheduleResult_outputs.add(ro);
+
+                i = (i + 1) % $rangesize;
+            }
+
+            initDate = initDate.plusDays(1);
+        }
+
+        loop_employee_result clgr = new loop_employee_result();
+        clgr.setRuleId($ruleId);
+        clgr.setEo_list(scheduleResult_outputs);
+
+        log.info(String.valueOf(scheduleResult_outputs.size()));
+
+        insert(clgr);
+end
+
+//------------------------- 第四阶段、范围组循环计算 ----------------------------//
+
+global ScheduleResults_output scheduleResult;
+
+rule "output"
+    when
+        loop_guideboard_result(
+            go_list.size() > 0,
+            $ruleId : ruleId, $go_list : go_list
+        )
+        loop_employee_result(
+            ruleId == $ruleId,
+            eo_list.size() == $go_list.size(),
+            $eo_list : eo_list
+        )
+    then
+        for (int i = 0; i < $go_list.size(); i++) {
+            ScheduleResult_output go = (ScheduleResult_output) $go_list.get(i);
+            ScheduleResult_output eo = (ScheduleResult_output) $eo_list.get(i);
+            go.setEmployeeConfigId(eo.getEmployeeConfigId());
+            scheduleResult.getResults().add(go);
+        }
+
+end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -37,7 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="month" value="按月查询"/>
+<!--                         <input class="btn btn-default" type="button" id="month" value="按月查询"/> -->
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>
@@ -345,7 +345,7 @@
 		});
 		//按月查询
-		$("#month").on('click',function(){
+		/* $("#month").on('click',function(){
 			line = $("#line").val();
 			xlName = $("#select2-line-container").html();
 			date = $("#date").val();
@@ -363,7 +363,7 @@
 			$('#forms .scheduleDaily_2').html("");
 			$('#forms .scheduleDaily_3').html("");
-		});
+		}); */
 		$("#export").on("click",function(){
 			var params = {};
@@ -32,9 +32,13 @@
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     </div>
                     <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">时间: </span>
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 180px;"/>
                     </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="date2" style="width: 180px;"/>
+                    </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
@@ -124,6 +128,22 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		
+		$("#date2").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#date").val(year + "-" + month + "-" + day);
+		
+		$("#date2").val(year + "-" + month + "-" + day);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -139,24 +159,31 @@
 		var line ="";
 		var xlName ="";
 		var date = "";
+		var date2 ="";
 		$("#query").on("click",function(){
 			line = $("#line").val();
 			xlName = $("#select2-line-container").html();
 			date = $("#date").val();
+			date2 =$("#date2").val();
 			if(line=="请选择"){
 				line="";
 			}
-			$get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
-				// 把数据填充到模版中
-				var tbodyHtml = template('statisticsDaily',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms .statisticsDaily').html(tbodyHtml);
-				
-				if(result.length == 0)
-					$("#export").attr('disabled',"true");
-				else
-					$("#export").removeAttr("disabled");
-			});
+			if(date==null || date =="" ||date2==null || date2 ==""){
+				 layer.msg('请选择时间段.');
+			}else{
+				$get('/realSchedule/statisticsDailyTj',{line:line,date:date,date2:date2,xlName:xlName,type:"query"},function(result){
+					// 把数据填充到模版中
+					var tbodyHtml = template('statisticsDaily',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms .statisticsDaily').html(tbodyHtml);
+					
+					if(result.length == 0)
+						$("#export").attr('disabled',"true");
+					else
+						$("#export").removeAttr("disabled");
+				});
+			}
+			
 		});
 		$("#export").on("click",function(){
@@ -238,13 +238,13 @@
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_1').html(ludan_1);
 			});
-			$post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			$get('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 			    getTime(result);
 				var ludan_2 = template('ludan_2',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_2').html(ludan_2);
 			});
-			$post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			$get('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 			    var ludan_3 = template('ludan_3',result);
 			    $('#forms .ludan_3').html(ludan_3);
 			});
@@ -254,7 +254,7 @@
 			if(params.length < 1){
 				return;
 			}
-			$post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			$get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 				window.open("/downloadFile/download?fileName="+date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单");
 			});
 		});
@@ -181,13 +181,13 @@
 				$('#forms .ludan_1').html(ludan_1);
 				//$('#forms .ludan_4').html(ludan_4);
 			});
-			$post('/realSchedule/queryListWaybillQp',{clZbh:params[0],date:date,line:line},function(result){
+			$get('/realSchedule/queryListWaybillQp',{clZbh:params[0],date:date,line:line},function(result){
 			    getTime(result);
 				var ludan_2 = template('ludan_2',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_2').html(ludan_2);
 			});
-			$post('/realSchedule/findKMBCQp',{clZbh:params[0],date:date,line:line},function(result){
+			$get('/realSchedule/findKMBCQp',{clZbh:params[0],date:date,line:line},function(result){
 				console.log(result);
 			    var ludan_3 = template('ludan_3',{map:result});
 			    $('#forms .ludan_3').html(ludan_3);
@@ -199,7 +199,7 @@
 			if(params.length < 1){
 				return;
 			}
-			$post('/realSchedule/exportWaybillQp',{clZbh:params[0],date:date,line:line},function(result){
+			$get('/realSchedule/exportWaybillQp',{clZbh:params[0],date:date,line:line},function(result){
 				var fileName=date+"-"+params[0]+"-行车路单"
 				window.open("/downloadFile/download?fileName="+fileName);
 // 				window.open("/downloadFile/download?fileName="+encodeURIComponent(encodeURIComponent(fileName)));
@@ -20,7 +20,7 @@
 						class="caption-subject font-dark sbold uppercase">加油人员不符</span>
 				</div>
 				<div class="actions">
-					<a class="btn btn-circle blue" href="cylAdd.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
+<!-- 					<a class="btn btn-circle blue" href="cylAdd.html" data-pjax><i class="fa fa-plus"></i> 添加</a> -->
 					<button type="button" class="btn btn-circle blue"  id="saveButton"><i class="fa fa-minus-square"></i> 保存</button>
 					<!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> 删除用户</button> -->
 					<!-- <div class="btn-group">
@@ -21,7 +21,7 @@
                 </div>
                 <div class="actions">
                     <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
-                    <!-- 					<button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button> -->
+                    <button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button>
                     <button type="button" class="btn btn-circle blue" id="sortButton"><i class="fa fa-minus-square"></i>
                         拆分/保存
                     </button>
@@ -58,56 +58,99 @@
                             id="datatable_ylb">
                         <thead>
                         <tr role="row" class="filter">
-                        <td> 公司:</td>
-                            <td colspan="2">
-                              		
-                         <select class="form-control" name="ssgsdm_like" id="ylbListGsdmId" ></select>
-                               
-                            </td>
-                            <td>
-                            	分公司:
-                            </td>
-                            <td colspan="2">
-                               		
-                         <select class="form-control" name="fgsdm_like" id="ylbListFgsdmId" ></select>
-                            </td>
-                       
-                            <td>
-                                	日期:
-                            </td>
-                            <td>
-                                <input type="text" style="width: 80px" name="rq" id="rq"/>
-                            </td>
-                            <td >
-                               	 线路:
-                            </td>
-                            <td colspan="2">
-                                <select class="form-control" name="xlbm_like" id="xlbm" style="width: 120px;"></select>
-                            </td>
-                            <td >
-                              	  内部编码:
-                            </td>
-                            <td colspan="4">
-                            		<div  style="float:left;">
-                                <select class="form-control" name="nbbm_eq" id="nbbm" style="width: 120px;"></select>
-                           			</div>
-                           			<div  style="float:left;">
-                           			<button class="btn btn-sm #000 btn-outline filter-cancel" style="margin-right:0px">
-                           			<i class="fa fa-times"></i>
-                           			</button>
-                           			</div>
-                            </td>
-                            <td colspan="1">
-                                <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">
-                                    <i class="fa fa-search"></i> 搜索
-                                </button>
+                        		<td colspan="2">
+                        			<div style="float: right; " >&nbsp;公司&nbsp;</div>
+								</td>
+								<td colspan="3">
+									<div style="float: left;width: 150px">
+										<select class="form-control" name="ssgsdm_like"
+											id="ylbListGsdmId"></select>
+									</div>
+								</td>
+								<td colspan="2">
+									<div style="float: right; " >&nbsp;分公司&nbsp;</div>
+								</td>
+								<td colspan="4">
+									<div style="float: left;">
+										<select class="form-control" name="fgsdm_like"
+											id="ylbListFgsdmId" style="width: 150px"></select>
+									</div>
+								</td>
+								<td >
+									<div style="float: right; ">日期</div>
+								</td>
+								<td colspan="3">
+									<div style="float: left;">
+										<input type="text" style="width: 120px" name="rq" id="rq" />
+									</div>
+                        		</td>
+                        		<td rowspan="2" colspan="2">
+                        			<div style="float: left;">
+									&nbsp;<button
+										class="btn btn-sm green btn-outline filter-submit margin-bottom"
+										style="margin-right: 0px">
+										<i class="fa fa-search"></i> 搜索
+									</button> <!--                                 <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px"> -->
+									<!--                                     <i class="fa fa-times"></i> 重置 -->
+									<!--                                 </button> -->
-<!--                                 <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px"> -->
-<!--                                     <i class="fa fa-times"></i> 重置 -->
-<!--                                 </button> -->
-
-                            </td>
+								</div>
+                        		</td>
                         </tr>
+                        <tr class="filter2">
+									<td colspan="2">
+									<div style="float: right; ">&nbsp;线路</div>
+									</td>
+									<td colspan="3">
+									<div style="float: left;">
+										<select class="form-control" name="xlbm_like" id="xlbm"
+											style="width: 150px;"></select>
+									</div>
+									</td>
+									<td colspan="2">
+									<div style="float: right;">&nbsp;内部编码</div>
+									</td>
+									<td colspan="4">
+									<div style="float: left;">
+										<select class="form-control" name="nbbm_eq" id="nbbm"
+											style="width: 120px;"></select>
+									</div>
+									<div style="float: left;">
+										<button class="btn btn-sm #000 btn-outline filter-cancel"
+											style="margin-right: 0px">
+											<i class="fa fa-times"></i>
+										</button>
+									</div>
+									</td>
+									<td >
+									<div style="float: right;">
+									类型
+									</div>
+									</td>
+									<td colspan="3">
+									<div style="float: left;">
+										<select class="form-control" name="sxtj">
+												<option value="0">全部</option>
+												<option value="1">一车一单</option>
+												<option value="2">一车多单</option>
+										   </select>
+									</div>
+								
+									</td>
+							</tr>
+							<tr>
+								<td colspan="17">
+								<div style="float: left;">
+									总计 
+									&nbsp;&nbsp;
+									加注量:&nbsp;<label id="sumJzl"></label>
+									&nbsp;&nbsp;
+									耗油量:&nbsp;<label id="sumYh"></label>
+									&nbsp;&nbsp;
+									损耗量:&nbsp;<label id="sumSh"></label>
+								</div>	
+								</td>
+							</tr>
                         <tr role="row" class="heading">
                             <th width="2%">#</th>
                             <th width="8%">日期</th>
@@ -226,18 +269,7 @@
         $("#checkYl").on('click', function () {
             console.log("核对加注量");
             if ($("#rq").val() != "") {
-                var cells = $('tr.filter')[0].cells
-                        , params = {}
-                        , name;
-                $.each(cells, function (i, cell) {
-                    var items = $('input,select', cell);
-                    for (var j = 0, item; item = items[j++];) {
-                        name = $(item).attr('name');
-                        if (name) {
-                            params[name] = $(item).val();
-                        }
-                    }
-                });
+                var params=getParamsList();
                 var i = layer.load(2);
                 $get('/ylb/checkYl', params, function () {
                 	layer.close(i);
@@ -252,18 +284,7 @@
         $("#outAndIn").on('click', function () {
             console.log("进场油量等于出场油量");
             if ($("#rq").val() != "") {
-                var cells = $('tr.filter')[0].cells
-                        , params = {}
-                        , name;
-                $.each(cells, function (i, cell) {
-                    var items = $('input,select', cell);
-                    for (var j = 0, item; item = items[j++];) {
-                        name = $(item).attr('name');
-                        if (name) {
-                            params[name] = $(item).val();
-                        }
-                    }
-                });
+                var params=getParamsList();
                 var i = layer.load(2);
                 $get('/ylb/outAndIn', params, function () {
                 	layer.close(i);
@@ -272,7 +293,8 @@
             } else {
                 layer.msg('请选择日期.');
             }
-        })
+        });
+     
         //拆分
         $("#sortButton").on('click', function () {
             if ($("#rq").val() != "") {
@@ -294,18 +316,7 @@
                      var i = layer.load(2);
                     $get('/ylb/sort', params, function () {
                     	layer.close(i);
-                    	var cells = $('tr.filter')[0].cells
-                        , params1 = {}
-                        , name;
-		                $.each(cells, function (i, cell) {
-		                    var items = $('input,select', cell);
-		                    for (var j = 0, item; item = items[j++];) {
-		                        name = $(item).attr('name');
-		                        if (name) {
-		                            params1[name] = $(item).val();
-		                        }
-		                    }
-		                });
+                    	var params1 =getParamsList();
                         jsDoQuery(params1, true);
                     }); 
@@ -318,18 +329,8 @@
         $("#obtain").on('click', function () {
             console.log("获取加存");
             if ($("#rq").val() != "") {
-                var cells = $('tr.filter')[0].cells
-                        , params = {}
-                        , name;
-                $.each(cells, function (i, cell) {
-                    var items = $('input,select', cell);
-                    for (var j = 0, item; item = items[j++];) {
-                        name = $(item).attr('name');
-                        if (name) {
-                            params[name] = $(item).val();
-                        }
-                    }
-                });
+                var params =getParamsList();
+                
                 var i = layer.load(2);
                 $get('/ylb/obtain', params, function () {
                 	layer.close(i);
@@ -352,8 +353,8 @@
         }
         //重置
-        $('tr.filter .filter-cancel').on('click', function () {
-            $('tr.filter , #nbbm').val('').change();
+        $('tr.filter2 .filter-cancel').on('click', function () {
+            $('tr.filter2 , #nbbm').val('').change();
         });
         //提交
@@ -365,23 +366,39 @@
             }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
             	 layer.msg('请选择公司和分公司.');
             }else {
-                var cells = $('tr.filter')[0].cells
-                        , params = {}
-                        , name;
-                $.each(cells, function (i, cell) {
-                    var items = $('input,select', cell);
-                    for (var j = 0, item; item = items[j++];) {
-                        name = $(item).attr('name');
-                        if (name) {
-                            params[name] = $(item).val();
-                        }
-                    }
-                });
+            	 var params = getParamsList();
+                 
+           	
                 page = 0;
                 jsDoQuery(params, true);
             } 
         });
+        function getParamsList(){
+        	  var cells = $('tr.filter')[0].cells
+              , cells1 = $('tr.filter2')[0].cells,params = {}
+              , name;
+        	 $.each(cells, function (i, cell) {
+                 var items = $('input,select', cell);
+                 for (var j = 0, item; item = items[j++];) {
+                     name = $(item).attr('name');
+                     if (name) {
+                         params[name] = $(item).val();
+                     }
+                 }
+             });
+             $.each(cells1, function (i, cell) {
+                 var items = $('input,select', cell);
+                 for (var j = 0, item; item = items[j++];) {
+                     name = $(item).attr('name');
+                     if (name) {
+                         params[name] = $(item).val();
+                     }
+                 }
+             });
+        	
+             return params;
+        }
 //         var gsqxdm="";
@@ -454,13 +471,15 @@
     				params['fgsdm_in']=fgsqx1;
     			}
     		} */
+    		
             var l = layer.load(2);
             $get('/ylb', params, function (data) {
+            
                 $.each(data.content, function (i, obj) {
                     obj.rq = moment(obj.rq).format("YYYY-MM-DD");
                 });
                 var bodyHtm = template('ylb_list_temp', {list: data.content});
-
+				
                 $('#datatable_ylb tbody').html(bodyHtm)
                         .find('.icheck').iCheck(icheckOptions)
                         .on('ifChanged', iCheckChange);
@@ -470,7 +489,13 @@
                     showPagination(data);
                 }
                 layer.close(l);
-
+            	$get('/ylb/sumYlb',params,function(returns){
+            		console.log(returns);
+            		console.log(returns.jzl);
+            		$("#sumJzl").html(returns.jzl);
+            		$("#sumYh").html(returns.yh);
+            		$("#sumSh").html(returns.sh);
+        		});
                 startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
                 startOptShylLink($('#ll_oil_list .in_carpark_shyl'));
             });
@@ -549,18 +574,7 @@
                         return;
                     }
-                    var cells = $('tr.filter')[0].cells
-                            , params = {}
-                            , name;
-                    $.each(cells, function (i, cell) {
-                        var items = $('input,select', cell);
-                        for (var j = 0, item; item = items[j++];) {
-                            name = $(item).attr('name');
-                            if (name) {
-                                params[name] = $(item).val();
-                            }
-                        }
-                    });
+                    var params=getParamsList();
                     page = num - 1;
                     jsDoQuery(params, true);
                 }
@@ -570,13 +584,15 @@
         //删除
         $('#removeButton').on('click', function () {
-            if ($(this).attr('disabled'))
-                return;
-
-            var id = $('input.icheck:checked').data('id');
-            removeConfirm('确定要删除选中的数据？', '/resource/' + id, function () {
-                $('tr.filter .filter-submit').click();
-            });
+        	var id = $('input.icheck:checked').data('id');
+	       	 if (typeof(id) == 'undefined') {
+	       		 layer.msg("请选择要删除的数据");
+	       	 }else{
+	            removeConfirm('确定要删除选中的数据？', '/ylb/' + id, function () {
+	            	  var params=getParamsList();
+	            	  jsDoQuery(params, true);
+	            });
+	       	 }
         });
         //搜索线路
@@ -636,18 +652,7 @@
         $("#export").on("click", function () {
             if ($("#rq").val() != "") {
-                var cells = $('tr.filter')[0].cells
-                        , params = {}
-                        , name;
-                $.each(cells, function (i, cell) {
-                    var items = $('input,select', cell);
-                    for (var j = 0, item; item = items[j++];) {
-                        name = $(item).attr('name');
-                        if (name) {
-                            params[name] = $(item).val();
-                        }
-                    }
-                });
+				 var params=getParamsList();
                 $post('/ylb/listExport', params, function (result) {
                     window.open("/downloadFile/download?fileName=进出场存油量" + moment($("#rq").val()).format("YYYYMMDD"));
                 });
@@ -239,7 +239,7 @@
 }
 .schedule-body .ct_table dl:nth-child(even){
-    background: rgba(249, 249, 249, 0.31);
+    background: rgba(101, 204, 220, 0.13);
 }
 span.fcsj-diff {
@@ -532,7 +532,7 @@ div.drop-rail[data-type=&quot;car&quot;]:before {
 }
 dl.relevance-active dd:nth-child(n+2) {
-    background: #c1e2f9 !important;
+    background: #d2d2d2 !important;
 }
 dl.relevance-active.intimity dd:nth-child(n+2) {
@@ -863,4 +863,40 @@ svg rect.offline{
     color: white;
     box-shadow: 0px 4px 6px 0 rgba(0, 0, 0, 0.2), 0px 4px 10px 0 rgba(0, 0, 0, 0.19);
     border-radius: 1px 1px 4px 4px;
+}
+
+#oil_station-modal.ct-form-modal form.uk-form-horizontal .uk-form-label{
+    width: 120px;
+}
+
+#oil_station-modal.ct-form-modal form.uk-form-horizontal .uk-form-controls{
+    margin-left: 125px;
+}
+
+#oil_station-modal .uk-form-icon>[class*=uk-icon-]{
+    right: 23px;
+}
+
+#oil_station-modal .uk-form-icon:not(.uk-form-icon-flip)>input{
+    padding-left: 10px !important;
+}
+
+#oil_station-modal .uk-form-icon{
+    width: calc(100% - 145px);
+}
+
+#oil_station-modal .uk-icon-mile:before{
+    content: '公里';
+}
+
+#oil_station-modal .uk-icon-minute:before{
+    content: '分钟';
+}
+
+option.oil_station_opt{
+    color: red;
+}
+
+#oil_station-modal .uk-modal .uk-form.fv-form{
+    margin-bottom: 0 !important;
 }
 \ No newline at end of file
@@ -141,7 +141,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >里程</label>
                     <div class="uk-form-controls">
-                        <input type="text"  value="{{if sch.status==-1}}0{{else}}{{sch.jhlc}}{{/if}}" name="jhlc" >
+                        <input type="text"  value="{{if sch.status==-1}}0{{else}}{{sch.jhlc}}{{/if}}" name="jhlc" required>
                     </div>
                 </div>
             </div>
@@ -197,7 +197,7 @@
                     }
                     //里程有修改
-                    if(data.jhlc != sch.jhlc){
+                    if(data.jhlc != sch.jhlc && data.jhlc != 0){
                         var confHtml = '<h4 style="color: #c04c4c;margin-bottom: 9px;">确认要将班次里程由'+sch.jhlc+' 修改为'+data.jhlc+' </h4><small>备注：</small>';
                         UIkit.modal.prompt(confHtml, data.remarks, function(remarks){
                             if(remarks){
@@ -267,7 +267,7 @@
                     }
                 });
                 //公里与主任务不符合
-                if (sum != sch.jhlc) {
+                if (sum != sch.jhlcOrig) {
                     if (i > 1)
                         calcs += ('=' + sum);
                     calcs += (' ≠ ' + sch.jhlc);
@@ -320,6 +320,11 @@
                 var sch = getActiveSch();
                 if (!sch)
                     return notify_err('无法获取到主任务信息！');
+
+                if(sch.bcType == 'out' || sch.bcType == 'in'){
+                    notify_err('暂不能在进出场班次上做回场子任务！');
+                    return;
+                }
                 open_modal(folder + '/sub_task/add_sub_task_inpark.html', {
                     sch: sch
                 }, modal_opts);
@@ -330,6 +335,10 @@
                 var sch = getActiveSch();
                 if (!sch)
                     return notify_err('无法获取到主任务信息！');
+                if(sch.bcType == 'out' || sch.bcType == 'in'){
+                    notify_err('暂不能在进出场班次上做出场子任务！');
+                    return;
+                }
                 open_modal(folder + '/sub_task/add_sub_task_outpark.html', {
                     sch: sch
                 }, modal_opts);
@@ -369,6 +378,20 @@
                     });
                 }, '确定删除');
             };
+            //加油
+            var add_oil = function () {
+                var sch = getActiveSch();
+                if (!sch)
+                    return notify_err('无法获取到主任务信息！');
+
+                if(sch.bcType == 'out' || sch.bcType == 'in'){
+                    notify_err('暂不能在进出场班次上做加油子任务！');
+                    return;
+                }
+                open_modal(folder + '/sub_task/add_sub_task_oil.html', {
+                    sch: sch
+                }, modal_opts);
+            };
             var callbackHandler = {
                 add_temp_sch: add_temp_sch,
@@ -377,7 +400,8 @@
                 add_sub_task_in: add_sub_task_in,
                 remove_sub_task: remove_sub_task,
                 add_sub_task_out: add_sub_task_out,
-                add_sub_task_range_turn: add_sub_task_range_turn
+                add_sub_task_range_turn: add_sub_task_range_turn,
+                add_oil: add_oil
             };
             //右键菜单
@@ -394,6 +418,9 @@
                     "add_sub_task": {
                         name: "添加子任务",
                         items: {
+                            'add_oil':{
+                                name: '加油'
+                            },
                             'add_sub_task_in': {
                                 name: '回场'
                             },
@@ -52,7 +52,7 @@
                                 </div>
                             </div>
                             <div class="uk-width-7-10 pl5">
-                                <input type="text" name="mileage" required>
+                                <input type="number" step="0.01" name="mileage" required>
                             </div>
                         </div>
                         <div class="uk-grid">
@@ -125,7 +125,7 @@
                                 </div>
                             </div>
                             <div class="uk-width-7-10 pl5">
-                                <input type="text" name="mileage" required style="width: calc(100% - 62px);">
+                                <input type="number" step="0.01" name="mileage" required style="width: calc(100% - 62px);">
                                 <a style="font-size: 12px;color: grey;cursor: default;" data-uk-tooltip title="可选择回场路径，设置途径点位。暂不开放" id="inpark_paths_link">路径（<span>0</span>）</a>
                             </div>
                         </div>
@@ -190,7 +190,7 @@
                                 </div>
                             </div>
                             <div class="uk-width-7-10 pl5">
-                                <input type="text" name="mileage" required>
+                                <input type="number" step="0.01" name="mileage" required>
                             </div>
                         </div>
                         <div class="uk-grid">
+<div class="uk-modal ct-form-modal" id="schedule-addsch_oil-modal">
+    <div class="uk-modal-dialog" style="width: 1201px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>加油</h2></div>
+
+        <div class="uk-grid">
+            <div class="uk-width-1-3">
+                <form class="uk-form uk-form-horizontal ">
+                    <input type="hidden" name="type1" value="正常">
+                    <input type="hidden" name="type2" value="1">
+                    <input type="hidden" name="mileageType" value="service">
+
+                    <div class="uk-panel uk-panel-box uk-panel-box-primary">
+                        <div class="uk-panel-badge uk-badge ">营运</div>
+                        <h3 class="uk-panel-title">线路上站点间</h3>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">起点站</label>
+                            <div class="uk-form-controls">
+                                <input type="hidden" name="startStation">
+                                <input type="text" name="startStationName" disabled>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">终点站</label>
+                            <div class="uk-form-controls">
+                                <input type="hidden" name="endStation">
+                                <input type="text" name="endStationName" disabled>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">里程</label>
+                            <div class="uk-form-controls">
+                                <input type="number" step="0.01" name="mileage" max=222
+                                       data-fv-lessthan-inclusive="false"
+                                       disabled>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">开始时间</label>
+                            <div class="uk-form-controls">
+                                <input type="time" name="startDate" required>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">结束时间</label>
+                            <div class="uk-form-controls">
+                                <input type="time" name="endDate" required>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+
+            <div class="uk-width-1-3">
+                <form class="uk-form uk-form-horizontal">
+                    <input type="hidden" name="type1" value="临加">
+                    <input type="hidden" name="type2" value="2">
+                    <input type="hidden" name="mileageType" value="empty">
+
+                    <div class="uk-panel uk-panel-box uk-panel-box-secondary">
+                        <div class="uk-panel-badge uk-badge uk-badge-default">空驶</div>
+                        <h3 class="uk-panel-title">进场</h3>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">起点站</label>
+                            <div class="uk-form-controls">
+                                <select name="startStation" required>
+                                </select>
+                                <input type="hidden" name="startStationName" disabled>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">终点站</label>
+                            <div class="uk-form-controls">
+                                <select name="endStation" required>
+                                </select>
+                                <input type="hidden" name="endStationName" disabled>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">里程</label>
+                            <div class="uk-form-controls">
+                                <input type="number" step="0.01" name="mileage" max=222
+                                       data-fv-lessthan-inclusive="false"
+                                       required>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">开始时间</label>
+                            <div class="uk-form-controls">
+                                <input type="time" name="startDate" required>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">结束时间</label>
+                            <div class="uk-form-controls">
+                                <input type="time" name="endDate" required>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+
+            <div class="uk-width-1-3">
+                <form class="uk-form uk-form-horizontal">
+                    <input type="hidden" name="type1" value="临加">
+                    <input type="hidden" name="type2" value="3">
+                    <input type="hidden" name="mileageType" value="empty">
+
+                    <div class="uk-panel uk-panel-box uk-panel-box-secondary">
+                        <div class="uk-panel-badge uk-badge uk-badge-default">空驶</div>
+                        <h3 class="uk-panel-title">出场</h3>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">起点站</label>
+                            <div class="uk-form-controls">
+                                <select name="startStation" required>
+                                </select>
+                                <input type="hidden" name="startStationName" disabled>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">终点站</label>
+                            <div class="uk-form-controls">
+                                <select name="endStation" required>
+                                </select>
+                                <input type="hidden" name="endStationName" disabled>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">里程</label>
+                            <div class="uk-form-controls">
+                                <input type="number" step="0.01" name="mileage" max=222
+                                       data-fv-lessthan-inclusive="false"
+                                       required>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">开始时间</label>
+                            <div class="uk-form-controls">
+                                <input type="time" name="startDate" required>
+                            </div>
+                        </div>
+                        <div class="uk-form-row">
+                            <label class="uk-form-label">结束时间</label>
+                            <div class="uk-form-controls">
+                                <input type="time" name="endDate" required>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+        <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+            <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
+            <button type="button" class="uk-button uk-modal-close">取消</button>
+            <button type="submit" id="submitChildTaskBtn" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+        </div>
+    </div>
+
+    <script id="schedule-addsch_oil-form-temp" type="text/html">
+
+    </script>
+
+    <script>
+        (function () {
+            var modal = '#schedule-addsch_oil-modal',
+                    sch, stationRoutes, parks, oilStation;
+            var yyForm = $('form', modal)[0];
+            var jcForm = $('form', modal)[1];
+            var ccForm = $('form', modal)[2];
+            var oilId;
+            var lineInfo;
+
+            var folder = '/real_control_v2/fragments/line_schedule/context_menu';
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+                sch = data.sch;
+                oilId = sch.xlBm + '_oil_station';
+                lineInfo = gb_data_basic.codeToLine[sch.xlBm];
+
+                //站点路由
+                stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(sch.xlBm).sort(function (a, b) {
+                    return a.stationRouteCode - b.stationRouteCode;
+                }), 'directions');
+
+                setDefaultVal();
+                //停车场
+                $.get('/basic/parks', function (rs) {
+                    parks = rs;
+                    var opts = '';
+                    for (var code in parks) {
+                        opts += '<option value="' + code + '">' + parks[code] + '</option>';
+                    }
+                    $('[name=endStation]', jcForm).html(opts);
+                    $('[name=startStation]', ccForm).html(opts);
+                });
+
+                //切换空驶起终点
+                $('[name=endStation]', jcForm).on('change', reCalcIn);
+                $('[name=startStation]', jcForm).on('change', reCalcIn);
+
+                $('[name=endStation]', ccForm).on('change', reCalcOut);
+                $('[name=startStation]', ccForm).on('change', reCalcOut);
+                //修改开始时间
+                $('[name=startDate]', jcForm).on('change', reCalcIn);
+                $('[name=startDate]', ccForm).on('change', reCalcOut);
+
+                //绑定的社会加油站
+                $.get('/oilStation/'+sch.xlBm, function (rs) {
+                    var htmlStr;
+                    oilStation = rs;
+                    if(oilStation){
+                        htmlStr = '<a><i class="uk-icon-product-hunt"></i> '+oilStation.stationName+'</a>';
+
+                        var opt = '<option value="'+oilId+'" class="oil_station_opt">'+oilStation.stationName+'</option>';
+                        $('[name=endStation]', jcForm).prepend(opt).val(oilId).change();
+                        $('[name=startStation]', ccForm).prepend(opt).val(oilId).change();
+                    }
+                    else
+                        htmlStr = '<a>为'+sch.xlName+'绑定一个社会加油站</a>';
+
+                    $('.bind_gas_station_panel', modal).html(htmlStr);
+                    $('.bind_gas_station_panel a', modal).on('click', function () {
+                        open_modal(folder + '/sub_task//oil_station.html', {
+                            sch: sch
+                        }, {center: false, bgclose: false, modal: false});
+                    });
+                });
+            });
+
+            var dataArray = [];
+            var fs = $('form', modal).formValidation({
+                framework: 'uikit',
+                locale: 'zh_CN'
+            });
+            fs.on('success.form.fv', function(e) {
+                e.preventDefault();
+                if($(this).is(':hidden'))
+                    return;
+                dataArray.push($.extend($(this).serializeJSON(), getDisabledVal(this)
+                        , {remarks: '加油', 'schedule.id': sch.id}));
+                $(this).data('valid', true);
+
+                if(allValidSuccess()){
+                    var i = 0;
+                    (function () {
+                        var f = arguments.callee;
+                        if(i >= dataArray.length){
+                            UIkit.modal(modal).hide();
+                            $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
+                            return;
+                        }
+                        var data = dataArray[i];
+                        //里程为0的不保存
+                        if(data.mileage==0){
+                            i++;
+                            f();
+                        }
+                        else{
+                            gb_common.$post('/childTask', data, function (rs) {
+                                notify_succ('子任务添加成功');
+                                gb_schedule_table.updateSchedule(rs.t);
+                                i++;
+                                f();
+                            });
+                        }
+                    })();
+                }
+            });
+
+            //校验不过
+            fs.on('err.field.fv', function () {
+                $('#submitChildTaskBtn', modal).removeClass('disabled').removeAttr('disabled');
+            });
+
+            //submit
+            $('#submitChildTaskBtn', modal).on('click', function () {
+                //空驶的进场终点名称
+                if(!oilStation || $('[name=endStation]', jcForm).val() != oilId)
+                    $('[name=endStationName]', jcForm).val('');
+                else
+                    $('[name=endStationName]', jcForm).val(oilStation.stationName);
+
+                //空驶的出场起点名称
+                if(!oilStation || $('[name=startStation]', ccForm).val() != oilId)
+                    $('[name=startStationName]', ccForm).val('');
+                else
+                    $('[name=startStationName]', ccForm).val(oilStation.stationName);
+
+
+                //提交表单
+                $(this).addClass('disabled').attr('disabled','disabled');
+                dataArray = [];
+                fs.data('valid', false);
+                fs.formValidation('validate');
+                //fs.submit();
+            });
+
+            //获取表单disabled 项的值
+            function getDisabledVal(f) {
+                var rs = {};
+                $('input,select', f).each(function () {
+                    if($(this).attr('disabled')){
+                        rs[$(this).attr('name')]=$(this).val();
+                    }
+                });
+                return rs;
+            }
+
+            function allValidSuccess() {
+                var flag = true;
+                $('form:visible', modal).each(function (i, f) {
+                    if(!$(f).data('valid')){
+                        flag = false;
+                        return false;
+                    }
+                });
+                return flag;
+            }
+            
+            function setDefaultVal() {
+                //营运班次
+                $('[name=startStation]', yyForm).val(sch.qdzCode);
+                $('[name=startStationName]', yyForm).val(sch.qdzName);
+                $('[name=endStation]', yyForm).val(sch.zdzCode);
+                $('[name=endStationName]', yyForm).val(sch.zdzName);
+                $('[name=mileage]', yyForm).val(sch.jhlc);
+                $('[name=startDate]', yyForm).val(sch.fcsjActual==null?sch.dfsj:sch.fcsjActual);
+                $('[name=endDate]', yyForm).val(sch.zdsjActual==null?sch.zdsj:sch.zdsjActual);
+
+                //设置进场默认值
+                $('[name=startStation]', jcForm).html(createStationOpts(stationRoutes[sch.xlDir]));
+                $('[name=startDate]', jcForm).val(sch.zdsjActual==null?sch.zdsj:sch.zdsjActual);
+                $('[name=startStation]', jcForm).val(sch.zdzCode);
+
+                //设置出场默认值
+                $('[name=endStation]', ccForm).html(createStationOpts(stationRoutes[sch.xlDir]));
+                $('[name=endStation]', ccForm).val(sch.zdzCode);
+            }
+            
+            function createStationOpts(list) {
+                var opts = '';
+                $.each(list, function () {
+                    opts += '<option value="'+this.station.stationCod+'">'+this.stationName+'</option>';
+                });
+                return opts;
+            }
+            
+            function reCalcIn() {
+                if(!oilStation || $('[name=endStation]', jcForm).val() != oilId)
+                    return;
+
+                var data;
+                var qdz = $('[name=startStation]', jcForm).find("option:selected").text();
+                if(qdz == lineInfo.startStationName){
+                    //起点进场
+                    data = {
+                        mileage: oilStation.upInMile,
+                        time: oilStation.upInTime
+                    }
+                }
+                else if(qdz == lineInfo.endStationName){
+                    //终点进场
+                    data = {
+                        mileage: oilStation.downInMile,
+                        time: oilStation.downInTime
+                    }
+                }
+                if(!data)
+                    return;
+
+                $('[name=mileage]', jcForm).val(data.mileage);
+                var st = $('[name=startDate]', jcForm).val();
+                if(!st)
+                    return;
+                var ets = moment(st, 'HH:mm').add(data.time, 'minute').format('HH:mm');
+                $('[name=endDate]', jcForm).val(ets);
+
+                //出场时间 + 1 分钟
+                $('[name=startDate]', ccForm).val(moment(ets, 'HH:mm').add(1, 'minute').format('HH:mm'));
+            }
+
+            function reCalcOut() {
+                if(!oilStation || $('[name=startStation]', ccForm).val() != oilId)
+                    return;
+
+                var data;
+                var zdz = $('[name=endStation]', ccForm).find("option:selected").text();
+                if(zdz == lineInfo.startStationName){
+                    //出场到起点
+                    data = {
+                        mileage: oilStation.upOutMile,
+                        time: oilStation.upOutTime
+                    }
+                }
+                else if(zdz == lineInfo.endStationName){
+                    //出场到终点
+                    data = {
+                        mileage: oilStation.downOutMile,
+                        time: oilStation.downOutTime
+                    }
+                }
+                if(!data)
+                    return;
+
+                $('[name=mileage]', ccForm).val(data.mileage);
+                var st = $('[name=startDate]', ccForm).val();
+                if(!st)
+                    return;
+                var ets = moment(st, 'HH:mm').add(data.time, 'minute').format('HH:mm');
+                $('[name=endDate]', ccForm).val(ets);
+            }
+        })();
+    </script>
+</div>
@@ -52,7 +52,7 @@
                                 </div>
                             </div>
                             <div class="uk-width-7-10 pl5">
-                                <input type="text" name="mileage" required style="width: calc(100% - 62px);">
+                                <input type="number" step="0.01" name="mileage" required style="width: calc(100% - 62px);">
                                 <a style="font-size: 12px;color: grey;cursor: default;" target="_blank"
                                    class="linkToLineInfo">线路标准</a>
                             </div>
@@ -128,7 +128,7 @@
                                 </div>
                             </div>
                             <div class="uk-width-7-10 pl5">
-                                <input type="text" name="mileage" disabled>
+                                <input type="number" step="0.01" name="mileage" disabled>
                             </div>
                         </div>
                         <div class="uk-grid">
@@ -168,7 +168,7 @@
                 </div>
             </div>
             <div class="uk-width-7-10 pl5">
-                <input type="text" name="mileage" value="{{sch.jhlc}}" required>
+                <input type="number" step="0.01" name="mileage" value="{{sch.jhlc}}" required>
             </div>
         </div>
         <div class="uk-grid">
@@ -237,7 +237,7 @@
                 </div>
             </div>
             <div class="uk-width-7-10 pl5">
-                <input type="text" name="mileage" required>
+                <input type="number" step="0.01" name="mileage" required>
             </div>
         </div>
         <div class="uk-grid">
+<div class="uk-modal ct-form-modal" id="oil_station-modal">
+    <div class="uk-modal-dialog" style="width: 450px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>社会加油站</h2></div>
+
+        <form class="uk-form uk-form-horizontal " style="margin-bottom: 0 !important;">
+            <div class="uk-form-row">
+                <label class="uk-form-label">线路</label>
+                <div class="uk-form-icon">
+                    <input type="hidden" name="lineCode">
+                    <input type="text" name="qdzName" disabled>
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label">加油站名称</label>
+                <div class="uk-form-icon">
+                    <input type="text" name="stationName" value="社会加油站" required>
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label">起点进场里程</label>
+                <div class="uk-form-icon">
+                    <i class="uk-icon-mile"></i>
+                    <input type="number" name="upInMile" step="0.01" required>
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label">终点进场里程</label>
+                <div class="uk-form-icon">
+                    <i class="uk-icon-mile"></i>
+                    <input type="number" name="downInMile" step="0.01" required>
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label">起点进场时间</label>
+                <div class="uk-form-icon">
+                    <i class="uk-icon-minute"></i>
+                    <input type="text" name="upInTime" required>
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label">终点进场时间</label>
+                <div class="uk-form-icon">
+                    <i class="uk-icon-minute"></i>
+                    <input type="text" name="downInTime" required>
+                </div>
+            </div>
+
+            <hr>
+            <div class="uk-form-row">
+                <label class="uk-form-label">出场到起点里程</label>
+                <div class="uk-form-icon">
+                    <i class="uk-icon-mile"></i>
+                    <input type="number" name="upOutMile" step="0.01" required>
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label">出场到终点里程</label>
+                <div class="uk-form-icon">
+                    <i class="uk-icon-mile"></i>
+                    <input type="number" name="downOutMile" step="0.01" required>
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label">出场到起点时间</label>
+                <div class="uk-form-icon">
+                    <i class="uk-icon-minute"></i>
+                    <input type="text" name="upOutTime" required>
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label">出场到终点时间</label>
+                <div class="uk-form-icon">
+                    <i class="uk-icon-minute"></i>
+                    <input type="text" name="downOutTime" required>
+                </div>
+            </div>
+            <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+                <button type="button" class="uk-button uk-modal-close">取消</button>
+                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+            </div>
+        </form>
+    </div>
+
+    <script id="" type="text/html">
+
+    </script>
+
+    <script>
+        (function () {
+            var modal = '#oil_station-modal',
+                    sch, oilStation;
+
+            var cognates = {
+                'upInMile': 'upOutMile',
+                'downInMile': 'downOutMile',
+                'upInTime': 'upOutTime',
+                'downInTime': 'downOutTime'
+            };
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+                sch = data.sch;
+
+                $.get('/oilStation/'+sch.xlBm, function (rs) {
+                    oilStation = rs;
+                    setDefaultVal(oilStation);
+                });
+
+                $('form [name=qdzName]', modal).val(sch.xlName);
+                $('form [name=lineCode]', modal).val(sch.xlBm);
+
+                //submit
+                var f = $('form', modal).formValidation(gb_form_validation_opts);
+                f.on('success.form.fv', function(e) {
+                    e.preventDefault();
+                    var data = $(this).serializeJSON();
+
+                    gb_common.$post('/oilStation', data, function (rs) {
+                        notify_succ('添加成功！');
+                        UIkit.modal(modal).hide();
+                        $('#schedule-addsch_oil-modal').trigger('init', {sch: sch});
+                    });
+                });
+
+                $('form input', modal).on('input', function () {
+                    var name = $(this).attr('name');
+                    if(cognates[name]){
+                        $('form [name='+cognates[name]+']', modal).val($(this).val());
+                    }
+                });
+            });
+            
+            function setDefaultVal(obj) {
+                if(!obj)
+                    return;
+                $('form input', modal).each(function () {
+                    var name = $(this).attr('name');
+                    if(obj[name])
+                        $(this).val(obj[name]);
+                });
+            }
+        })();
+    </script>
+</div>
@@ -132,7 +132,7 @@ var gb_schedule_context_menu = (function () {
             }, modal_opts);
         },
         cxzx: function (sch) {
-            if (!sch.zdsjActual)
+            if (!sch.zdsjActual && !sch.fcsjActual)
                 return notify_err('车辆未执行，无法撤销执行！');
             var content = '<h3>确定要撤销<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>的实达时间?</h3>'
@@ -144,6 +144,41 @@ var gb_schedule_context_menu = (function () {
                     notify_succ('撤销执行成功！');
                 });
             }, '确认撤销执行');
+        },
+
+        add_sub_task_in: function (sch) {
+            if(sch.bcType == 'out' || sch.bcType == 'in'){
+                notify_err('暂不能在进出场班次上做回场子任务！');
+                return;
+            }
+            open_modal(folder + '/sub_task/add_sub_task_inpark.html', {
+                sch: sch
+            }, modal_opts);
+        },
+        add_sub_task_out: function (sch) {
+            if(sch.bcType == 'out' || sch.bcType == 'in'){
+                notify_err('暂不能在进出场班次上做出场子任务！');
+                return;
+            }
+            open_modal(folder + '/sub_task/add_sub_task_outpark.html', {
+                sch: sch
+            }, modal_opts);
+        },
+        add_sub_task_range_turn: function (sch) {
+            if(sch.bcType == 'out' || sch.bcType == 'in')
+                return notify_err('进出场班次不能做区间掉头！');
+            open_modal(folder + '/sub_task/add_sub_task_range_turn.html', {
+                sch: sch
+            }, modal_opts);
+        },
+        add_oil: function (sch) {
+            if(sch.bcType == 'out' || sch.bcType == 'in'){
+                notify_err('暂不能在进出场班次上做加油子任务！');
+                return;
+            }
+            open_modal(folder + '/sub_task/add_sub_task_oil.html', {
+                sch: sch
+            }, modal_opts);
         }
     };
@@ -185,6 +220,23 @@ var gb_schedule_context_menu = (function () {
             'lj_zrw': {
                 name: '临加/子任务'
             },
+            'shortcut': {
+                name: '...',
+                items: {
+                    'add_oil': {
+                        name: '（子任务）加油'
+                    },
+                    'add_sub_task_in': {
+                        name: '（子任务）回场'
+                    },
+                    'add_sub_task_out': {
+                        name: '（子任务）出场'
+                    },
+                    'add_sub_task_range_turn': {
+                        name: '（子任务）区间调头'
+                    }
+                }
+            },
             'sep4': '---------',
             'tzrc': {
                 name: '调整人车'
-package com.bsth.service.schedule.rules;
-
-import com.bsth.Application;
-import org.junit.runner.RunWith;
-import org.kie.api.KieBase;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * 测试类。
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {Application.class})
-@ComponentScan(basePackages = {"com.bsth.entity"})
-public class DroolsRulesTest2 {
-    @Autowired
-    private KieBase kieBase;
-
-    @org.junit.Test
-    public void test1() throws Exception {
-        System.out.println("dfdfdfdfd");
-    }
-
-}
+package com.bsth.service.schedule.rules;
+
+import com.bsth.Application;
+import org.junit.runner.RunWith;
+import org.kie.api.KieBase;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * 测试类。
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = {Application.class})
+@ComponentScan(basePackages = {"com.bsth.entity"})
+public class DroolsRulesTest2 {
+    @Autowired
+    private KieBase kieBase;
+
+    @org.junit.Test
+    public void test1() throws Exception {
+        System.out.println("dfdfdfdfd");
+    }
+
+}