Merge branch 'pudong' of http://192.168.168.201:8888/panzhaov5/bsth_control into pudong

王通
2 parents 8be72ebe b5963449
Showing 20 changed files with 871 additions and 63 deletions
src/main/java/com/bsth/controller/jdtest/JdTestController.java
src/main/java/com/bsth/controller/oil/CwjyController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/jdtest/JdtestService.java
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
src/main/java/com/bsth/service/oil/CwjyService.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/electricity/list/list.html
src/main/resources/static/pages/forms/mould/jd_daily.xls
src/main/resources/static/pages/forms/mould/waybill_minhang.xls
src/main/resources/static/pages/forms/statement/jd_daily.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/oil/add.html
src/main/resources/static/pages/oil/jyglList.html
src/main/resources/static/pages/oil/list_ph.html
+package com.bsth.controller.jdtest;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.bsth.controller.BaseController;
+import com.bsth.data.BasicData;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.entity.sys.Dictionary;
+import com.bsth.service.jdtest.JdtestService;
+import com.bsth.service.oil.YlbService;
+import com.bsth.service.sys.DictionaryService;
+import com.bsth.util.Arith;
+import com.bsth.util.ReportUtils;
+
+@RestController
+@RequestMapping("jdtest")
+public class JdTestController extends BaseController<Ylb, Integer>{
+	@Autowired
+	YlbService ylbService;
+	@Autowired
+	DictionaryService dictionaryService;
+	@Autowired
+	JdtestService jdtestService;
+	
+	/*
+	 * 油量平衡表导出
+	 */
+	@RequestMapping(value = "/listExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		Map<String, Object> dMap=new HashMap<>();
+		dMap.put("dGroup", "oilType");
+		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
+		while (it.hasNext()) {
+			Dictionary d=it.next();
+			dMap.put(d.getdCode(), d.getdName());
+		}
+		
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Ylb> ylb= ylbService.listYlb(map);
+//		(new CustomerSpecs<Ylb>(map)).iterator();
+		List<Map<String, Object>>  resList = new ArrayList<Map<String, Object>>();
+		for (Ylb y : ylb) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("rq", sdfMonth.format(y.getRq()));
+			m.put("gsname",y.getGsname() );
+			m.put("fgsname", y.getFgsname());
+			m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			m.put("nbbm", y.getNbbm());
+			m.put("jsy", y.getJsy());
+			m.put("name", y.getName());
+			m.put("jzl", y.getJzl()<=0?"0":y.getJzl());
+			m.put("czlc", "0");
+			m.put("jzlc", "0");
+			m.put("czyl", y.getCzyl()<=0?"0":y.getCzyl());
+			m.put("jzyl", y.getJzyl()<=0?"0":y.getJzyl());
+			m.put("yh", y.getYh()<=0?"0":y.getYh());
+			String rylx="";
+			if(y.getRylx()!=null){
+				if(dMap.get(y.getRylx())==null){
+					rylx="";
+				}else{
+					rylx=dMap.get(y.getRylx()).toString();
+				}
+			}
+			m.put("rylx", rylx);
+			m.put("ns", y.getNs()==null?"0":y.getNs());
+			String shyy ="无";
+			if(y.getShyy()!=null){
+				shyy=y.getShyy();
+				 if(shyy.equals("1")){shyy="票务用油";}
+				 else if(shyy.equals("2")){shyy="保养用油";}
+				 else if(shyy.equals("3")){shyy="报废车用油";}
+				 else if(shyy.equals("4")){shyy="其它用油";}
+				 else if(shyy.equals("5")){shyy="人保部";}
+				 else if(shyy.equals("6")){shyy="车队";}
+				 else if(shyy.equals("7")){shyy="车间(高保)";}
+				 else if(shyy.equals("8")){shyy="车间(小修)";}
+				 else{shyy ="无";}
+			}
+			m.put("shyy", shyy);
+			m.put("sh", y.getSh()<=0?"0":y.getSh());
+			m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
+			m.put("bglyh", y.getBglyh());
+			m.put("zyh", Arith.add(y.getSh(), y.getYh()));
+			resList.add(m);
+		}
+		try {
+			map.put("sheetName", map.get("rq"));
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
+				path+"export/"+map.get("rq").toString()+ "进出场存油量.xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+			
+		return resList;
+		
+	}
+	
+	/*
+	 * 场外加油匹配当天线路数据
+	 */
+	@RequestMapping(value = "/cwjyList",method = RequestMethod.GET)
+	public List<Ylxxb> cwjyList(@RequestParam Map<String, Object> map){
+		List<Ylxxb> cwjyList=jdtestService.cwjyList(map);
+		return cwjyList;
+	}
+	
+	/*
+	 * 油量路单报表
+	 */
+	@RequestMapping(value="/daily",method = RequestMethod.GET)
+	public List<Map<String, Object>> daily(@RequestParam Map<String, Object> map){
+		List<Map<String, Object>> list=jdtestService.daily(map);
+		
+		if(map.get("type").toString().equals("export")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			ReportUtils ee = new ReportUtils();
+			Map<String, Object> m=new HashMap<>();
+		
+			try {
+				String lineName = map.get("lineName").toString();
+				String date = map.get("date").toString();
+				m.put("line", lineName);
+				m.put("date", date);
+				listI.add(list.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path + "mould/jd_daily.xls",
+						path + "export/" + date
+						+ "-" + lineName + "-班次日报表.xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return list;
+	}
+	
+}
@@ -62,6 +62,12 @@ public class CwjyController extends BaseController&lt;Cwjy, Integer&gt;{
 		return pagequery;
 	}
+	@RequestMapping(value = "/cwjyList",method = RequestMethod.GET)
+	public List<Ylxxb> cwjyList(@RequestParam Map<String, Object> map){
+		List<Ylxxb> cwjyList=service.cwjyList(map);
+		return cwjyList;
+	}
+	
 	@RequestMapping(value="/bynbbm",method = RequestMethod.GET)
 	public Ylxxb bynbbm(@RequestParam Map<String, Object> map){
@@ -26,9 +26,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.oil.Ylb;
+import com.bsth.entity.sys.Dictionary;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.oil.YlbService;
+import com.bsth.service.sys.DictionaryService;
 import com.bsth.util.Arith;
 import com.bsth.util.ReportUtils;
 import com.google.common.base.Splitter;
@@ -38,7 +40,8 @@ import com.google.common.base.Splitter;
 public class YlbController extends BaseController<Ylb, Integer>{
 	@Autowired
 	YlbService ylbService;
-	
+	@Autowired
+	DictionaryService dictionaryService;
 	@RequestMapping(value = "/saveYlb",method = RequestMethod.POST)
 	public Map<String, Object> saveYlb(Ylb t){
 //		SysUser user = SecurityUtils.getCurrentUser();
@@ -245,9 +248,18 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
 				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		Map<String, Object> dMap=new HashMap<>();
+		dMap.put("dGroup", "oilType");
+		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
+		while (it.hasNext()) {
+			Dictionary d=it.next();
+			dMap.put(d.getdCode(), d.getdName());
+		}
+		
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
 		List<Ylb> ylb= ylbService.listYlb(map);
+		
 //		(new CustomerSpecs<Ylb>(map)).iterator();
 		List<Map<String, Object>>  resList = new ArrayList<Map<String, Object>>();
 		for (Ylb y : ylb) {
@@ -271,8 +283,13 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("yh", y.getYh()<=0?"0":y.getYh());
 			String rylx="";
 			if(y.getRylx()!=null){
-				if(y.getRylx().equals("0")){rylx="0号柴油";}
-				if(y.getRylx().equals("1")){rylx="负10号柴油";}
+				/*if(y.getRylx().equals("0")){rylx="0号柴油";}
+				if(y.getRylx().equals("1")){rylx="负10号柴油";}*/
+				if(dMap.get(y.getRylx())==null){
+					rylx="";
+				}else{
+					rylx=dMap.get(y.getRylx()).toString();
+				}
 			}
 			m.put("rylx", rylx);
 			m.put("ns", y.getNs()==null?"0":y.getNs());
@@ -282,9 +282,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
+	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName,@RequestParam String jGh, @RequestParam String clZbh,
 												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
-		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
+		return scheduleRealInfoService.exportWaybill(jName,jGh, clZbh, lpName,date,line);
 	}
 	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
@@ -370,9 +370,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @return
 	 */
 	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
 			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
+		return scheduleRealInfoService.queryListWaybill(jGh, clZbh,lpName,date,line);
 	}
 	/**
@@ -31,7 +31,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
-	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
+	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,min(s.jName) from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.jGh,s.clZbh,s.lpName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
 	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 GROUP BY s.clZbh ")
@@ -193,10 +193,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate,s.jName as jName ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName,jName ORDER BY clZbh,realExecDate,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate,s.jName as jName ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName,jName ORDER BY clZbh,realExecDate,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
 	List<Map<String,Object>> yesterdayDataList_eq(String line,String date,String gsbm,String fgsbm,String nbbm);
 	@Query(value="select s from ScheduleRealInfo s where s.scheduleDateStr = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
@@ -37,6 +37,7 @@ import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.Dictionary;
 import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.LineRepository;
@@ -47,6 +48,7 @@ import com.bsth.service.BusIntervalService;
 import com.bsth.service.LineService;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.schedule.PeopleCarPlanService;
+import com.bsth.service.sys.DictionaryService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.Arith;
 import com.bsth.util.ComparableChild;
@@ -86,7 +88,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
     @Autowired
     CarsRepository carsRepository;
-    
+    @Autowired
+    DictionaryService dictionaryService;
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
@@ -2620,6 +2623,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
     @Override
     public Map<String, Object> exportWaybillMore(Map<String, Object> map) {
+    	Map<String, Object> dMap=new HashMap<>();
+		dMap.put("dGroup", "oilType");
+		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
+		while (it.hasNext()) {
+			Dictionary d=it.next();
+			dMap.put(d.getdCode(), d.getdName());
+		}
+    	
         String date = map.get("date").toString();
         String line = map.get("line").toString();
         String lineName = map.get("lineName").toString();
@@ -2731,6 +2742,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Double yh = 0.0;
 		        Double jzl = 0.0;
 		        Double zlc = 0.0;
+		        String rylx="";
 //		        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);
@@ -2773,6 +2785,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 									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());
@@ -2780,13 +2794,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 										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();
+										
 									}
 								}
 							}
 						}
 					}
 				}
-		        
+		        Map.put("rylx", "加注类别:"+rylx);
 		        Map.put("jzl", jzl);
 		        Map.put("yh", yh);
 		        Map.put("ccyl", ccyl);
+package com.bsth.service.jdtest;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.oil.Ylxxb;
+
+public interface JdtestService {
+	public List<Ylxxb> cwjyList(Map<String, Object> map);
+	
+	public List<Map<String, Object>> daily(Map<String, Object> map);
+}
+package com.bsth.service.jdtest.impl;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.YlbRepository;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.jdtest.JdtestService;
+import com.bsth.service.report.CulateMileageService;
+import com.bsth.service.sys.DictionaryService;
+import com.bsth.util.Arith;
+
+@Service
+public class JdtestServiceImpl implements JdtestService {
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	@Autowired
+	CulateMileageService culateMileageService;
+	@Autowired
+	ScheduleRealInfoRepository scheduleRealInfoRepository;
+	@Autowired
+	YlbRepository ylbRepository;
+	@Autowired
+	DictionaryService dictionaryService;
+	@Override
+	public List<Ylxxb> cwjyList(Map<String, Object> map) {
+		String rq=map.get("rq").toString();
+		String nbbm=map.get("nbbh").toString();
+		String gsdm=map.get("gsdm_like").toString();
+		
+		String fgsdm=map.get("fgsdm_like").toString();
+		String line =map.get("line_like").toString().trim();
+		boolean type=false;
+		if(map.get("type")!=null){
+			type=true;
+		}
+		String sql="select a.nbbm,a.gsdm,a.fgsdm,IFNULL(b.id,0) as id,IFNULL(b.jzl,0) as jzl,"
+		+ " IFNULL(b.jyggh,0) as jyggh,IFNULL(b.jsy,0) as jsy,IFNULL(b.stationid,0) as stationid ,"
+		+ " IFNULL(b.yj,0) as yj,IFNULL(b.nylx,0) as nylx,IFNULL(b.bz,'') as bz,IFNULL(c.jsy,'') as ldgh ,"
+		+ " IFNULL(c.xlname,c.linename) as xlname  from "
+		+ " (select * from bsth_c_cwjy where  gsdm='"+gsdm+"' and fgsdm='"+fgsdm+"') a "
+		+ " left join (select * from bsth_c_ylxxb where yyrq='"+rq+"' and gsdm='"+gsdm+"' and jylx=1) b"
+		+ " on a.nbbm=b.nbbm LEFT JOIN (select u.nbbm,u.jsy,v.linename,v.xlname,v.xlbm from(select a.nbbm,GROUP_CONCAT(a.jsy) as jsy "
+		+ " from (select nbbm,jsy from bsth_c_ylb x where x.rq='"+rq+"' "
+		+ " and x.ssgsdm='"+gsdm+"' and x.fgsdm='"+fgsdm+"' group by nbbm,jsy ) a  group by a.nbbm) u"
+		+ " LEFT JOIN(select o.nbbm,GROUP_CONCAT(o.xlbm) xlbm ,GROUP_CONCAT(o.linename) as xlname,"
+		+ " GROUP_CONCAT(p.`name`)  as linename from (select nbbm,xlbm,linename from bsth_c_ylb "
+		+ " where rq='"+rq+"' and ssgsdm='"+gsdm+"' and fgsdm='"+fgsdm+"' group by nbbm,xlbm,linename) o "
+		+ " LEFT JOIN bsth_c_line p on o.xlbm=p.line_code group by o.nbbm ) v on u.nbbm=v.nbbm) c "
+		+ " on a.nbbm=c.nbbm where 1=1 ";
+		if(!nbbm.equals("")){
+			sql +=" and a.nbbm like '%"+nbbm+"%'";
+		}
+		if(!line.equals("")){
+			sql += " and c.xlbm ='"+line+"'";
+		}
+		if(type){
+			sql +=" and c.xlbm is not null";
+		}
+		sql +=" order by xlname desc";
+		
+		List<Ylxxb> yList= jdbcTemplate.query(sql,
+				 new RowMapper<Ylxxb>(){
+			 @Override
+			 public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Ylxxb t=new Ylxxb();
+				 t.setId(rs.getInt("id"));
+				 t.setGsdm(rs.getString("gsdm"));
+				 t.setFgsdm(rs.getString("fgsdm"));
+				 t.setNbbm(rs.getString("nbbm"));
+				 t.setJyggh(rs.getString("jyggh"));
+				 t.setJsy(rs.getString("jsy"));
+				 t.setJzl(rs.getDouble("jzl"));
+				 t.setStationid(rs.getString("stationid"));
+				 t.setNylx(rs.getInt("nylx"));
+				 t.setYj(rs.getDouble("yj"));
+				 t.setBz(rs.getString("bz"));
+				 t.setLdgh(rs.getString("ldgh"));
+				 t.setLinename(rs.getString("xlname"));
+				 return t;
+			 }
+		});
+		return yList;
+	}
+
+
+	@Override
+	public List<Map<String, Object>> daily(Map<String, Object> map) {
+		String xlbm="";;
+		if(map.get("line")!=null){
+			xlbm=map.get("line").toString().trim();
+		}
+				
+		String sql="select r.cl_zbh,r.j_gh,r.lp_name "
+				+ " from bsth_c_s_sp_info_real r where "
+				+ "r.schedule_date_str = '"+map.get("date").toString()+"' "
+				+ " and r.xl_bm = '"+xlbm+"' group by  r.cl_zbh,r.j_gh,r.lp_name order by r.cl_zbh";
+		
+		List<Map<String, Object>> list = jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
+			@Override
+			public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Map<String, Object> m=new HashMap<>();
+				m.put("lp", arg0.getString("lp_name"));
+				m.put("jGh", arg0.getString("j_gh"));
+				m.put("clZbh", arg0.getString("cl_zbh"));
+				return m;
+			}
+		});
+		Map<String, Object> dMap=new HashMap<>();
+		dMap.put("dGroup", "oilType");
+		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
+		while (it.hasNext()) {
+			Dictionary d=it.next();
+			dMap.put(d.getdCode(), d.getdName());
+		}
+		
+		List<Ylb> listYlb= ylbRepository.obtainYlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
+		Map<String, Ylb> mapYlb=new HashMap<>();
+		for (int j = 0; j < listYlb.size(); j++) {
+			Ylb y=listYlb.get(j);
+			if(mapYlb.get(y.getJsy()+y.getNbbm()+y.getLp())==null){
+				mapYlb.put(y.getJsy()+y.getNbbm()+y.getLp(), y);
+			}
+		}
+		
+		List<ScheduleRealInfo> sList;
+		List<ScheduleRealInfo> jList;
+		List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
+		double jzyl_z=0.0;
+		double czyl_z=0.0;
+		double jzl_z=0.0;
+		double yh_z=0.0;
+		int jhbc_z=0;
+		double jhlc_z=0.0;
+		int sjbc_z=0;
+		double sjzlc_z=0.0;
+		double kszlc_z=0.0;
+		double zlc_z=0.0;
+		for(int i=0;i<list.size();i++){
+			sList =new ArrayList<ScheduleRealInfo>();
+			jList =new ArrayList<ScheduleRealInfo>();
+			Map<String, Object> m=list.get(i);
+			double jzyl=0.0;
+			double czyl=0.0;
+			double jzl=0.0;
+			double yh=0.0;
+			String rylx="";
+			
+			if(mapYlb.get(m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
+				Ylb t=mapYlb.get(m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
+				jzyl=t.getJzyl();
+				czyl=t.getCzyl();
+				jzl=t.getJzl();
+				yh=t.getYh();
+				if(t.getRylx()!=null){
+					if(dMap.get(t.getRylx())==null){
+						rylx="";
+					}else{
+						rylx=dMap.get(t.getRylx()).toString();
+					}
+				}
+			}
+			m.put("jzyl",jzyl);
+			jzyl_z=Arith.add(jzyl, jzyl_z);
+			m.put("czyl", czyl);
+			czyl_z=Arith.add(czyl, czyl_z);
+			m.put("jzl", jzl);
+			jzl_z=Arith.add(jzl, jzl_z);
+			m.put("yh", yh);
+			yh_z=Arith.add(yh, yh_z);
+			m.put("rylx", rylx);
+			m.put("dh", "");
+			for (int j = 0; j < lists.size(); j++) {
+				ScheduleRealInfo s=lists.get(j);
+				if(m.get("clZbh").toString().equals(s.getClZbh()) &&
+				   m.get("jGh").toString().equals(s.getjGh()) &&
+				   m.get("lp").toString().equals(s.getLpName()) ){
+							jList.add(s);
+					 Set<ChildTaskPlan> cts = s.getcTasks();
+			            if(cts != null && cts.size() > 0){
+			            	sList.add(s);
+			            }else{
+				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+				            	sList.add(s);
+				            }
+			            }
+					
+				}
+			}
+			
+			m.put("jName", jList.get(0).getjName());
+
+			int jhbc=culateMileageService.culateJhbc(jList, "");
+			jhbc_z=jhbc+jhbc_z;
+			double jhlc=culateMileageService.culateJhgl(jList);
+			jhlc_z=Arith.add(jhlc, jhlc_z);
+			int sjbc=culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "");
+			double ljgl=culateMileageService.culateLjgl(sList);
+			double sjgl=culateMileageService.culateSjgl(sList);
+			double sjzlc=Arith.add(ljgl, sjgl);
+			sjzlc_z=Arith.add(sjzlc, sjzlc_z);
+			double ksgl=culateMileageService.culateKsgl(sList);
+			double jccgl=culateMileageService.culateJccgl(sList);
+			double kszlc=Arith.add(ksgl, jccgl);
+			kszlc_z=Arith.add(kszlc, kszlc_z);
+			double zlc=Arith.add(sjzlc, kszlc);
+			zlc_z=Arith.add(zlc, zlc_z);
+			m.put("jhbc", jhbc);
+			m.put("jhlc", jhlc);
+			m.put("sjbc", sjbc);
+			m.put("sjzlc",sjzlc);
+			m.put("kszlc", kszlc);
+			m.put("zlc", zlc);
+			
+		}
+		Map<String, Object> mmp=new HashMap<>();
+		mmp.put("lp", "合计");
+		mmp.put("jGh", "");
+		mmp.put("clZbh", "");
+		mmp.put("jName", "");
+		mmp.put("jhbc", jhbc_z);
+		mmp.put("jhlc", jhlc_z);
+		mmp.put("sjbc", sjbc_z);
+		mmp.put("sjzlc", sjzlc_z);
+		mmp.put("kszlc",kszlc_z);
+		mmp.put("zlc", zlc_z);
+		mmp.put("jzyl",jzyl_z);
+		mmp.put("czyl",czyl_z);
+		mmp.put("jzl", jzl_z);
+		mmp.put("yh", yh_z);
+		mmp.put("rylx", "");
+		mmp.put("dh","");
+		list.add(mmp);
+		return list;
+	}
+}
@@ -11,6 +11,8 @@ import com.bsth.util.PageObject;
 public interface CwjyService extends BaseService<Cwjy, Integer>{
 	List<Ylxxb> Pagequery(Map<String, Object> map) ;
+	
+	List<Ylxxb> cwjyList(Map<String, Object> map);
 	Ylxxb bynbbm(Map<String, Object> map);
 	Map<String, Object> savejzl(Map<String, Object> map) throws Exception ;
@@ -274,6 +274,8 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		return map;
 	}
+	
+	
 	@Override
 	public List<Ylxxb> Pagequery(Map<String, Object> map) {
 		// TODO Auto-generated method stub
@@ -393,6 +395,66 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		return cs;
 	}
+
+	@Override
+	public List<Ylxxb> cwjyList(Map<String, Object> map) {
+		String rq=map.get("rq").toString();
+		String nbbm=map.get("nbbh").toString();
+		String gsdm=map.get("gsdm_like").toString();
+		
+		String fgsdm=map.get("fgsdm_like").toString();
+		String line =map.get("line_like").toString().trim();
+		boolean type=false;
+		if(map.get("type")!=null){
+			type=true;
+		}
+		String sql="select a.nbbm,a.gsdm,a.fgsdm,IFNULL(b.id,0) as id,IFNULL(b.jzl,0) as jzl,"
+		+ " IFNULL(b.jyggh,0) as jyggh,IFNULL(b.jsy,0) as jsy,IFNULL(b.stationid,0) as stationid ,"
+		+ " IFNULL(b.yj,0) as yj,IFNULL(b.nylx,0) as nylx,IFNULL(b.bz,'') as bz,IFNULL(c.jsy,'') as ldgh ,"
+		+ " IFNULL(c.xlname,c.linename) as xlname  from "
+		+ " (select * from bsth_c_cwjy where  gsdm='"+gsdm+"' and fgsdm='"+fgsdm+"') a "
+		+ " left join (select * from bsth_c_ylxxb where yyrq='"+rq+"' and gsdm='"+gsdm+"' and jylx=1) b"
+		+ " on a.nbbm=b.nbbm LEFT JOIN (select u.nbbm,u.jsy,v.linename,v.xlname,v.xlbm from(select a.nbbm,GROUP_CONCAT(a.jsy) as jsy "
+		+ " from (select nbbm,jsy from bsth_c_ylb x where x.rq='"+rq+"' "
+		+ " and x.ssgsdm='"+gsdm+"' and x.fgsdm='"+fgsdm+"' group by nbbm,jsy ) a  group by a.nbbm) u"
+		+ " LEFT JOIN(select o.nbbm,GROUP_CONCAT(o.xlbm) xlbm ,GROUP_CONCAT(o.linename) as xlname,"
+		+ " GROUP_CONCAT(p.`name`)  as linename from (select nbbm,xlbm,linename from bsth_c_ylb "
+		+ " where rq='"+rq+"' and ssgsdm='"+gsdm+"' and fgsdm='"+fgsdm+"' group by nbbm,xlbm,linename) o "
+		+ " LEFT JOIN bsth_c_line p on o.xlbm=p.line_code group by o.nbbm ) v on u.nbbm=v.nbbm) c "
+		+ " on a.nbbm=c.nbbm where 1=1 ";
+		if(!nbbm.equals("")){
+			sql +=" and a.nbbm like '%"+nbbm+"%'";
+		}
+		if(!line.equals("")){
+			sql += " and c.xlbm ='"+line+"'";
+		}
+		if(type){
+			sql +=" and c.xlbm is not null";
+		}
+		sql +=" order by xlname desc";
+		List<Ylxxb> yList= jdbcTemplate.query(sql,
+				 new RowMapper<Ylxxb>(){
+			 @Override
+			 public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Ylxxb t=new Ylxxb();
+				 t.setId(rs.getInt("id"));
+				 t.setGsdm(rs.getString("gsdm"));
+				 t.setFgsdm(rs.getString("fgsdm"));
+				 t.setNbbm(rs.getString("nbbm"));
+				 t.setJyggh(rs.getString("jyggh"));
+				 t.setJsy(rs.getString("jsy"));
+				 t.setJzl(rs.getDouble("jzl"));
+				 t.setStationid(rs.getString("stationid"));
+				 t.setNylx(rs.getInt("nylx"));
+				 t.setYj(rs.getDouble("yj"));
+				 t.setBz(rs.getString("bz"));
+				 t.setLdgh(rs.getString("ldgh"));
+				 t.setLinename(rs.getString("xlname"));
+				 return t;
+			 }
+		});
+		return yList;
+	}
@@ -67,7 +67,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> queryUserInfoPx(String line,String date,String state,String type);
-	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date,String line);
+	List<ScheduleRealInfo> exportWaybill(String jName,String jGh,String clZbh,String lpName,String date,String line);
 	List<ScheduleRealInfo> exportWaybillQp(String clZbh,String date,String line);
@@ -109,7 +109,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<SchEditInfoDto> correctForm(String line,String date,String endDate,String lpName,String code, String type,String changType);
-	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
+	List<ScheduleRealInfo> queryListWaybill(String jGh,String clZbh,String lpName,String date,String line);
 	List<ScheduleRealInfo> queryListWaybillQp(String clZbh,String date,String line);
@@ -38,6 +38,7 @@ import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.sys.Dictionary;
 import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.CarDeviceRepository;
@@ -61,6 +62,7 @@ import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.report.ReportService;
 import com.bsth.service.schedule.SchedulePlanInfoService;
+import com.bsth.service.sys.DictionaryService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
@@ -110,6 +112,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     CulateMileageService culateMieageService;
+    @Autowired
+    DictionaryService dictionaryService;
 	/*@Autowired
     BorrowCenter borrowCenter;*/
@@ -896,16 +900,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         String sqlPlan = "select * from  (select * from ("
                 + " select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
-                + " s.lp_Name as lpName,s.j_Name as jName,max(s.schedule_date_str) as dateStr ,"
+                + " s.lp_Name as lpName,min(s.j_Name) as jName,max(s.schedule_date_str) as dateStr ,"
                 + " min(s.fcsj) as fcsj,1 as px  from bsth_c_s_sp_info_real s  where "
                 + " s.xl_Bm = '" + line + "' and s.schedule_date_str ='" + date + "'"
-                + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name ) x where x.fcsj >'" + minfcsj + "'"
+                + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name) x where x.fcsj >'" + minfcsj + "'"
                 + " UNION "
                 + " select * from ( select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
-                + " s.lp_Name as lpName,s.j_Name as jName, max(s.schedule_date_str) as dateStr,"
+                + " s.lp_Name as lpName,min(s.j_Name) as jName, max(s.schedule_date_str) as dateStr,"
                 + " min(s.fcsj) as fcsj,2 as px from bsth_c_s_sp_info_real s  "
                 + " where s.xl_Bm = '" + line + "' and s.schedule_date_str ='" + date + "'"
-                + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name "
+                + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name"
                 + " ) y where y.fcsj <='" + minfcsj + "') z order by (" + state + "),dateStr,px,fcsj " + type;
         List<ScheduleRealInfo> list = jdbcTemplate.query(sqlPlan,
                 new RowMapper<ScheduleRealInfo>() {
@@ -967,11 +971,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
      *
      */
     @Override
-    public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName, String date, String line) {
+    public List<ScheduleRealInfo> exportWaybill(String jName,String jGh, String clZbh, String lpName, String date, String line) {
         ReportUtils ee = new ReportUtils();
         ReportRelatedUtils rru = new ReportRelatedUtils();
         List<Iterator<?>> list = new ArrayList<Iterator<?>>();
-        List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
+        List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybillXcld(jGh, 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>();
@@ -2304,11 +2308,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
     @Override
-    public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
+    public List<ScheduleRealInfo> queryListWaybill(String jGh, String clZbh,
                                                    String lpName, String date, String line) {
         List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> list = null;
-        list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
+        list = scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         String minfcsj = "02:00";
         List<Line> lineList = lineRepository.findLineByCode(line);
@@ -3771,7 +3775,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date, gsbm, fgsbm);
         for (int x = 0; x < yesterdayDataList.size(); x++) {
-            String jName = yesterdayDataList.get(x).get("jGh").toString();
+            String jsy = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
             String xlbm = yesterdayDataList.get(x).get("xlBm").toString();
             String lp = yesterdayDataList.get(x).get("lpName").toString();
@@ -3780,9 +3784,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             String company = "";
             String bCompany = "";
             String lineName="";
+            String jName="";
             List<ScheduleRealInfo> listS = new ArrayList<ScheduleRealInfo>();
             for (ScheduleRealInfo scheduleRealInfo : lists) {
-                if (scheduleRealInfo.getjGh().equals(jName)
+                if (scheduleRealInfo.getjGh().equals(jsy)
                         && scheduleRealInfo.getClZbh().equals(clZbh)
                         && scheduleRealInfo.getXlBm().equals(xlbm)
                         && scheduleRealInfo.getLpName().equals(lp)) {
@@ -3791,6 +3796,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         company = scheduleRealInfo.getGsBm();
                         bCompany = scheduleRealInfo.getFgsBm();
                         lineName = scheduleRealInfo.getXlName();
+                        jName= scheduleRealInfo.getjName();
                         fage = false;
                     }
                     Set<ChildTaskPlan> cts = scheduleRealInfo.getcTasks();
@@ -3806,6 +3812,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             yesterdayDataList.get(x).put("company", company);
             yesterdayDataList.get(x).put("bCompany", bCompany);
             yesterdayDataList.get(x).put("lineName", lineName);
+            yesterdayDataList.get(x).put("jName", jName);
             Double ljgl = culateMieageService.culateLjgl(listS);
             Double sjgl = culateMieageService.culateSjgl(listS);
             Double ksgl = culateMieageService.culateKsgl(listS);
@@ -4568,6 +4575,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public Map<String, Object> MapById(Long id) {
         // TODO Auto-generated method stub
+    	Map<String, Object> dMap=new HashMap<>();
+		dMap.put("dGroup", "oilType");
+		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
+		while (it.hasNext()) {
+			Dictionary d=it.next();
+			dMap.put(d.getdCode(), d.getdName());
+		}
         Map<String, Object> map = new HashMap<String, Object>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(id);
@@ -4580,6 +4594,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Double yh = 0.0;
         Double jzl = 0.0;
         Double zlc = 0.0;
+        String rylx="";
         List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
         if (listCars.size() > 0) {
             if (listCars.get(0).getSfdc() != null) {
@@ -4616,6 +4631,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                             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());
@@ -4623,13 +4640,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                                 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();
                             }
                         }
                     }
                 }
             }
         }
-
+        
+        map.put("rylx", "加注类别:"+rylx);
         map.put("jzl", jzl);
         map.put("yh", yh);
         map.put("ccyl", ccyl);
@@ -281,7 +281,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	$get('/ylb/checkDate',params,function(status){
-            		if(status=='2'){
+            		if(status=='3'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
 		                var i = layer.load(2);
@@ -302,7 +302,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	$get('/ylb/checkDate',params,function(status){
-            		if(status=='2'){
+            		if(status=='3'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
 		                var i = layer.load(2);
@@ -322,7 +322,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $("#saveButton").on('click',function(){
         	var params_=getParamsList();
         	$get('/ylb/checkDate',params_,function(status){
-        		if(status=='2'){
+        		if(status=='3'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
 		        	var ylArray = [];
@@ -434,7 +434,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	$get('/ylb/checkDate',params,function(status){
-            		if(status=='2'){
+            		if(status=='3'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
 		                var i = layer.load(2);
@@ -599,7 +599,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         	var params=getParamsList();
 			var id = $(this).data('id');
         	$get('/ylb/checkDate',params,function(status){
-        		if(status=='2'){
+        		if(status=='3'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
 		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
@@ -743,7 +743,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $('#removeButton').on('click', function () {
         	var params_=getParamsList();
         	$get('/ylb/checkDate',params_,function(status){
-        		if(status=='2'){
+        		if(status=='3'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
 		        	var idArray = [];
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>班次日报表</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+				   <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_daily">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdmDaily" style="width: 180px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_daily">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdmDaily" style="width: 180px;"></select>
+					</div>
+					<div style="margin-top: 2px"></div>
+					<div style="display: inline-block;margin-left: 33px;">
+                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 180px;"></select>
+                    </div>
+                    <div style="display: inline-block;margin-left: 24px;">
+                        <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
+                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="筛选"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+				</form>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th colspan="16">调度班次日报</th>
+							</tr>
+							<tr>
+								<td>线路</td>
+								<td colspan="7"><span id="form_line">&nbsp;</span></td>
+								<td>时间</td>
+								<td colspan="7"><span id="form_date">&nbsp;</span></td>
+							</tr>
+							<tr>
+								<td>路牌</td>
+								<td>车辆</td>
+								<td>工号</td>
+								<td>姓名</td>
+								<td>计划班次</td>
+								<td>计划营运里程</td>
+								<td>实际班次</td>
+								<td>实际营运里程</td>
+								<td>空驶里程</td>
+								<td>总里程</td>
+								<td>出场存油</td>
+								<td>进场存油</td>
+								<td>加注量</td>
+								<td>油耗</td>
+								<td>加注类别</td>
+								<td>电耗</td>
+							</tr>
+						</thead>
+						<tbody id="tbody">
+							
+						</tbody>
+						<!-- <tr>
+							<td colspan="3">小计</td>
+							<td><span id="total_zgl">&nbsp;</span></td>
+							<td><span id="total_ks">&nbsp;</span></td>
+							<td><span id="total_yh">&nbsp;</span></td>
+							<td><span id="total_bc">&nbsp;</span></td>
+						</tr> -->
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		var fage=false;
+		var xlList;
+		var obj = [];
+		
+		 
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				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)
+						$('#fgsdmDiv_daily').css('display','none');
+				}
+				$('#gsdmDaily').html(options);
+				updateCompany();
+			});
+		})
+		$("#gsdmDaily").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdmDaily').val();
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdmDaily').html(options);
+		}
+
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+// 			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdmDaily").attr("disabled", false);
+				$("#fgsdmDaily").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdmDaily").val(temp[0]);
+				updateCompany();
+				$("#fgsdmDaily").val(temp[1]);
+				$("#gsdmDaily").attr("disabled", true);
+				$("#fgsdmDaily").attr("disabled", true);
+			}
+		});
+		
+		
+	var line;
+	var date;
+	var gsdmDaily;
+	var fgsdmDaily;
+	var lineName=$("#select2-line-container").html();
+	$("#query").on("click",function(){
+		if($("#date").val() == null || $("#date").val().trim().length == 0){
+			layer.msg("请选择时间");
+			return;
+		}
+		line = $("#line").val();
+		date = $("#date").val();
+		gsdmDaily=$("#gsdmDaily").val();
+		fgsdmDaily = $("#fgsdmDaily").val();
+		lineName=$("#select2-line-container").html();
+		var i = layer.load(2);
+		$get('/jdtest/daily',{ line:line,date:date,type:'query'},function(result){
+			 $("#form_line").text(lineName);
+			 $("#form_date").text(date);
+			// 把数据填充到模版中
+			var tbodyHtml = template('dailyJdtest',{list:result});
+			// 把渲染好的模版html文本追加到表格中
+			$('#tbody').html(tbodyHtml);
+			layer.close(i);
+		})
+	});
+	
+	$("#export").on("click",function(){
+		if($("#date").val() == null || $("#date").val().trim().length == 0){
+			layer.msg("请选择时间");
+			return;
+		}
+		line = $("#line").val();
+		date = $("#date").val();
+		lineName=$("#select2-line-container").html();
+		var i = layer.load(2);
+		$get('/jdtest/daily',{line:line,date:date,type:'export',lineName:lineName},function(result){
+			window.open("/downloadFile/download?fileName="
+					+date+"-"+lineName+"-班次日报表");
+			layer.close(i);
+		});
+	});
+});
+</script>
+<script type="text/html" id="dailyJdtest">
+	{{each list as obj i}}
+		<tr>
+			<td>{{obj.lp}}</td>	
+			<td>{{obj.clZbh}}</td>
+			<td>{{obj.jGh}}</td>
+			<td>{{obj.jName}}</td>
+			<td>{{obj.jhbc}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.sjbc}}</td>
+			<td>{{obj.sjzlc}}</td>
+			<td>{{obj.kszlc}}</td>
+			<td>{{obj.zlc}}</td>
+			<td>{{obj.czyl}}</td>
+			<td>{{obj.jzyl}}</td>
+			<td>{{obj.jzl}}</td>
+			<td>{{obj.yh}}</td>
+			<td>{{obj.rylx}}</td>
+			<td>&nbsp;</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 \ No newline at end of file
@@ -314,7 +314,7 @@
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_1').html(ludan_1);
 			});
-			$get('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			$get('/realSchedule/queryListWaybill',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 			    getTime(result);
 				var ludan_2 = template('ludan_2',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -335,7 +335,7 @@
 				return;
 			}
 		    var i = layer.load(2);
-			$get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			$get('/realSchedule/exportWaybill',{jName:jName,jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 				var fileName=date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单";
 				window.open("/downloadFile/download?fileName="+encodeURIComponent(fileName));
 		   		layer.close(i);
@@ -438,8 +438,9 @@
           <td colspan="2">出场存油 {{ccyl}}升</td>
           <td colspan="2">加注量 {{jzl}}升</td>
           <td colspan="2">进场存油 {{jcyl}}升</td>
-          <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗油 {{yh}}升</td>
+          <td colspan="2">加注机油 &nbsp;升</td>
+		  <td colspan="3">{{rylx}}</td>
+          <td colspan="3">本日耗油 {{yh}}升</td>
 		{{/if}}
         {{if type==1}}  
           <td colspan="2">出场存电 {{ccyl}}%</td>
@@ -116,7 +116,9 @@
 					<div class="col-md-4">
 							<select name="rylx" class="form-control">
 								<option value='0'>0号柴油</option> 
-								<option value='1'>负10号柴油</option> 
+								<option value='1'>负10号柴油</option>
+								<option value='2'>B5-0号柴油</option>
+								<option value='3'>B5-负10号柴油</option> 
 							</select>
 					</div>
 				</div>
@@ -64,17 +64,17 @@
 								<th width="8%">车辆</th>
 								<th width="14%">驾驶员</th>
 								<th width="5%">加注量</th>
-								<th width="4%">加油站</th>
-								<th width="3%">加油类型</th>
-								<th width="5%">加油工工号</th>
-								<th width="4%">路单工号</th>
-								<th width="4%">备注</th>
+<!-- 								<th width="4%">加油站</th> -->
+<!-- 								<th width="3%">加油类型</th> -->
+<!-- 								<th width="5%">加油工工号</th> -->
+								<th width="10%">路单工号</th>
+								<th width="8%">备注</th>
 								<th width="10%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
 								<td>
-									<input type="text" id="rq" class="form-control form-filter input-sm" name="rq">
+									<input type="text" id="rq" class="form-control" name="rq">
 								</td>
 								<td>
 									<select class="form-control" name="gsdm_like" id="jyglListGsdmId" ></select>								
@@ -91,9 +91,9 @@
 								<td></td>
 								<td></td>
 								<td></td>
-								<td></td>
-								<td></td>
-								<td></td>
+<!-- 								<td></td> -->
+<!-- 								<td></td> -->
+<!-- 								<td></td> -->
 								<td></td>
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
@@ -142,7 +142,7 @@
 onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
 	</td>
-	<td>
+	<!--<td>
 	<input data-id="{{obj.nbbm}}" href="javascript:;" class="in_carpark_stationid" 
             type="text" value="{{obj.stationid}}" style=" width:45px" />
 	</td>
@@ -155,7 +155,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	<td>
 	<input data-id="{{obj.nbbm}}" href="javascript:;" class="in_carpark_jyggh" 
             type="text" value="{{obj.jyggh}}" style=" width:45px" />
-	</td>
+	</td>-->
 	<td>{{obj.ldgh}}</td>
 	<td>
@@ -183,17 +183,17 @@ $(function(){
     		var id=$('.in_carpark_id[data-id='+nbbm+']', '#ll_jygl_list').val();
     		var jsy=$('.in_carpark_jsy[data-id='+nbbm+']', '#ll_jygl_list').val();
     		var jzl=$('.in_carpark_jzl[data-id='+nbbm+']','#ll_jygl_list').val();
-    		var stationid=$('.in_carpark_stationid[data-id='+nbbm+']','#ll_jygl_list').val();
+    		/* var stationid=$('.in_carpark_stationid[data-id='+nbbm+']','#ll_jygl_list').val();
     		var nylx=$('.in_carpark_nylx[data-id='+nbbm+']','#ll_jygl_list').val();
-    		var jyggh=$('.in_carpark_jyggh[data-id='+nbbm+']','#ll_jygl_list').val();
+    		var jyggh=$('.in_carpark_jyggh[data-id='+nbbm+']','#ll_jygl_list').val(); */
     		var bz=$('.in_carpark_bz[data-id='+nbbm+']','#ll_jygl_list').val();
     		map['nbbm']=nbbm;
     		map['id']=id;
             map['jsy']=jsy;
             map['jzl']=jzl;
-            map['stationid']=stationid;
-            map['nylx']=nylx;
-            map['jyggh']=jyggh;
+//             map['stationid']=stationid;
+//             map['nylx']=nylx;
+//             map['jyggh']=jyggh;
             map['bz']=bz;
             ylArray.push(map);
     	})
@@ -338,8 +338,8 @@ $(function(){
 		params['order'] = 'nbbm';
 		params['page'] = page;
 		params['rq']=$("#rq").val();
-		
-		var i = layer.load(2);;
+// 		params['type']='1';
+		var i = layer.load(2);
 		/* var jyglGsdm=$("#jyglListGsdmId").val();
 		var jyglFgsdm=$("#jyglListFgsdmId").val();
 		if(jyglGsdm=="" || jyglGsdm==null){
@@ -359,7 +359,7 @@ $(function(){
 				params['fgsdm_in']=fgsqx1;
 			}
 		} */
-		$get('/cwjy/queryList' ,params, function(data){
+		$get('/cwjy/cwjyList' ,params, function(data){
 			$.each(data, function(i, obj) {
                 obj.yyrq = $("#rq").val();
             });
@@ -493,7 +493,6 @@ function editCyjy(nbbm){
 }
 //改变状态
 function changeEnabled(id,enabled){
-	debugger
 	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
 		jsDoQuery(null, true);
 	})
@@ -292,6 +292,8 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 			<select data-id="{{obj.id}}" class="in_carpark_rylx"  style=" width:100%" >
 				<option value='0' {{if obj.rylx==0}}  selected = 'selected' {{/if}}>0号柴油</option> 
 				<option value='1' {{if obj.rylx==1}}  selected = 'selected' {{/if}}>负10号柴油</option> 
+				<option value='2' {{if obj.rylx==2}}  selected = 'selected' {{/if}}>B5-0号柴油</option> 
+				<option value='3' {{if obj.rylx==3}}  selected = 'selected' {{/if}}>B5-负10号柴油</option> 
 			</select>
         </td>
         <td width="4%">
@@ -353,7 +355,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
        		 	var params=getParamsList();
             	$get('/ylb/checkDate',params,function(status){
-            		if(status=='2'){
+            		if(status=='3'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
                         var i = layer.load(2);
@@ -375,7 +377,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	$get('/ylb/checkDate',params,function(status){
-            		if(status=='2'){
+            		if(status=='3'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
 		                var i = layer.load(2);
@@ -395,7 +397,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         	var params_=getParamsList();
         	$get('/ylb/checkDate',params_,function(status){
-        		if(status=='2'){
+        		if(status=='3'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
 		        	var ylArray = [];
@@ -459,7 +461,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params_=getParamsList();
             	$get('/ylb/checkDate',params_,function(status){
-            		if(status=='2'){
+            		if(status=='3'){
                		 layer.msg('只能操作三天内数据.');
                	}else{
 	            	//拆分前先保存全部  
@@ -627,7 +629,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	$get('/ylb/checkDate',params,function(status){
-	            	if(status=='2'){
+	            	if(status=='3'){
 	               		 layer.msg('只能操作三天内数据.');
 	               	}else{
 		                var i = layer.load(2);
@@ -784,7 +786,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         	var params=getParamsList();
         	$get('/ylb/checkDate',params,function(status){
 				var id = $(this).data('id');
-	            if(status=='2'){
+	            if(status=='3'){
 	               	layer.msg('只能操作三天内数据.');
 	            }else{
 		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_oil_list').val();
@@ -921,7 +923,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $('.removeButton').on('click', function () {
         	var params_=getParamsList();
         	$get('/ylb/checkDate',params_,function(status){
-		            if(status=='2'){
+		            if(status=='3'){
 		               	layer.msg('只能操作三天内数据.');
 		            }else{
 		        	var idArray = [];