Update

徐烜
2 parents ca7c84ae addbcf56
Showing 14 changed files with 250 additions and 136 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
src/main/java/com/bsth/entity/mcy_forms/Waybillday.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/forms/impl/ExportServiceImpl.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleService.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/util/Arith.java
@@ -51,6 +51,7 @@ public class ReportController {
 			m.put("jzsj", a.getJzsj());
 			m.put("czsj", a.getCzsj());
 			m.put("upDown", a.getUpDown()==0?"上行":"下行");
+			resList.add(m);
 			i++;
 		}
@@ -66,41 +67,61 @@ public class ReportController {
 		return resList;
 	}
+	
 	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.GET)
 	public List<ArrivalInfo> queryListClzd(@RequestParam String zd,@RequestParam String line,
 			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
 		return service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
 	}
-	@RequestMapping(value="/exportQueryListClzd" ,method = RequestMethod.GET)
-	public List<Map<String, Object>> exportQueryListClzd(@RequestParam String zd,@RequestParam String line,
-			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
+	
+	
+	
+	@RequestMapping(value="/jobSummaryExport" ,method = RequestMethod.GET)
+	public List<Map<String, Object>> jobSummaryExport(@RequestParam Map<String, Object> map){
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		String lineName=map.get("lineName").toString();
+		String date=map.get("date").toString();
 		ReportUtils ee = new ReportUtils();
-		List<ArrivalInfo> list=service.queryListClzd(line, zd, zdlx, fcsj, ddsj);
-		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		int i=1;
-		for (ArrivalInfo a:list ) {
-			Map<String, Object> m = new HashMap<String, Object>();
-			m.put("i", i);
-			m.put("nbbm", a.getNbbm());
-			m.put("stopName", a.getStopName());
-			m.put("jzsj", a.getJzsj());
-			m.put("czsj", a.getCzsj());
-			m.put("upDown", a.getUpDown()==0?"上行":"下行");
-			i++;
+		 List<Map<String,Object>> fwqlList= service.jobFwqk(map);
+		 List<Map<String, Object>> lgqlList=service.jobLjqk(map);
+		 map=service.jobHzxx(map);
+		 map.put("lineName", lineName);
+		 map.put("date",date);
+		 if(fwqlList.size()<=0){
+			 Map<String, Object> newMap=new HashMap<String,Object>();
+			 	newMap.put("nr", " ");
+				newMap.put("lp", " ");
+				newMap.put("nbbm", " ");
+				newMap.put("jgh", " ");
+				newMap.put("dz", " ");
+				newMap.put("sj", " ");
+				newMap.put("lbbc", " ");
+				newMap.put("lblc", " ");
+				newMap.put("jyqp", " ");
+				fwqlList.add(newMap);
+		 }
+		if(lgqlList.size()<=0){
+			Map<String, Object> newMap=new HashMap<String,Object>();
+			newMap.put("lp", " ");
+			newMap.put("nbbm", " ");
+			newMap.put("jgh", " ");
+			newMap.put("dz", " ");
+			newMap.put("sj", " ");
+			newMap.put("ljlc"," ");
+			newMap.put("jyqp", " ");
+			lgqlList.add(newMap);
 		}
-		
 		try {
-			Map<String, Object> map=new HashMap<String, Object>();
-			listI.add(resList.iterator());
+			listI.add(fwqlList.iterator());
+			listI.add(lgqlList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls",
-					path + "export/班次到离站.xls");
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/jobSummary.xls",
+					path + "export/调度员工作汇总日报.xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return resList;
+		return new ArrayList<Map<String, Object>>();
 	}
 	@RequestMapping(value = "/sreachZd", method = RequestMethod.GET)
 	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx,@RequestParam String zd) {
@@ -253,20 +253,22 @@ public class InOutStationSignalHandle extends SignalHandle{
             //已完成班次数
             int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
             ScheduleRealInfo next = dayOfSchedule.next(sch);
-            //通知客户端
-            sendUtils.sendZdsj(sch, next, doneSum);
             //持久化
             dayOfSchedule.save(sch);
-            //准备执行下一个班次
-            if (next != null) {
+            if(next != null){
                 next.setQdzArrDatesj(sch.getZdsjActual());
                 dayOfSchedule.addExecPlan(next);
                 //进站既进场
                 inStationAndInPark(sch, next);
+            }
+            //通知客户端
+            sendUtils.sendZdsj(sch, next, doneSum);
+
+            //准备执行下一个班次
+            if (next != null) {
                 //将gps转换为下一个班次走向的站内信号
                 transformUpdown(gps, next);
-
                 //下发调度指令
                 directiveService.send60Dispatch(next, doneSum, "到站@系统");
@@ -11,7 +11,10 @@ import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
-import com.bsth.data.schedule.thread.*;
+import com.bsth.data.schedule.thread.CalcOilThread;
+import com.bsth.data.schedule.thread.SchedulePstThread;
+import com.bsth.data.schedule.thread.ScheduleRefreshThread;
+import com.bsth.data.schedule.thread.SubmitToTrafficManage;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -146,7 +149,7 @@ public class DayOfSchedule implements CommandLineRunner {
         //入库
 //        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //班次误点扫描
-//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
         //每天凌晨2点20提交数据到运管处
         long diff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
 package com.bsth.data.schedule.late_adjust;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.Arith;
 import com.bsth.websocket.handler.SendUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,6 +49,9 @@ public class LateAdjustHandle implements ApplicationContextAware{
      */
     public static void putLate(ScheduleRealInfo sch){
         try {
+            //进出场班次不需要
+            if(sch.getBcType().equals("in") || sch.getBcType().equals("out"))
+                return;
             //线路配置
             LineConfig config = lineConfigData.get(sch.getXlBm());
             if(sch.getLateMinute() == 0){
@@ -115,18 +120,22 @@ public class LateAdjustHandle implements ApplicationContextAware{
             if(sch == null)
                 return;
-            //进的是班次起点
-            if(gps.getStopNo().equals(sch.getQdzCode())
+            //进的是班次起点（名称一样即可）
+            gps.setStationName(BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo()));
+            if(gps.getStationName().equals(sch.getQdzName())
                     && sch.getLateMinute() > 0){
                 //自动调整待发 到达时间 + 停靠时间
-                long dt = gps.getTimestamp() + (Long.parseLong(String.valueOf(sch.getLateMinute() * 60 * 1000)));
+                long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
                 sch.setDfsjAll(dt);
                 sch.setDfAuto(true);
+                //取消应发未到标记
+                sch.setLate2(false);
                 lateSchMap.remove(sch.getClZbh());
                 logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
             }
         }catch (Exception e){
+            e.printStackTrace();
             logger.error("", e);
         }
     }
@@ -19,7 +19,7 @@ import java.util.List;
  * @ClassName: ScheduleLateThread
  * @Description: TODO(班次误点扫描线程)
  * @author PanZhao
- * @date 2016年8月31日 下午3:09:02 
+ * @date 2016年8月31日 下午3:09:02
  *
  */
 @Component
@@ -44,11 +44,14 @@ public class ScheduleLateThread extends Thread{
 		ScheduleRealInfo sch;
 		for(int i = 0; i < size; i ++){
 			sch = all.get(i);
-			if(sch.getDfsjT() > t || sch.isLate())
+			if(sch.getDfsjT() > t)
 				break;
+			if(sch.isLate())
+				continue;
+
 			if(sch.getStatus() == 0
-					&& sch.getFcsjActual() == null){
+					&& StringUtils.isEmpty(sch.getFcsjActual())){
 				//检查应发未到 当前班次无起点到达时间
 				if(StringUtils.isEmpty(sch.getQdzArrDateSJ())){
@@ -20,6 +20,8 @@ public class Waybillday {
 	private String zlc;//里程
+	private String sh;//损耗
+	
 	public String getJgh() {
 		return jgh;
 	}
@@ -110,6 +112,15 @@ public class Waybillday {
 	public void setYl(String yl) {
 		this.yl = yl;
 	}
+
+	public String getSh() {
+		return sh;
+	}
+
+	public void setSh(String sh) {
+		this.sh = sh;
+	}
+	
 }
@@ -22,7 +22,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> findByLines(List<String> lines);
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and bc_type not in ('in','out') order by (lpName+1),clZbh,realExecDate,fcsj")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and bc_type not in ('in','out') order by (lpName+1),clZbh,realExecDate,dfsj")
 	List<ScheduleRealInfo> scheduleDailyQp(String line,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
@@ -87,11 +87,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,dfsj")
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5  order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5  order by realExecDate,dfsj")
 	List<ScheduleRealInfo> queryListWaybillXcld(String jGh,String clZbh,String lpName,String date,String line);
 //	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -104,11 +104,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,dfsj")
 	List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh like %?1% and s.clZbh like %?2% and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') and s.gsBm like %?4% and s.fgsBm like %?5%  order by realExecDate,fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.jGh like %?1% and s.clZbh like %?2% and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') and s.gsBm like %?4% and s.fgsBm like %?5%  order by realExecDate,dfsj")
 	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date,String gsbm,String fgsbm);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -133,11 +133,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//去掉了 xlBm is not null 
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.realExecDate,s.fcsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.realExecDate,s.dfsj, (s.lpName+1)")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.dfsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -35,12 +35,14 @@ public class ExportServiceImpl implements ExportService{
 			for(Waybillday w : list){
 				Map<String, Object> m = new HashMap<String, Object>();
-				m.put("carPlate", w.getCarPlate());
+				m.put("carPlate", w.getNbbm());
 				m.put("jzl1", w.getJzl1());
 				m.put("jzl", w.getJzl());
 				m.put("yh", w.getYh());
+				m.put("sh", w.getSh());
 				m.put("jName", w.getjName());
 				m.put("zlc", w.getZlc());
+				m.put("jy", "");
 				resList.add(m);
 			}
@@ -48,7 +50,7 @@ public class ExportServiceImpl implements ExportService{
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
 				ee.excelReplace(listI, new Object[] { map }, path+"mould/waybillday.xls",
-						path+"export/行车路单日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+						path+"export/行车路单日报表.xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -64,48 +64,69 @@ public class FormsServiceImpl implements FormsService {
 	// 行车路单日报表
 	@Override
 	public List<Waybillday> waybillday(Map<String, Object> map) {
-		
-		
-		
-		String sql=" select t.*,z.jzl,z.yh from ("
-				+ " select x.j_gh,x.cl_zbh,x.j_name,x.schedule_date,"
-				+ " x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name  from bsth_c_s_sp_info_real x "
-				+ " where  to_days( x.schedule_date)=to_days('"+map.get("date").toString() + "')  "
-				+ " and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"' "
-				+ " and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"' "
-				+ " and xl_bm like '%"+ map.get("line").toString().trim()+"%'"
-				+ " GROUP BY x.j_gh,x.cl_zbh,x.j_name,"
-				+ " x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name ) t"
-				+ " LEFT join  (select  y.rq,y.xlbm,y.nbbm,y.jsy,y.jzl,y.yh from"
-				+ " bsth_c_ylb y   where 1=1   "
-				+ " and to_days(y.RQ)=to_days('"+map.get("date").toString() + "')  "
-				+ " and y.XLBM like '%"+ map.get("line").toString().trim()+"%'"
-				+ " and y.ssgsdm='"+map.get("gsdmWaybillday").toString()+"'"
-				+ " and y.fgsdm='"+map.get("gsdmWaybillday").toString()+"')  z "
-				+ " on t.cl_zbh=z.nbbm ";
+		String line=map.get("line").toString();
+		String date=map.get("date").toString();
+
+		String sql="select "
+				+ " r.cl_zbh,r.j_gh,r.j_name"
+				+ " from bsth_c_s_sp_info_real r where "
+				+ " r.schedule_date_str = '"+date+"'"
+				+ " and r.xl_bm = '"+line+"' "
+				+ " group  by "
+	       		+ " r.cl_zbh,r.j_gh,r.j_name";
 		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
+			
 			@Override
 			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Waybillday wbd = new Waybillday();
-				wbd.setCarPlate(arg0.getString("cl_zbh"));
-				wbd.setJzl(arg0.getString("jzl"));
-				wbd.setYh(arg0.getString("yh"));
-				wbd.setjName(arg0.getString("j_name"));
-				wbd.setRq(arg0.getString("schedule_date"));
-				wbd.setJgh(arg0.getString("j_gh"));
-				return wbd;
-			}
+				Waybillday w=new Waybillday();
+				w.setJgh(arg0.getString("j_gh"));
+				w.setjName(arg0.getString("j_name"));
+				w.setNbbm(arg0.getString("cl_zbh"));
+				return w;
+				
+			};
 		});
-		
-		for(int i=0;i<list.size();i++){
+		List<ScheduleRealInfo> realList= scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
+		List<Ylb> listYlb= ylbRepository.obtainYl(date, "", "", line, "", "xlbm");
+		double jzl=0.0,sh=0.0,yh=0.0;
+		for (int i = 0; i < list.size(); i++) {
 			Waybillday w=list.get(i);
-			Map<String, Object> maps = new HashMap<>();
-			maps = commonService.findKMBC2(w.getJgh(), w.getCarPlate(),
-					w.getRq());
-			w.setJzl1(maps.get("ksgl").toString());
-			w.setZlc(maps.get("realMileage").toString());
-
+			List<ScheduleRealInfo> listInfo=new ArrayList<ScheduleRealInfo>();
+			for (int j = 0; j < realList.size(); j++) {
+				ScheduleRealInfo s=realList.get(j);
+				if(w.getNbbm().equals(s.getClZbh()) && w.getJgh().equals(w.getJgh())){
+					listInfo.add(s);
+				}
+			}
+			
+			double sjgl=culateMileageService.culateSjgl(listInfo);
+			double ljgl=culateMileageService.culateLjgl(listInfo);
+			double zyygl=Arith.add(sjgl, ljgl);
+			double jccg=culateMileageService.culateJccgl(listInfo);
+			double ksgl=culateMileageService.culateKsgl(listInfo);
+			double zksgl=Arith.add(jccg, ksgl);
+			
+			w.setJzl1(String.valueOf(zksgl));
+			w.setZlc(String.valueOf(Arith.add(zyygl, zksgl)));
+			
+			
+			jzl=0.0;
+			sh=0.0;
+			yh=0.0;
+			for (int j = 0; j < listYlb.size(); j++) {
+				Ylb y=listYlb.get(j);
+				if(w.getNbbm().equals(y.getNbbm()) && w.getJgh().equals(y.getJsy())){
+					jzl=Arith.add(jzl, y.getJzl());
+					sh=Arith.add(sh, y.getSh());
+					yh=Arith.add(yh, y.getYh());
+				}
+			}
+			
+			w.setJzl(String.valueOf(jzl));
+			w.setYh(String.valueOf(yh));
+			w.setSh(String.valueOf(sh));
+			
 		}
 		return list;
 	}
@@ -1050,6 +1050,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         ScheduleRealInfo next = dayOfSchedule.next(sch);
                         if (null != next) {
                             next.setQdzArrDateSJ(zdsjActual);
+                            next.setLate2(false);
                             ts.add(next);
                         }
@@ -1667,35 +1668,42 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public List<Map<String, Object>> statisticsDaily(String line, String date,
                                                      String xlName, String type) {
     	List<Map<String, Object>> lMap= new ArrayList<Map<String, Object>>();
-    	List<ScheduleRealInfo> lists = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+    	List<ScheduleRealInfo>list_s=scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+    	List<ScheduleRealInfo>  lists =new ArrayList<ScheduleRealInfo>();
+    	for (int i = 0; i < list_s.size(); i++) {
+			ScheduleRealInfo s=list_s.get(i);
+			if(s.getZdsjActual()!=null){
+				lists.add(s);
+			}
+		}
     	Map<String, Object> map = new HashMap<String, Object>();
     	 map.put("xlName", xlName);
-    	 double jhlc=culateService.culateJhgl(lists);
+    	 double jhlc=culateService.culateJhgl(list_s);
          map.put("jhlc",jhlc);
          map.put("sjgl", Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists)));
-         double lbgl=culateService.culateLbgl(lists);
+         double lbgl=culateService.culateLbgl(list_s);
          map.put("ssgl", lbgl);
-         map.put("ssgl_lz", culateService.culateCJLC(lists, "路阻"));
-         map.put("ssgl_dm", culateService.culateCJLC(lists, "吊慢"));
-         map.put("ssgl_gz", culateService.culateCJLC(lists, "故障"));
-         map.put("ssgl_jf", culateService.culateCJLC(lists, "纠纷"));
-         map.put("ssgl_zs", culateService.culateCJLC(lists, "肇事"));
-         map.put("ssgl_qr", culateService.culateCJLC(lists, "缺人"));
-         map.put("ssgl_qc", culateService.culateCJLC(lists, "缺车"));
-         map.put("ssgl_kx", culateService.culateCJLC(lists, "客稀"));
-         map.put("ssgl_qh", culateService.culateCJLC(lists, "气候"));
-         map.put("ssgl_yw", culateService.culateCJLC(lists, "援外"));
-         double ssgl_pc=culateService.culateCJLC(lists, "配车");
-         double ssgl_by=culateService.culateCJLC(lists, "保养");
-         double ssgl_cj=culateService.culateCJLC(lists, "抽减");
-         double ssgl_qt=culateService.culateCJLC(lists, "其他");
+         map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
+         map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
+         map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
+         map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
+         map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
+         map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
+         map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
+         map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
+         map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
+         map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
+         double ssgl_pc=culateService.culateCJLC(list_s, "配车");
+         double ssgl_by=culateService.culateCJLC(list_s, "保养");
+         double ssgl_cj=culateService.culateCJLC(list_s, "抽减");
+         double ssgl_qt=culateService.culateCJLC(list_s, "其他");
          map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
-         map.put("ssbc", culateService.culateLbbc(lists));
+         map.put("ssbc", culateService.culateLbbc(list_s));
          double ljgl=culateService.culateLjgl(lists);
          map.put("ljgl", ljgl);
-         map.put("jhbc", culateService.culateJhbc(lists,""));
-         map.put("jhbc_m", culateService.culateJhbc(lists, "zgf"));
-         map.put("jhbc_a", culateService.culateJhbc(lists, "wgf"));
+         map.put("jhbc", culateService.culateJhbc(list_s,""));
+         map.put("jhbc_m", culateService.culateJhbc(list_s, "zgf"));
+         map.put("jhbc_a", culateService.culateJhbc(list_s, "wgf"));
          map.put("sjbc", culateService.culateSjbc(lists,""));
          map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
          map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
@@ -2263,11 +2271,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return lMap;
     }*/
-    public final Map<String, Object> staticTj(List<ScheduleRealInfo> lists){
+    public final Map<String, Object> staticTj(List<ScheduleRealInfo> list){
+    	List<ScheduleRealInfo>  lists=new ArrayList<ScheduleRealInfo>();
+    	for(int i=0;i<list.size();i++){
+    		ScheduleRealInfo s=list.get(i);
+    		if(s.getZdsjActual()!=null){
+    			lists.add(s);
+    		}
+    	}
     	Map<String, Object> map = new HashMap<String, Object>();
    	 	map.put("xlName", lists.get(0).getXlName());
-	   	 double jhyygl=culateService.culateJhgl(lists);//计划营运公里
-		 double jhjcclc= culateService.culateJhJccgl(lists);//计划进出场公里(计划空驶公里)
+	   	 double jhyygl=culateService.culateJhgl(list);//计划营运公里
+		 double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
 	     map.put("jhlc", jhyygl);
 	     map.put("jcclc", jhjcclc);
 	     map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
@@ -2283,23 +2298,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	     map.put("sjgl",zyygl);
 	     map.put("sjksgl", zksgl);
-        map.put("ssgl", culateService.culateLbgl(lists));
-        map.put("ssgl_lz", culateService.culateCJLC(lists, "路阻"));
-        map.put("ssgl_dm", culateService.culateCJLC(lists, "吊慢"));
-        map.put("ssgl_gz", culateService.culateCJLC(lists, "故障"));
-        map.put("ssgl_jf", culateService.culateCJLC(lists, "纠纷"));
-        map.put("ssgl_zs", culateService.culateCJLC(lists, "肇事"));
-        map.put("ssgl_qr", culateService.culateCJLC(lists, "缺人"));
-        map.put("ssgl_qc", culateService.culateCJLC(lists, "缺车"));
-        map.put("ssgl_kx", culateService.culateCJLC(lists, "客稀"));
-        map.put("ssgl_qh", culateService.culateCJLC(lists, "气候"));
-        map.put("ssgl_yw", culateService.culateCJLC(lists, "援外"));
-        map.put("ssgl_other", culateService.culateCJLC(lists, "其他"));
-        map.put("ssbc", culateService.culateLbbc(lists));
+        map.put("ssgl", culateService.culateLbgl(list));
+        map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
+        map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
+        map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
+        map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));
+        map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));
+        map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));
+        map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));
+        map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
+        map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
+        map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
+        map.put("ssgl_other", culateService.culateCJLC(list, "其他"));
+        map.put("ssbc", culateService.culateLbbc(list));
         map.put("ljgl", ljgl);
-        map.put("jhbc", culateService.culateJhbc(lists,""));
-        map.put("jhbc_m", culateService.culateJhbc(lists, "zgf"));
-        map.put("jhbc_a", culateService.culateJhbc(lists, "wgf"));
+        map.put("jhbc", culateService.culateJhbc(list,""));
+        map.put("jhbc_m", culateService.culateJhbc(list, "zgf"));
+        map.put("jhbc_a", culateService.culateJhbc(list, "wgf"));
         map.put("sjbc", culateService.culateSjbc(lists,""));
         map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
         map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
@@ -2323,6 +2338,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public List<Map<String, Object>> statisticsDailyTj(String gsdm,String fgsdm,String line, String date,String date2,
                                                      String xlName, String type) {
         List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
         line =line.trim();
         if(line.equals("")){
@@ -2332,6 +2348,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         	//查询单条线路
         	list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
         }
+        for (int i = 0; i < list.size(); i++) {
+        	ScheduleRealInfo s=list.get(i);
+        	if(s.getZdsjActual()!=null){
+        		list_s.add(s);
+        	}
+		}
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         for (int i = 0; i < list.size(); i++) {
         	if(i<list.size()-1){
@@ -2365,12 +2387,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("jcclc", jhjcclc);
         map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
-        double ljgl= culateService.culateLjgl(list);
-        double sjyygl= culateService.culateSjgl(list);
+        double ljgl= culateService.culateLjgl(list_s);
+        double sjyygl= culateService.culateSjgl(list_s);
         double zyygl= Arith.add(sjyygl,ljgl);
-        double sjjccgl=culateService.culateJccgl(list);
-        double sjksgl=culateService.culateKsgl(list);
+        double sjjccgl=culateService.culateJccgl(list_s);
+        double sjksgl=culateService.culateKsgl(list_s);
         double zksgl=Arith.add(sjjccgl, sjksgl);
         map.put("sjzgl", Arith.add(zyygl, zksgl));
         map.put("sjgl",zyygl);
@@ -2392,15 +2414,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("jhbc", culateService.culateJhbc(list,""));
         map.put("jhbc_m", culateService.culateJhbc(list, "zgf"));
         map.put("jhbc_a", culateService.culateJhbc(list, "wgf"));
-        map.put("sjbc", culateService.culateSjbc(list,""));
-        map.put("sjbc_m", culateService.culateSjbc(list,"zgf"));
-        map.put("sjbc_a", culateService.culateSjbc(list,"wgf"));
-        map.put("ljbc", culateService.culateLjbc(list,""));
-        map.put("ljbc_m", culateService.culateLjbc(list,"zgf"));
-        map.put("ljbc_a", culateService.culateLjbc(list,"wgf"));
-        map.put("fzbc", culateService.culateFzbc(list, ""));
-        map.put("fzbc_m", culateService.culateFzbc(list, "zgf"));
-        map.put("fzbc_a",  culateService.culateFzbc(list, "wgf"));
+        map.put("sjbc", culateService.culateSjbc(list_s,""));
+        map.put("sjbc_m", culateService.culateSjbc(list_s,"zgf"));
+        map.put("sjbc_a", culateService.culateSjbc(list_s,"wgf"));
+        map.put("ljbc", culateService.culateLjbc(list_s,""));
+        map.put("ljbc_m", culateService.culateLjbc(list_s,"zgf"));
+        map.put("ljbc_a", culateService.culateLjbc(list_s,"wgf"));
+        map.put("fzbc", culateService.culateFzbc(list_s, ""));
+        map.put("fzbc_m", culateService.culateFzbc(list_s, "zgf"));
+        map.put("fzbc_a",  culateService.culateFzbc(list_s, "wgf"));
         map.put("dtbc", 0);
         map.put("dtbc_m", 0);
         map.put("dtbc_a", 0);
@@ -1181,6 +1181,7 @@ public class ReportServiceImpl implements ReportService{
 						newMap.put("dz", scheduleRealInfo.getQdzName());
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("lbbc", 1);
+						newMap.put("gzf", " ");
 						newMap.put("lblc", scheduleRealInfo.getJhlcOrig());
 						newMap.put("jyqp", scheduleRealInfo.getRemarks());
 						list.add(newMap);
@@ -1206,6 +1207,7 @@ public class ReportServiceImpl implements ReportService{
 							newMap.put("jgh", scheduleRealInfo.getjGh());
 							newMap.put("dz", childTaskPlan.getStartStationName());
 							newMap.put("sj", childTaskPlan.getStartDate());
+							newMap.put("gzf", " ");
 							newMap.put("lbbc", 0);
 							newMap.put("lblc", childTaskPlan.getMileage());
 							newMap.put("jyqp", childTaskPlan.getRemarks());
@@ -1237,8 +1239,12 @@ public class ReportServiceImpl implements ReportService{
 				 newMap.put("lp", "小计");
 				 newMap.put("nbbm", "少驶班次");
 				 newMap.put("jgh", lbbc);
-				 newMap.put("sj", "少驶公里");
+				 newMap.put("lbbc", "少驶公里");
 				 newMap.put("lblc", lblc);
+				 newMap.put("dz", " ");
+				 newMap.put("sj", " ");
+				 newMap.put("gzf", " ");
+				 newMap.put("jyqp"," ");
 				 listNew.add(newMap);
 			 }
@@ -1271,7 +1277,7 @@ public class ReportServiceImpl implements ReportService{
 						newMap.put("dz", scheduleRealInfo.getQdzName());
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("ljlc", scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
-						newMap.put("jyqp", scheduleRealInfo.getRealMileage());
+						newMap.put("jyqp", scheduleRealInfo.getRealMileage()==null?"":scheduleRealInfo.getRealMileage());
 						list.add(newMap);
 					}
 //				}else{
@@ -43,3 +43,4 @@ public interface ScheduleRuleService {
      */
     void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto);
 }
+
@@ -125,3 +125,4 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
     }
 }
+
@@ -24,8 +24,20 @@ public class Arith {
 	        BigDecimal b1 = new BigDecimal(v1.toString());    
 	        BigDecimal b2 = new BigDecimal(v2.toString());    
 	        return b1.add(b2).doubleValue();    
-	    }    
-	       
+	    }
+
+	/**
+	 * 提供精确的加法运算。
+	 * @param v1 被加数
+	 * @param v2 加数
+	 * @return 两个参数的和
+	 */
+	public static long addLong(Object v1,Object v2){
+		BigDecimal b1 = new BigDecimal(v1.toString());
+		BigDecimal b2 = new BigDecimal(v2.toString());
+		return b1.add(b2).longValue();
+	}
+
 	    /**   
 	     * 提供精确的减法运算。   
 	     * @param v1 被减数