在‘行车路单’与‘班次日报表’中显示电量接口接入的充电量

娄高锋
1 parent e3c63e2e
Showing 7 changed files with 386 additions and 210 deletions
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/jd_daily.html
src/main/resources/static/pages/forms/statement/waybill.html
@@ -39,11 +39,13 @@ public class Dlb {
 	private String jhsj;
 	//耗电
 	private Double hd=0.0;
+	//损耗
 	private Double sh=0.0;
 	private String shyy;
 	private Double zlc=0.0;
 	private int yhlx;
-	
+
+	//当前存入百公里油耗
 	private Double ns=0.0;
 	private Double fyylc=0.0;
 	private Double jhzlc=0.0;
@@ -26,13 +26,22 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	List<Dlb> obtainYlbefore(String rq,String gsdm,String fgsdm,String xlbm,String nbbm);
 	/**
 	 * 当天DLB信息
-	 * @param rq
+	 * @param rq, xlbm(like)
 	 * @return
 	 */
 	@Query(value="SELECT * FROM bsth_c_dlb  where rq=?1 and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc",nativeQuery=true)
 	List<Dlb> obtainDl(String rq,String gsbm,String fgsdm,String xlbm,String nbbm,String px);
+	/**
+	 * 当天DLB信息
+	 * @param rq, xlbm(=)
+	 * @return
+	 */
+	@Query(value="SELECT * FROM bsth_c_dlb  where rq=?1 and ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm = ?4 and nbbm like %?5% order by ?6 asc",nativeQuery=true)
+	List<Dlb> obtainDlEq(String rq,String gsbm,String fgsdm,String xlbm,String nbbm,String px);
 	@Query(value="select s from Dlb s "
 			+ " where to_days(s.rq)=to_days(?1) "
@@ -2682,6 +2682,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        double jzl = 0.0;
 		        double zlc = 0.0;
 		        String rylx="";
+		        double ccyl_ = 0.0;
+		        double jcyl_ = 0.0;
+		        double yh_ = 0.0;
+		        double jzl_ = 0.0;
 //		        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
 //		        List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
 		        List<Ylb> listYlb = ylbMap.get(jsy + nbbm);
@@ -2690,57 +2694,105 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //		        List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
 		        List<Cars> listCars = carMap.get(s.getClZbh());
 				if (listCars != null && listCars.size() > 0) {
-					if(listCars.get(0).getSfdc()!=null){
-						if (listCars.get(0).getSfdc()) {
-							type = 1;
-							if(listDlb != null)
-							for (int i = 0; i < listDlb.size(); i++) {
-								Dlb d = listDlb.get(i);
-								if (d.getLp() == null) {
-									ccyl = Arith.add(ccyl, d.getCzcd());
-									jcyl = Arith.add(jcyl, d.getJzcd());
-									yh = Arith.add(yh, d.getHd());
-									jzl = Arith.add(jzl, d.getCdl());
-									zlc = Arith.add(zlc, d.getZlc());
-								} else {
-									if (d.getLp().equals(s.getLpName())) {
-										ccyl = Arith.add(ccyl, d.getCzcd());
-										jcyl = Arith.add(jcyl, d.getJzcd());
-										yh = Arith.add(yh, d.getHd());
-										jzl = Arith.add(jzl, d.getCdl());
-										zlc = Arith.add(zlc, d.getZlc());
-									}
-								}
-			
-							}
-						} else {
-							type = 0;
-							if(listYlb != null)
-							for (int i = 0; i < listYlb.size(); i++) {
-								Ylb y = listYlb.get(i);
-								if (y.getLp() == null) {
-									ccyl = Arith.add(ccyl, y.getCzyl());
-									jcyl = Arith.add(jcyl, y.getJzyl());
-									yh = Arith.add(yh, y.getYh());
-									jzl = Arith.add(jzl, y.getJzl());
-									zlc = Arith.add(zlc, y.getZlc());
-									if(dMap.get(y.getRylx())!=null)
-										rylx=dMap.get(y.getRylx()).toString();
-								} else {
-									if (y.getLp().equals(s.getLpName())) {
-										ccyl = Arith.add(ccyl, y.getCzyl());
-										jcyl = Arith.add(jcyl, y.getJzyl());
-										yh = Arith.add(yh, y.getYh());
-										jzl = Arith.add(jzl, y.getJzl());
-										zlc = Arith.add(zlc, y.getZlc());
-										if(dMap.get(y.getRylx())!=null)
-											rylx=dMap.get(y.getRylx()).toString();
-										
-									}
-								}
-							}
-						}
-					}
+					if (listCars.get(0).getNyType() != null) {
+		                if ("1".equals(listCars.get(0).getNyType().toString())) {	//全电
+//		                    List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+		                    type = 1;
+		                    if(listDlb != null){
+			                    for (int i = 0; i < listDlb.size(); i++) {
+			                        Dlb d = listDlb.get(i);
+			                        if (d.getLp() == null) {
+			                            ccyl = Arith.add(ccyl, d.getCzcd());
+			                            jcyl = Arith.add(jcyl, d.getJzcd());
+			                            yh = Arith.add(yh, d.getHd());
+			                            jzl = Arith.add(jzl, d.getCdl());
+			                            zlc = Arith.add(zlc, d.getZlc());
+			                        } else {
+			                            if (d.getLp().equals(s.getLpName())) {
+			                                ccyl = Arith.add(ccyl, d.getCzcd());
+			                                jcyl = Arith.add(jcyl, d.getJzcd());
+			                                yh = Arith.add(yh, d.getHd());
+			                                jzl = Arith.add(jzl, d.getCdl());
+			                                zlc = Arith.add(zlc, d.getZlc());
+			                            }
+			                        }
+			                    }
+		                    }
+		                } else if("2".equals(listCars.get(0).getNyType().toString())){	//油点混合
+//		                    List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+//		                    List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+		                	type = 2;
+		                	if(listYlb != null){
+			                	for (int i = 0; i < listYlb.size(); i++) {
+			                        Ylb y = listYlb.get(i);
+			                        if (y.getLp() == null) {
+			                            ccyl = Arith.add(ccyl, y.getCzyl());
+			                            jcyl = Arith.add(jcyl, y.getJzyl());
+			                            yh = Arith.add(yh, y.getYh());
+			                            jzl = Arith.add(jzl, y.getJzl());
+			                            zlc = Arith.add(zlc, y.getZlc());
+			                            if(dMap.get(y.getRylx())!=null)
+			                            	rylx =dMap.get(y.getRylx()).toString();
+			                        } else {
+			                            if (y.getLp().equals(s.getLpName())) {
+			                                ccyl = Arith.add(ccyl, y.getCzyl());
+			                                jcyl = Arith.add(jcyl, y.getJzyl());
+			                                yh = Arith.add(yh, y.getYh());
+			                                jzl = Arith.add(jzl, y.getJzl());
+			                                zlc = Arith.add(zlc, y.getZlc());
+			                                if(dMap.get(y.getRylx())!=null)
+			                                	rylx =dMap.get(y.getRylx()).toString();
+			                            }
+			                        }
+			                    }
+		                	}
+		                	if(listDlb != null){
+			                    for (int i = 0; i < listDlb.size(); i++) {
+			                        Dlb d = listDlb.get(i);
+			                        if (d.getLp() == null) {
+			                            ccyl_ = Arith.add(ccyl_, d.getCzcd());
+			                            jcyl_ = Arith.add(jcyl_, d.getJzcd());
+			                            yh_ = Arith.add(yh_, d.getHd());
+			                            jzl_ = Arith.add(jzl, d.getCdl());
+			                        } else {
+			                            if (d.getLp().equals(s.getLpName())) {
+			                                ccyl_ = Arith.add(ccyl_, d.getCzcd());
+			                                jcyl_ = Arith.add(jcyl_, d.getJzcd());
+			                                yh_ = Arith.add(yh_, d.getHd());
+			                                jzl_ = Arith.add(jzl_, d.getCdl());
+			                            }
+			                        }
+			                    }
+		                	}
+		                } else {
+//		                    List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+		                    type = 0;
+		                    if(listYlb != null){
+			                    for (int i = 0; i < listYlb.size(); i++) {
+			                        Ylb y = listYlb.get(i);
+			                        if (y.getLp() == null) {
+			                            ccyl = Arith.add(ccyl, y.getCzyl());
+			                            jcyl = Arith.add(jcyl, y.getJzyl());
+			                            yh = Arith.add(yh, y.getYh());
+			                            jzl = Arith.add(jzl, y.getJzl());
+			                            zlc = Arith.add(zlc, y.getZlc());
+			                            if(dMap.get(y.getRylx())!=null)
+			                            	rylx =dMap.get(y.getRylx()).toString();
+			                        } else {
+			                            if (y.getLp().equals(s.getLpName())) {
+			                                ccyl = Arith.add(ccyl, y.getCzyl());
+			                                jcyl = Arith.add(jcyl, y.getJzyl());
+			                                yh = Arith.add(yh, y.getYh());
+			                                jzl = Arith.add(jzl, y.getJzl());
+			                                zlc = Arith.add(zlc, y.getZlc());
+			                                if(dMap.get(y.getRylx())!=null)
+			                                	rylx =dMap.get(y.getRylx()).toString();
+			                            }
+			                        }
+			                    }
+		                    }
+		                }
+		            }
 				}
 				double jylc=ylbMapJylc.get(line+"-"+jGh+"-"+nbbm+"-"+lpName)==null?0.0:ylbMapJylc.get(line+"-"+jGh+"-"+nbbm+"-"+lpName);
 				Map.put("jylc", jylc);
@@ -2749,6 +2801,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Map.put("yh", yh);
 		        Map.put("ccyl", ccyl);
 		        Map.put("jcyl", jcyl);
+		        Map.put("jzl_", jzl_);
+		        Map.put("yh_", yh_);
+		        Map.put("ccyl_", ccyl_);
+		        Map.put("jcyl_", jcyl_);
 		        Map.put("type", type);
 		        Map.put("zlc", zlc);
 		        Map.put("xlName", s.getXlName());
@@ -2964,8 +3020,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
                 String xls="";
                 if(Map.get("type").toString().equals("0")){
                 	xls="waybill_minhang.xls";
-                }else{
+                } else if(Map.get("type").toString().equals("1")){
                 	xls="waybill_minhang_dl.xls";
+                } else {
+                	xls="waybill_minhang_yd.xls";
                 }
                 Map.put("sheetName", jName + "-" + clZbh + "-" + lpName);
                 ee.excelReplace(list1, new Object[]{Map}, path1 + "mould/"+xls,
@@ -14,13 +14,13 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
-import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.Dictionary;
+import com.bsth.repository.oil.DlbRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.jdtest.JdtestService;
@@ -40,6 +40,8 @@ public class JdtestServiceImpl implements JdtestService {
 	@Autowired
 	YlbRepository ylbRepository;
 	@Autowired
+	DlbRepository dlbRepository;
+	@Autowired
 	DictionaryService dictionaryService;
 	@Override
 	public List<Ylxxb> cwjyList(Map<String, Object> map) {
@@ -159,13 +161,26 @@ public class JdtestServiceImpl implements JdtestService {
 		}else{
 			listYlb=ylbRepository.obtainYlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
 		}
-		Map<String, Ylb> mapYlb=new HashMap<>();
+		Map<String, Ylb> mapYlb=new HashMap<String, Ylb>();
 		for (int j = 0; j < listYlb.size(); j++) {
 			Ylb y=listYlb.get(j);
 			if(mapYlb.get(y.getXlbm()+y.getJsy()+y.getNbbm()+y.getLp())==null){
 				mapYlb.put(y.getXlbm()+y.getJsy()+y.getNbbm()+y.getLp(), y);
 			}
 		}
+		List<Dlb> listDlb=new ArrayList<Dlb>();
+		if(xlbm.equals("")){
+			listDlb=dlbRepository.obtainDl(map.get("date").toString(), gsbm, fgsbm, xlbm, "", "xlbm");
+		}else{
+			listDlb=dlbRepository.obtainDlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
+		}
+		Map<String, Dlb> mapDlb=new HashMap<String, Dlb>();
+		for (int i = 0; i < listDlb.size(); i++) {
+			Dlb d = listDlb.get(i);
+			if(mapDlb.get(d.getXlbm()+d.getJsy()+d.getNbbm()+d.getLp()) == null){
+				mapDlb.put(d.getXlbm()+d.getJsy()+d.getNbbm()+d.getLp(), d);
+			}
+		}
 		List<ScheduleRealInfo> sList;
 		List<ScheduleRealInfo> jList;
@@ -180,6 +195,7 @@ public class JdtestServiceImpl implements JdtestService {
 		double czyl_z=0.0;
 		double jzl_z=0.0;
 		double yh_z=0.0;
+		double dh_z=0.0;
 		int jhbc_z=0;
 		double jhlc_z=0.0;
 		int sjbc_z=0;
@@ -193,6 +209,7 @@ public class JdtestServiceImpl implements JdtestService {
 		double czyl_line=0.0;
 		double jzl_line=0.0;
 		double yh_line=0.0;
+		double dh_line=0.0;
 		int jhbc_line=0;
 		double jhlc_line=0.0;
 		int sjbc_line=0;
@@ -209,6 +226,7 @@ public class JdtestServiceImpl implements JdtestService {
 			double czyl=0.0;
 			double jzl=0.0;
 			double yh=0.0;
+			double dh=0.0;	//电耗
 			String rylx="";
 			if(mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
 				Ylb t=mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
@@ -225,6 +243,10 @@ public class JdtestServiceImpl implements JdtestService {
 					}
 				}
 			}
+			if(mapDlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
+				Dlb d=mapDlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
+				dh = d.getHd();
+			}
 			m.put("jylc",jylc);
 			jylc_z=Arith.add(jylc, jylc_z);
 			m.put("jzyl",jzyl);
@@ -236,7 +258,8 @@ public class JdtestServiceImpl implements JdtestService {
 			m.put("yh", yh);
 			yh_z=Arith.add(yh, yh_z);
 			m.put("rylx", rylx);
-			m.put("dh", "");
+			m.put("dh", dh);
+			dh_z=Arith.add(dh, dh_z);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
 				if(m.get("xlBm").toString().equals(s.getXlBm()) &&
@@ -263,6 +286,7 @@ public class JdtestServiceImpl implements JdtestService {
 			double jhlc=culateMileageService.culateJhgl(jList);
 			jhlc_z=Arith.add(jhlc, jhlc_z);
 			int sjbc=culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "");
+			sjbc_z=sjbc+sjbc_z;
 			double ljgl=culateMileageService.culateLjgl(sList);
 			double sjgl=culateMileageService.culateSjgl(sList);
 			double sjzlc=Arith.add(ljgl, sjgl);
@@ -284,127 +308,154 @@ public class JdtestServiceImpl implements JdtestService {
 			m.put("zlc2", zlc2);
 			listAll.add(m);
 			//线路小计
-			if (i < list.size() - 1) {
-				 if ((list.get(i+1).get("xlBm").toString()).equals(list.get(i).get("xlBm").toString())) {
-					  jylc_line=Arith.add(jylc_line, jylc);
-					  jzyl_line=Arith.add(jzyl_line, jzyl);
-					  czyl_line=Arith.add(czyl_line, czyl);
-					  jzl_line=Arith.add(jzl_line, jzl);
-					  yh_line=Arith.add(yh_line, yh);
-					  jhbc_line=jhbc_line+jhbc;
-					  jhlc_line=Arith.add(jhlc_line,jhlc);
-					  sjbc_line=sjbc_line+sjbc;
-					  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
-					  kszlc_line=Arith.add(kszlc_line,kszlc);
-					  zlc_line=Arith.add(zlc_line, zlc);
-					  zlc_line2=Arith.add(zlc_line2, zlc2);
-	             } else {
-					  jylc_line=Arith.add(jylc_line, jylc);
-	            	  jzyl_line=Arith.add(jzyl_line, jzyl);
-					  czyl_line=Arith.add(czyl_line, czyl);
-					  jzl_line=Arith.add(jzl_line, jzl);
-					  yh_line=Arith.add(yh_line, yh);
-					  jhbc_line=jhbc_line+jhbc;
-					  jhlc_line=Arith.add(jhlc_line,jhlc);
-					  sjbc_line=sjbc_line+sjbc;
-					  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
-					  kszlc_line=Arith.add(kszlc_line,kszlc);
-					  zlc_line=Arith.add(zlc_line, zlc);
-					  zlc_line2=Arith.add(zlc_line2, zlc2);
-					  
-					  Map<String, Object> mmm=new HashMap<>();
-					  mmm.put("xlName", "小计");
-					  mmm.put("lp", "");
-					  mmm.put("jGh", "");
-					  mmm.put("clZbh", "");
-					  mmm.put("jName", "");
-					  mmm.put("jhbc", jhbc_line);
-					  mmm.put("jhlc", jhlc_line);
-					  mmm.put("sjbc", sjbc_line);
-					  mmm.put("sjzlc", sjzlc_line);
-					  mmm.put("kszlc",kszlc_line);
-					  mmm.put("jylc", jylc_line);
-					  mmm.put("zlc", zlc_line);
-					  mmm.put("zlc2", zlc_line2);
-					  mmm.put("jzyl",jzyl_line);
-					  mmm.put("czyl",czyl_line);
-					  mmm.put("jzl", jzl_line);
-					  mmm.put("yh", yh_line);
-					  mmm.put("rylx", "");
-					  mmm.put("dh","");
-					  listAll.add(mmm);
-					  jylc_line=0.0;
-					  jzyl_line=0.0;
-					  czyl_line=0.0;
-					  jzl_line=0.0;
-					  yh_line=0.0;
-					  jhbc_line=0;
-					  jhlc_line=0.0;
-					  sjbc_line=0;
-					  sjzlc_line=0.0;
-					  kszlc_line=0.0;
-					  zlc_line=0.0;
-					  zlc_line2=0.0;
-	             }
-			} else {
-                if ((list.get(i).get("xlBm").toString()).equals(list.get(i - 1).get("xlBm").toString())) {
-					  jylc_line=Arith.add(jylc_line, jylc);
-					  jzyl_line=Arith.add(jzyl_line, jzyl);
-					  czyl_line=Arith.add(czyl_line, czyl);
-					  jzl_line=Arith.add(jzl_line, jzl);
-					  yh_line=Arith.add(yh_line, yh);
-					  jhbc_line=jhbc_line+jhbc;
-					  jhlc_line=Arith.add(jhlc_line,jhlc);
-					  sjbc_line=sjbc_line+sjbc;
-					  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
-					  kszlc_line=Arith.add(kszlc_line,kszlc);
-					  zlc_line=Arith.add(zlc_line, zlc);
-					  zlc_line2=Arith.add(zlc_line2, zlc2);
-					  Map<String, Object> mmm=new HashMap<>();
-					  mmm.put("xlName", "小计");
-					  mmm.put("lp", "");
-					  mmm.put("jGh", "");
-					  mmm.put("clZbh", "");
-					  mmm.put("jName", "");
-					  mmm.put("jhbc", jhbc_line);
-					  mmm.put("jhlc", jhlc_line);
-					  mmm.put("sjbc", sjbc_line);
-					  mmm.put("sjzlc", sjzlc_line);
-					  mmm.put("kszlc",kszlc_line);
-					  mmm.put("jylc", jylc_line);
-					  mmm.put("zlc", zlc_line);
-					  mmm.put("zlc2", zlc_line2);
-					  mmm.put("jzyl",jzyl_line);
-					  mmm.put("czyl",czyl_line);
-					  mmm.put("jzl", jzl_line);
-					  mmm.put("yh", yh_line);
-					  mmm.put("rylx", "");
-					  mmm.put("dh","");
-					  listAll.add(mmm);
-                } else {
-					 
-					 Map<String, Object> mmm=new HashMap<>();
-					  mmm.put("xlName", "小计");
-					  mmm.put("lp", "");
-					  mmm.put("jGh", "");
-					  mmm.put("clZbh", "");
-					  mmm.put("jName", "");
-					  mmm.put("jhbc", jhbc);
-					  mmm.put("jhlc", jhlc);
-					  mmm.put("sjbc", sjbc);
-					  mmm.put("sjzlc", sjzlc);
-					  mmm.put("kszlc",kszlc);
-					  mmm.put("jylc", jylc_line);
-					  mmm.put("zlc", zlc);
-					  mmm.put("zlc2", zlc2);
-					  mmm.put("jzyl",jzyl);
-					  mmm.put("czyl",czyl);
-					  mmm.put("jzl", jzl);
-					  mmm.put("yh", yh);
-					  mmm.put("rylx", "");
-					  mmm.put("dh","");
-					  listAll.add(mmm);
-                }
+			if(list.size()==1){
+				 Map<String, Object> mmm=new HashMap<>();
+				  mmm.put("xlName", "小计");
+				  mmm.put("lp", "");
+				  mmm.put("jGh", "");
+				  mmm.put("clZbh", "");
+				  mmm.put("jName", "");
+				  mmm.put("jhbc", jhbc);
+				  mmm.put("jhlc", jhlc);
+				  mmm.put("sjbc", sjbc);
+				  mmm.put("sjzlc", sjzlc);
+				  mmm.put("kszlc",kszlc);
+				  mmm.put("jylc", jylc_line);
+				  mmm.put("zlc", zlc);
+				  mmm.put("zlc2", zlc2);
+				  mmm.put("jzyl",jzyl);
+				  mmm.put("czyl",czyl);
+				  mmm.put("jzl", jzl);
+				  mmm.put("yh", yh);
+				  mmm.put("rylx", "");
+				  mmm.put("dh", dh);
+				  listAll.add(mmm);
+				}else{
+					if (i < list.size() - 1) {
+					   if ((list.get(i+1).get("xlBm").toString()).equals(list.get(i).get("xlBm").toString())) {
+						  jylc_line=Arith.add(jylc_line, jylc);
+						  jzyl_line=Arith.add(jzyl_line, jzyl);
+						  czyl_line=Arith.add(czyl_line, czyl);
+						  jzl_line=Arith.add(jzl_line, jzl);
+						  yh_line=Arith.add(yh_line, yh);
+						  dh_line=Arith.add(dh_line, dh);
+						  jhbc_line=jhbc_line+jhbc;
+						  jhlc_line=Arith.add(jhlc_line,jhlc);
+						  sjbc_line=sjbc_line+sjbc;
+						  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
+						  kszlc_line=Arith.add(kszlc_line,kszlc);
+						  zlc_line=Arith.add(zlc_line, zlc);
+						  zlc_line2=Arith.add(zlc_line2, zlc2);
+		               } else {
+						  jylc_line=Arith.add(jylc_line, jylc);
+		            	  jzyl_line=Arith.add(jzyl_line, jzyl);
+						  czyl_line=Arith.add(czyl_line, czyl);
+						  jzl_line=Arith.add(jzl_line, jzl);
+						  yh_line=Arith.add(yh_line, yh);
+						  dh_line=Arith.add(dh_line, dh);
+						  jhbc_line=jhbc_line+jhbc;
+						  jhlc_line=Arith.add(jhlc_line,jhlc);
+						  sjbc_line=sjbc_line+sjbc;
+						  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
+						  kszlc_line=Arith.add(kszlc_line,kszlc);
+						  zlc_line=Arith.add(zlc_line, zlc);
+						  zlc_line2=Arith.add(zlc_line2, zlc2);
+						  
+						  Map<String, Object> mmm=new HashMap<>();
+						  mmm.put("xlName", "小计");
+						  mmm.put("lp", "");
+						  mmm.put("jGh", "");
+						  mmm.put("clZbh", "");
+						  mmm.put("jName", "");
+						  mmm.put("jhbc", jhbc_line);
+						  mmm.put("jhlc", jhlc_line);
+						  mmm.put("sjbc", sjbc_line);
+						  mmm.put("sjzlc", sjzlc_line);
+						  mmm.put("kszlc",kszlc_line);
+						  mmm.put("jylc", jylc_line);
+						  mmm.put("zlc", zlc_line);
+						  mmm.put("zlc2", zlc_line2);
+						  mmm.put("jzyl",jzyl_line);
+						  mmm.put("czyl",czyl_line);
+						  mmm.put("jzl", jzl_line);
+						  mmm.put("yh", yh_line);
+						  mmm.put("rylx", "");
+						  mmm.put("dh", dh_line);
+						  listAll.add(mmm);
+						  jylc_line=0.0;
+						  jzyl_line=0.0;
+						  czyl_line=0.0;
+						  jzl_line=0.0;
+						  yh_line=0.0;
+						  dh_line=0.0;
+						  jhbc_line=0;
+						  jhlc_line=0.0;
+						  sjbc_line=0;
+						  sjzlc_line=0.0;
+						  kszlc_line=0.0;
+						  zlc_line=0.0;
+						  zlc_line2=0.0;
+		             }
+				} else {
+	                if ((list.get(i).get("xlBm").toString()).equals(list.get(i - 1).get("xlBm").toString())) {
+						  jylc_line=Arith.add(jylc_line, jylc);
+						  jzyl_line=Arith.add(jzyl_line, jzyl);
+						  czyl_line=Arith.add(czyl_line, czyl);
+						  jzl_line=Arith.add(jzl_line, jzl);
+						  yh_line=Arith.add(yh_line, yh);
+						  dh_line=Arith.add(dh_line, dh);
+						  jhbc_line=jhbc_line+jhbc;
+						  jhlc_line=Arith.add(jhlc_line,jhlc);
+						  sjbc_line=sjbc_line+sjbc;
+						  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
+						  kszlc_line=Arith.add(kszlc_line,kszlc);
+						  zlc_line=Arith.add(zlc_line, zlc);
+						  zlc_line2=Arith.add(zlc_line2, zlc2);
+						  Map<String, Object> mmm=new HashMap<>();
+						  mmm.put("xlName", "小计");
+						  mmm.put("lp", "");
+						  mmm.put("jGh", "");
+						  mmm.put("clZbh", "");
+						  mmm.put("jName", "");
+						  mmm.put("jhbc", jhbc_line);
+						  mmm.put("jhlc", jhlc_line);
+						  mmm.put("sjbc", sjbc_line);
+						  mmm.put("sjzlc", sjzlc_line);
+						  mmm.put("kszlc",kszlc_line);
+						  mmm.put("jylc", jylc_line);
+						  mmm.put("zlc", zlc_line);
+						  mmm.put("zlc2", zlc_line2);
+						  mmm.put("jzyl",jzyl_line);
+						  mmm.put("czyl",czyl_line);
+						  mmm.put("jzl", jzl_line);
+						  mmm.put("yh", yh_line);
+						  mmm.put("rylx", "");
+						  mmm.put("dh", dh_line);
+						  listAll.add(mmm);
+	                } else {
+						 Map<String, Object> mmm=new HashMap<>();
+						  mmm.put("xlName", "小计");
+						  mmm.put("lp", "");
+						  mmm.put("jGh", "");
+						  mmm.put("clZbh", "");
+						  mmm.put("jName", "");
+						  mmm.put("jhbc", jhbc);
+						  mmm.put("jhlc", jhlc);
+						  mmm.put("sjbc", sjbc);
+						  mmm.put("sjzlc", sjzlc);
+						  mmm.put("kszlc",kszlc);
+						  mmm.put("jylc", jylc_line);
+						  mmm.put("zlc", zlc);
+						  mmm.put("zlc2", zlc2);
+						  mmm.put("jzyl",jzyl);
+						  mmm.put("czyl",czyl);
+						  mmm.put("jzl", jzl);
+						  mmm.put("yh", yh);
+						  mmm.put("rylx", "");
+						  mmm.put("dh", dh);
+						  listAll.add(mmm);
+	                }
+				}
 			}
 		}
 		Map<String, Object> mmp=new HashMap<>();
@@ -426,7 +477,7 @@ public class JdtestServiceImpl implements JdtestService {
 		mmp.put("jzl", jzl_z);
 		mmp.put("yh", yh_z);
 		mmp.put("rylx", "");
-		mmp.put("dh","");
+		mmp.put("dh", dh_z);
 		listAll.add(mmp);
 		return listAll;
 	}
@@ -1162,8 +1162,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String xls = "";
         if (map.get("type").toString().equals("0")) {
             xls = "waybill_minhang.xls";
+        } else if (map.get("type").toString().equals("1")){
+        	xls = "waybill_minhang_dl.xls";
         } else {
-            xls = "waybill_minhang_dl.xls";
+        	xls = "waybill_minhang_yd.xls";
         }
@@ -4610,10 +4612,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Double jzl = 0.0;
         Double zlc = 0.0;
         String rylx="";
+        Double ccyl_ = 0.0;
+        Double jcyl_ = 0.0;
+        Double yh_ = 0.0;
+        Double jzl_ = 0.0;
         List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
         if (listCars.size() > 0) {
-            if (listCars.get(0).getSfdc() != null) {
-                if (listCars.get(0).getSfdc()) {
+            if (listCars.get(0).getNyType() != null) {
+                if ("1".equals(listCars.get(0).getNyType().toString())) {	//全电
                     List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
                     type = 1;
                     for (int i = 0; i < listDlb.size(); i++) {
@@ -4633,7 +4639,48 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                                 zlc = Arith.add(zlc, d.getZlc());
                             }
                         }
-
+                    }
+                } else if("2".equals(listCars.get(0).getNyType().toString())){	//油点混合
+                    List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+                    List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+                	type = 2;
+                	for (int i = 0; i < listYlb.size(); i++) {
+                        Ylb y = listYlb.get(i);
+                        if (y.getLp() == null) {
+                            ccyl = Arith.add(ccyl, y.getCzyl());
+                            jcyl = Arith.add(jcyl, y.getJzyl());
+                            yh = Arith.add(yh, y.getYh());
+                            jzl = Arith.add(jzl, y.getJzl());
+                            zlc = Arith.add(zlc, y.getZlc());
+                            if(dMap.get(y.getRylx())!=null)
+                            	rylx =dMap.get(y.getRylx()).toString();
+                        } else {
+                            if (y.getLp().equals(s.getLpName())) {
+                                ccyl = Arith.add(ccyl, y.getCzyl());
+                                jcyl = Arith.add(jcyl, y.getJzyl());
+                                yh = Arith.add(yh, y.getYh());
+                                jzl = Arith.add(jzl, y.getJzl());
+                                zlc = Arith.add(zlc, y.getZlc());
+                                if(dMap.get(y.getRylx())!=null)
+                                	rylx =dMap.get(y.getRylx()).toString();
+                            }
+                        }
+                    }
+                    for (int i = 0; i < listDlb.size(); i++) {
+                        Dlb d = listDlb.get(i);
+                        if (d.getLp() == null) {
+                            ccyl_ = Arith.add(ccyl_, d.getCzcd());
+                            jcyl_ = Arith.add(jcyl_, d.getJzcd());
+                            yh_ = Arith.add(yh_, d.getHd());
+                            jzl_ = Arith.add(jzl, d.getCdl());
+                        } else {
+                            if (d.getLp().equals(s.getLpName())) {
+                                ccyl_ = Arith.add(ccyl_, d.getCzcd());
+                                jcyl_ = Arith.add(jcyl_, d.getJzcd());
+                                yh_ = Arith.add(yh_, d.getHd());
+                                jzl_ = Arith.add(jzl_, d.getCdl());
+                            }
+                        }
                     }
                 } else {
                     List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
@@ -4669,6 +4716,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("yh", yh);
         map.put("ccyl", ccyl);
         map.put("jcyl", jcyl);
+        map.put("jzl_", jzl_);
+        map.put("yh_", yh_);
+        map.put("ccyl_", ccyl_);
+        map.put("jcyl_", jcyl_);
         map.put("type", type);
         map.put("zlc", zlc);
         map.put("xlName", s.getXlName());
@@ -5203,20 +5254,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 		fcsjm = String.valueOf(fcsjActural_ - fcsj_);
                 	}
                 }
-                String[] dfsj_s =schedule.getDfsj().split(":");
-                Long dfsj_ = Long.parseLong(dfsj_s[0]) * 60 + Long.parseLong(dfsj_s[1]);
-                if ((dfsj_ - fcsjActural_) > 0) {
-                	if(dfsj_ - fcsjActural_>1200){
-                		dfsjm=String.valueOf(1440-(dfsj_ - fcsjActural_));
-                	}else{
-                		dfsjk = String.valueOf(dfsj_ - fcsjActural_);
-                	}
-                } else {
-                	if(fcsjActural_ - dfsj_>1200){
-                		dfsjk=  String.valueOf(1440-(fcsjActural_ - dfsj_));
-                	}else{
-                    	dfsjm = String.valueOf(fcsjActural_ - dfsj_);
-                	}
+                if(df.equals("df")){
+	                String[] dfsj_s =schedule.getDfsj().split(":");
+	                Long dfsj_ = Long.parseLong(dfsj_s[0]) * 60 + Long.parseLong(dfsj_s[1]);
+	                if ((dfsj_ - fcsjActural_) > 0) {
+	                	if(dfsj_ - fcsjActural_>1200){
+	                		dfsjm=String.valueOf(1440-(dfsj_ - fcsjActural_));
+	                	}else{
+	                		dfsjk = String.valueOf(dfsj_ - fcsjActural_);
+	                	}
+	                } else {
+	                	if(fcsjActural_ - dfsj_>1200){
+	                		dfsjk=  String.valueOf(1440-(fcsjActural_ - dfsj_));
+	                	}else{
+	                    	dfsjm = String.valueOf(fcsjActural_ - dfsj_);
+	                	}
+	                }
                 }
             }
             if(df.equals("df")){
@@ -60,11 +60,11 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="18">调度班次日报</th>
+								<th colspan="19">调度班次日报</th>
 							</tr>
 							<tr>
 								<td><label>线路</label></td>
-								<td colspan="8"><span id="form_line">&nbsp;</span></td>
+								<td colspan="9"><span id="form_line">&nbsp;</span></td>
 								<td><label >时间</label></td>
 								<td colspan="8"><span id="form_date">&nbsp;</span></td>
 							</tr>
@@ -118,11 +118,9 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
-		var fage=false;
+		var fage=true;
 		var xlList;
 		var obj = [];
-		
-		 
 		$.get('/report/lineList',function(result){
 			xlList=result;
 			$.get('/user/companyData', function(result){
@@ -131,13 +129,15 @@
 				for(var i = 0; i < obj.length; i++){
 					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
 				}
-				
+
 				if(obj.length ==0){
 					 $("#gsdmDiv_daily").css('display','none');
 				}else if(obj.length ==1){
 					 $("#gsdmDiv_daily").css('display','none');
-					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+					if(obj[0].children.length == 1  || obj[0].children.length ==0){
 						$('#fgsdmDiv_daily').css('display','none');
+						fage=false;
+					}
 				}
 				$('#gsdmDaily').html(options);
 				updateCompany();
@@ -146,7 +146,10 @@
 		$("#gsdmDaily").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdmDaily').val();
-			var options = '<option value="">全部分公司</option>';
+			var options = '';
+			if(fage){
+				options='<option value="">全部分公司</option>';
+			}
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
@@ -267,7 +270,7 @@
 			<td>{{obj.jzl}}</td>
 			<td>{{obj.yh}}</td>
 			<td>{{obj.rylx}}</td>
-			<td>&nbsp;</td>
+			<td>{{obj.dh}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -450,11 +450,11 @@
           <td colspan="4">本日耗电 {{yh}}度</td>
 		{{/if}}
 		{{if type==2}}  
-          <td colspan="2">出场存电 {{ccyl}}%</td>
-          <td colspan="2">充电量 {{jzl}}度</td>
-          <td colspan="2">进场存电 {{jcyl}}%</td>
+          <td colspan="2">出场存电 {{ccyl_}}%<br/>出场存油{{ccyl}}升</td>
+          <td colspan="2">充电量 {{jzl_}}度<br/>加注量{{jzl}}升</td>
+          <td colspan="2">进场存电 {{jcyl_}}%<br/>进场存油 {{jcyl}}升</td>
           <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗电 {{yh}}度</td>
+          <td colspan="4">本日耗电 {{yh_}}度<br/>本日耗油 {{yh}}升</td>
 		{{/if}}
       </tr>
       <tr>