行车路单无实发不显示

廖磊
1 parent dacda227
Showing 9 changed files with 321 additions and 80 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/service/oil/DlbService.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
src/main/resources/static/pages/forms/statement/waybill.html
@@ -369,8 +369,35 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value="/statisticsDailyTj")
-	public List<Map<String,Object>> statisticsDailyTj(@RequestParam String gsdm,@RequestParam String fgsdm, @RequestParam String line, @RequestParam String date,
-			@RequestParam String date2,@RequestParam String xlName, @RequestParam String type){
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
 		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
 	}
 package com.bsth.data.schedule.thread;
+import com.bsth.service.oil.DlbService;
 import com.bsth.service.oil.YlbService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,7 +16,8 @@ public class CalcOilThread extends Thread{
     @Autowired
     YlbService ylbService;
-
+    @Autowired
+    DlbService dlbService;
     Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
@@ -23,6 +25,7 @@ public class CalcOilThread extends Thread{
         try{
             logger.info("开始计算路单里程加注量....");
             ylbService.obtainDsq();
+            dlbService.obtainDsq();
             logger.info("计算路单里程加注量结束！");
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
@@ -18,4 +18,6 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	Map<String, Object> saveDlbList(Map<String, Object> map) throws Exception;
+	
+	String obtainDsq() throws Exception;
 }
@@ -6,6 +6,7 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -70,8 +71,144 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 	JdbcTemplate jdbcTemplate;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Transactional  
+	@Override
+	public String obtainDsq() throws Exception{
+		String result = "failure";
+		List<Cars> carsList=carsRepository.findCars();
+		 Map<String, Boolean> carsMap=new HashMap<String, Boolean>();
+		 for (int i = 0; i < carsList.size(); i++) {
+			 Cars c=carsList.get(i);
+			 carsMap.put(c.getInsideCode(), c.getSfdc());
+		}
+		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			Date dNow = new Date();   //当前时间
+			Date dBefore = new Date();
+			Calendar calendar = Calendar.getInstance(); //得到日历
+			calendar.setTime(dNow);//把当前时间赋给日历
+			calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
+			dBefore = calendar.getTime();   //得到前一天的时间
+			String rq=sdf.format(dBefore);
+		String line="";
+		//保留两位小数
+		DecimalFormat df = new DecimalFormat("#.00");
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		//当天DLB信息
+		List<Dlb> dlList=repository.obtainDl(rq, "", "", line, "", "nbbm");
+		//当天YLXXB信息
+		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,"");
+		//当天加电信息表
+		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<Ylb> addList=new ArrayList<Ylb>();
+		List<Ylb> updateList=new ArrayList<Ylb>();
+		for(int x=0;x<listpb.size();x++){
+			String type="add";
+			boolean sfdc=false;
+			Map<String, Object> map=listpb.get(x);
+			if (carsMap.get(map.get("clZbh").toString())!=null) {
+				 sfdc= carsMap.get(map.get("clZbh").toString());
+			}else{
+				sfdc=false;
+			}
+			if(sfdc){
+				//判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+				Dlb t=new Dlb();
+				for(int k=0;k<dlList.size();k++){
+					Dlb t1=dlList.get(k);
+					if(t1.getNbbm().equals(map.get("clZbh").toString())
+							&&t1.getJsy().equals(map.get("jGh").toString())
+							&&t1.getXlbm().equals(map.get("xlBm").toString()))
+					{
+						t=t1;
+						type="update";
+					}
+				}
+				try {
+					//当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+					Double jzl=0.0;
+					if(map.get("seqNumber").toString().equals("1")){
+						boolean fage=true;
+						for (int i = 0; i < dlListBe.size(); i++) {
+							Dlb dlb=dlListBe.get(i);
+							if(map.get("clZbh").toString().equals(dlb.getNbbm())){
+								t.setCzcd(dlb.getJzcd());
+								fage=false;
+								break;
+							}
+						}
+						if(fage){
+							for (int y = 0; y < cdyList.size(); y++) {
+								Cdl cdl=cdyList.get(y);
+								if(map.get("clZbh").toString().equals(cdl.getNbbm())){
+									t.setCzcd(cdl.getClcd()==null?0:cdl.getClcd());
+									fage=false;
+									break;
+								}
+							}
+						}
+						if(fage){
+							t.setCzcd(0.0);
+						}
+						
+						//手动导入没有驾驶员工号
+						for (int i = 0; i < jdlList.size(); i++) {
+							Jdl jdl=jdlList.get(i);
+							if(map.get("clZbh").toString().equals(jdl.getNbbm()) ){
+								jzl+=jdl.getJdl();
+							}
+						}
+					}
+					
+					
+					//把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+					for(int j=0;j<ylxxList.size();j++){
+						Ylxxb ylxxb= ylxxList.get(j);
+						if(map.get("clZbh").toString().equals(ylxxb.getNbbm()) &&map.get("jGh").toString().equals(ylxxb.getJsy())){
+							jzl+=ylxxb.getJzl();
+						}
+					}
+					
+					t.setCdl(jzl);
+					if(type.equals("add")){
+						t.setHd(jzl);
+						t.setJzcd(t.getCzcd());
+					}
+					
+					t.setNbbm(map.get("clZbh").toString());
+					t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
+					t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
+					t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
+					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+					t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
+					t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
+					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+					t.setRq(sdf.parse(rq));
+					t.setCreatetime(new Date());
+					/*if(type.equals("add")){
+						addList.add(t);
+					}else{
+						updateList.add(t);
+					}*/
+					repository.save(t);
+					newMap.put("status", ResponseCode.SUCCESS);
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					newMap.put("status", ResponseCode.ERROR);
+					e.printStackTrace();
+				}
+			}
+		}
+		return result;
+	}
 	/**
-	 * 获取进存油信息
+	 * 获取进存电信息
 	 * @Transactional 回滚事物
 	 */
 	@Transactional  
@@ -172,7 +172,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setJzl(jzl);*/
 						t.setNbbm(map.get("clZbh").toString());
 						t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
-						t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
+						t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString()));
 						t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
 						t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 						t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
@@ -581,62 +581,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<Iterator<?>> list = new ArrayList<Iterator<?>>();
         List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
-
+//        List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+    	for (int i = 0; i < scheduleRealInfos.size(); i++) {
+    		ScheduleRealInfo s=scheduleRealInfos.get(i);
+    		if(s.getZdsjActual()!=null){
+    			lists.add(s);
+    		}
+		}
         DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-        int jhbc = 0, cjbc = 0, ljbc = 0;
-        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0;
-        float addMileage = 0l, remMileage = 0l;
         Map<String, Object> map;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
-            if (scheduleRealInfo != null) {
-                //计算计划里程（主任务过滤掉临加班次），烂班里程，临加里程，计划班次，烂班班次，增加班次
-                if (scheduleRealInfo != null) {
-                    //计划里程（主任务过滤掉临加班次），
-                    //烂班里程（主任务烂班），
-                    //临加里程（主任务临加），
-                    //计划班次，烂班班次，增加班次
-                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
-                    if (scheduleRealInfo.isSflj()) {
-                        ljbc++;
-                    } else {
-                        jhlc += tempJhlc;
-                        jhbc++;
-                        if (scheduleRealInfo.getStatus() == -1) {
-                            remMileage += tempJhlc;
-                            cjbc++;
-                        }
-                    }
-                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-                    //计算营运里程，空驶里程
-                    if (childTaskPlans.isEmpty()) {
-                        if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-                                ) {
-                            ksgl += tempJhlc;
-                        } else {
-                            yygl += tempJhlc;
-                        }
-                    } else {
-                        Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                        while (it.hasNext()) {
-                            ChildTaskPlan childTaskPlan = it.next();
-                            if (childTaskPlan.getMileageType().equals("empty")) {
-                                if (scheduleRealInfo.isSflj()) {
-                                    addMileage += tempJhlc;
-                                }
-                                ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            } else {
-                                if (scheduleRealInfo.isSflj()) {
-                                    addMileage += tempJhlc;
-                                }
-                                yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            }
-                        }
-                    }
-                }
-
                 map = new HashMap<String, Object>();
                 try {
                     scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
@@ -661,21 +619,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-            }
         }
         //计算里程和班次数，并放入Map里
         map = new HashMap<String, Object>();
-        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("ksgl", format.format(ksgl));
-        map.put("realMileage", format.format(yygl + ksgl));
-        map.put("jhbc", jhbc);
-        map.put("cjbc", cjbc);
-        map.put("ljbc", ljbc);
-        map.put("sjbc", jhbc - cjbc + ljbc);
+        map.put("jhlc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("addMileage", culateMieageService.culateLjgl(lists));
+        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+        map.put("yygl", yygl);
+        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        map.put("ksgl",ksgl);
+        map.put("realMileage", Arith.add(yygl ,ksgl));
+        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+        map.put("sjbc", sjbc);
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
@@ -1414,19 +1374,27 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public Map<String, Object> findKMBC(String jGh, String clZbh,
             String lpName, String date, String line) {
     	Map<String, Object> map = new HashMap<String, Object>();
-    	List<ScheduleRealInfo> lists=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
+    	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);
+    		}
+		}
     	double ksgl=culateService.culateKsgl(lists);
     	double sjgl=culateService.culateSjgl(lists);
     	double jccgl=culateService.culateJccgl(lists);
     	double ljgl=culateService.culateLjgl(lists);
-    	 map.put("jhlc", culateService.culateJhgl(lists)); //计划里程
+    	
+    	 map.put("jhlc", culateService.culateJhgl(list)); //计划里程
          map.put("remMileage", culateService.culateLbgl(lists)); //烂班公里
          map.put("addMileage", ljgl); //临加公里
          map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
          map.put("ksgl", ksgl);//空驶公里
          map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
 //         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
-         map.put("jhbc", culateService.culateJhbc(lists,""));
+         map.put("jhbc", culateService.culateJhbc(list,""));
          map.put("cjbc", culateService.culateLbbc(lists));
          map.put("ljbc", culateService.culateLjbc(lists,""));
          map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
@@ -1670,7 +1638,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          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, "其他"));
+         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_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
          map.put("ssbc", culateService.culateLbbc(lists));
          map.put("ljgl", culateService.culateLjgl(lists));
          map.put("jhbc", culateService.culateJhbc(lists,""));
@@ -3793,6 +3765,76 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return new ArrayList<Map<String, Object>>();
     }
+    public  List<ScheduleRealInfo> exportWaybill_pl(List<ScheduleRealInfo> listpl,String date,String jName, String clZbh,String lpName) {
+        ReportUtils ee = new ReportUtils();
+        ReportRelatedUtils rru = new ReportRelatedUtils();
+        List<Iterator<?>> list = new ArrayList<Iterator<?>>();
+        List<ScheduleRealInfo> scheduleRealInfos = listpl;
+        List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+//        List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+    	for (int i = 0; i < scheduleRealInfos.size(); i++) {
+    		ScheduleRealInfo s=scheduleRealInfos.get(i);
+    		if(s.getZdsjActual()!=null){
+    			lists.add(s);
+    		}
+		}
+        DecimalFormat format = new DecimalFormat("0.00");
+//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
+//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
+
+        Map<String, Object> map;
+        for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
+                map = new HashMap<String, Object>();
+                try {
+                    scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
+                    scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
+                    map = rru.getMapValue(scheduleRealInfo);
+                    String zdsj = scheduleRealInfo.getZdsj();
+                    String zdsjActual = scheduleRealInfo.getZdsjActual();
+                    if (zdsj != null && zdsjActual != null &&
+                            !zdsj.equals(zdsjActual)) {
+                        if (zdsj.compareTo(zdsjActual) > 0) {
+                            map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                            map.put("slow", "");
+                        } else {
+                            map.put("fast", "");
+                            map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                        }
+                    } else {
+                        map.put("fast", "");
+                        map.put("slow", "");
+                    }
+                    listMap.add(map);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+        }
+
+        //计算里程和班次数，并放入Map里
+        map = new HashMap<String, Object>();
+        map.put("jhlc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("addMileage", culateMieageService.culateLjgl(lists));
+        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+        map.put("yygl", yygl);
+        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        map.put("ksgl",ksgl);
+        map.put("realMileage", Arith.add(yygl ,ksgl));
+        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+        map.put("sjbc", sjbc);
+
+        String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+
+        list.add(listMap.iterator());
+        ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/waybill_minhang.xls",
+                path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
+        return scheduleRealInfos;
+    }
+    
     @Override
     public Map<String, Object> exportWaybillMore(Map<String, Object> map) {
         String date = map.get("date").toString();
@@ -3814,12 +3856,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
             file.mkdirs();
-
+            List<ScheduleRealInfo> lists_line=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
             for (List<String> list : lists) {
+            	List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
                 String jName = list.get(0);
                 String clZbh = list.get(1);
                 String lpName = list.get(2);
-                this.exportWaybill(jName, clZbh, lpName, date, line);
+                for (int i = 0; i < lists_line.size(); i++) {
+					ScheduleRealInfo s=lists_line.get(i);
+					if(s.getjName().equals(jName) && s.getClZbh().equals(clZbh) && s.getLpName().equals(lpName)){
+						newList.add(s);
+					}
+				}
+                this.exportWaybill_pl(newList, date, jName, clZbh, lpName);
                 File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
                 String fileName = file.getName();
                 temp.renameTo(new File(path + fileName + "/" + temp.getName()));
@@ -401,7 +401,6 @@
 				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
 			});
 			$.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){
-				console.log(result);
 				var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
 				$('#forms .scheduleDaily_2').html(scheduleDaily_2);
 			});
@@ -541,9 +540,18 @@
 				<td>{{obj.fast}}</td>
 				<td>{{obj.slow}}</td>
 				<td>{{obj.fcsj}}</td>
-				<td>{{obj.fcsjActual}}</td>
+				<td>{{obj.fcsjActual}}
+				{{if obj.bcType== "in"}}
+						(进)
+					{{/if}}
+					{{if obj.bcType== "out"}}
+						(出)
+					{{/if}}
+			</td>
 				<td>{{obj.fast0}}</td>
-				<td>{{obj.slow0}}</td>
+				<td>{{obj.slow0}}
+					
+				</td>
 				<td colspan="2">{{obj.remarks}}</td>
 		{{if (i+1)%3 == 0}}
 				<td>&nbsp;</td>
@@ -247,8 +247,15 @@
 			if(date==null || date =="" ||date2==null || date2 ==""){
 				 layer.msg('请选择时间段.');
 			}else{
-				
-				$get('/realSchedule/statisticsDailyTj',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,date2:date2,xlName:xlName,type:"query"},function(result){
+				 var params = {};
+				 params['gsdm'] = gsdm;
+				 params['fgsdm'] =fgsdm ;
+				 params['line'] = line;
+				 params['date'] = date;
+				 params['date2'] = date2;
+				 params['xlName'] = xlName;
+				 params['type'] = "query";
+				$get('/realSchedule/statisticsDailyTj',params,function(result){
 					// 把数据填充到模版中
 					var tbodyHtml = template('statisticsDaily',{list:result});
 					// 把渲染好的模版html文本追加到表格中
@@ -264,7 +271,15 @@
 		});
 		$("#export").on("click",function(){
-			$get('/realSchedule/statisticsDailyTj',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,date2:date2,xlName:xlName,type:"export"},function(result){
+			 var params = {};
+			 params['gsdm'] = gsdm;
+			 params['fgsdm'] =fgsdm ;
+			 params['line'] = line;
+			 params['date'] = date;
+			 params['date2'] = date2;
+			 params['xlName'] = xlName;
+			 params['type'] = "export";
+			$get('/realSchedule/statisticsDailyTj',params,function(result){
 				window.open("/downloadFile/download?fileName=统计日报"+moment(date).format("YYYYMMDD"));
 			});
 		});
@@ -307,7 +307,7 @@
 					param[index][i] = $(this).text().split("\\")[0];
 				});
 			});
-			$post('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
+			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
 				window.open("/downloadFile/downloadList?fileName="+result.fileName);
 			});
 		});
@@ -435,7 +435,7 @@
 			<td>{{obj.fast}}</td>
 			<td>{{obj.slow}}</td>
 			<td>
-			{{if obj.fcsjActual !=null || obj.zdsjActual!=null}}
+			{{if obj.zdsjActual!=null}}
 				{{obj.jhlc}}
 			{{/if}}
 			</td>