25-04-01工单：纯电车日报表加字段，班次日报表加字段，油量导入表加导出，行车路单重点标记子任务与临加班次，新增氢气车日报表。

娄高锋
1 parent af8425bb
Showing 16 changed files with 634 additions and 33 deletions
src/main/java/com/bsth/controller/RefuelController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/entity/mcy_forms/Daily.java
src/main/java/com/bsth/repository/RefuelRepository.java
src/main/java/com/bsth/service/RefuelService.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
src/main/resources/static/pages/forms/mould/daily.xls
src/main/resources/static/pages/forms/mould/refuel.xls
src/main/resources/static/pages/forms/mould/refuelDc.xls
src/main/resources/static/pages/forms/mould/refuelQc.xls
src/main/resources/static/pages/forms/statement/daily.html
src/main/resources/static/pages/forms/statement/refuel.html
src/main/resources/static/pages/forms/statement/refuelDc.html
src/main/resources/static/pages/forms/statement/refuelQc.html
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -29,6 +29,11 @@ public class RefuelController extends BaseController&lt;Refuel, Long&gt; {
 	public List<Refuel> query(@RequestParam Map<String, Object> map){
 		return refuelService.query(map);
 	}
+	
+	@RequestMapping(value = "/exportRefuel", method = RequestMethod.GET)
+	public List<Map<String, Object>> exportRefuel(@RequestParam Map<String, Object> map){
+		return refuelService.exportRefuel(map);
+	}
 	@RequestMapping(value = "/queryDaily", method = RequestMethod.GET)
 	public List<Map<String, Object>> queryDaily(@RequestParam Map<String, Object> map){
@@ -55,6 +60,16 @@ public class RefuelController extends BaseController&lt;Refuel, Long&gt; {
 		return refuelService.exportQueryDc(map);
 	}
+	@RequestMapping(value = "/queryQc", method = RequestMethod.GET)
+	public List<Map<String, Object>> queryQc(@RequestParam Map<String, Object> map){
+		return refuelService.queryQc(map);
+	}
+	
+	@RequestMapping(value = "/exportQueryQc", method = RequestMethod.GET)
+	public List<Map<String, Object>> exportQueryQc(@RequestParam Map<String, Object> map){
+		return refuelService.exportQueryQc(map);
+	}
+	
 	@RequestMapping(value = "/uploadFile",method = RequestMethod.POST)
 	public String uploadFile(MultipartFile file) throws Exception{
         File newFile = new File(
@@ -759,22 +759,30 @@ public class ExportController {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		double zgl=0.0;
 		double ks=0.0;
+		double lblc=0.0, ljlc=0.0;
 		double yh=0.0;
-		int bc=0;
+		int bc=0, carDay=0;
 		Map<String, Object> m ;
 		for (Daily d : allline) {
 			m = new HashMap<String, Object>();
 			m.put("zbh", d.getZbh());
+			m.put("lp", d.getLp());
 			m.put("jgh",d.getJgh());
 			m.put("jName", d.getjName());
 			m.put("zlc", d.getZlc());
 			m.put("jzl1", d.getJzl1());
+			m.put("lblc", d.getLblc());
+			m.put("ljlc", d.getLjlc());
 			m.put("yh", d.getYh());
 			m.put("bc", d.getBc());
+			m.put("carDay", d.getCarDay());
 			zgl =Arith.add(zgl, d.getZlc());
 			ks =Arith.add(ks, d.getJzl1());
+			lblc =Arith.add(lblc, d.getLblc());
+			ljlc =Arith.add(ljlc, d.getLjlc());
 			yh =Arith.add(yh, d.getYh());
 			bc +=Integer.parseInt(d.getBc());
+			carDay +=d.getCarDay();
 			resList.add(m);
 		}
@@ -782,8 +790,11 @@ public class ExportController {
 		m=new HashMap<String,Object>();
 		m.put("total_zgl", zgl);
 		m.put("total_ks", ks);
+		m.put("total_lblc", lblc);
+		m.put("total_ljlc", ljlc);
 		m.put("total_yh", yh);
 		m.put("total_bc", bc);
+		m.put("total_carDay", carDay);
 		m.put("line", BasicData.lineCode2NameMap.get(map.get("line").toString()));
 		m.put("date", map.get("date").toString());
@@ -25,6 +25,14 @@ public class Daily {
 	private String yh;//油耗
 	private String bc;//班次
+	
+	private String lp;//路牌
+	
+	private String lblc;//损失公里（少驶、烂班）
+	
+	private String ljlc;//加车公里（临加）
+	
+	private int carDay;//车日
 	public String getZbh() {
 		return zbh;
@@ -81,9 +89,37 @@ public class Daily {
 	public void setBc(String bc) {
 		this.bc = bc;
 	}
-	
-	
-	
+	public String getLp() {
+		return lp;
+	}
+
+	public void setLp(String lp) {
+		this.lp = lp;
+	}
+
+	public String getLblc() {
+		return lblc;
+	}
+
+	public void setLblc(String lblc) {
+		this.lblc = lblc;
+	}
+
+	public String getLjlc() {
+		return ljlc;
+	}
+
+	public void setLjlc(String ljlc) {
+		this.ljlc = ljlc;
+	}
+
+	public int getCarDay() {
+		return carDay;
+	}
+
+	public void setCarDay(int carDay) {
+		this.carDay = carDay;
+	}
 }
@@ -64,4 +64,7 @@ public interface RefuelRepository extends BaseRepository&lt;Refuel, Long&gt; {
 	@Query(value="select s from Cars s where s.sfdc=?1")
 	List<Cars> findCarsBySfdc(Boolean sfdc);
+	@Query(value="select s from Cars s where s.hydrogen=?1")
+	List<Cars> findCarsByHydrogen(Boolean hydrogen);
+	
 }
@@ -13,15 +13,21 @@ public interface RefuelService extends BaseService&lt;Refuel, Long&gt; {
 	List<Refuel> query(Map<String, Object> map);
+	List<Map<String, Object>> exportRefuel(Map<String, Object> map);
+	
 	List<Map<String, Object>> queryDaily(Map<String, Object> map);
 	List<Map<String, Object>> queryYc(Map<String, Object> map);
-	List<Map<String, Object>> queryDc(Map<String, Object> map);
-	
 	List<Map<String, Object>> exportQueryYc(Map<String, Object> map);
+	List<Map<String, Object>> queryDc(Map<String, Object> map);
+	
 	List<Map<String, Object>> exportQueryDc(Map<String, Object> map);
+	List<Map<String, Object>> queryQc(Map<String, Object> map);
+	
+	List<Map<String, Object>> exportQueryQc(Map<String, Object> map);
+	
 	public String importExcel(File file);
 }
@@ -3003,7 +3003,7 @@ public class FormsServiceImpl implements FormsService {
 		}
 		List<String> objList = new ArrayList<String>();
-		String sql="select r.schedule_date_str, "
+		String sql="select r.schedule_date_str,r.lp_name, "
 				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm "
 				+ " from bsth_c_s_sp_info_real r where "
 				+ " r.schedule_date_str = ? ";
@@ -3011,16 +3011,17 @@ public class FormsServiceImpl implements FormsService {
 		if(!xlbm.equals("")){
 			sql += " and r.xl_bm = ? ";
 			objList.add(xlbm);
+		} else {
+			if(!gsbm.equals("")){
+				sql += " and r.gs_bm = ? ";
+				objList.add(gsbm);
+			}
+			if(!fgsbm.equals("")){
+				sql += " and r.fgs_bm = ? ";
+				objList.add(fgsbm);
+			}
 		}
-		if(!gsbm.equals("")){
-			sql += " and r.gs_bm = ? ";
-			objList.add(gsbm);
-		}
-		if(!fgsbm.equals("")){
-			sql += " and r.fgs_bm = ? ";
-			objList.add(fgsbm);
-		}
-		sql += " group by r.schedule_date_str,"
+		sql += " group by r.schedule_date_str,r.lp_name,"
 				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
 		List<Daily> list = jdbcTemplate.query(sql, objList.toArray(), new RowMapper<Daily>() {
@@ -3028,9 +3029,9 @@ public class FormsServiceImpl implements FormsService {
 			public Daily mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Daily daily = new Daily();
 				daily.setRq(arg0.getString("schedule_date_str"));
+				daily.setLp(arg0.getString("lp_name"));
 				daily.setZbh(arg0.getString("cl_zbh"));
 				daily.setJgh(arg0.getString("j_gh"));
-//				daily.setjName(arg0.getString("j_name"));
 				return daily;
 			}
 		});
@@ -3081,11 +3082,15 @@ public class FormsServiceImpl implements FormsService {
 			double zksgl=Arith.add(ksgl, jccgl);
 			double ljgl=culateMileageService.culateLjgl(sList);
 			double sjgl=culateMileageService.culateSjgl(sList);
+			double lbgl=culateMileageService.culateLbgl(sList);
 			double zyygl=Arith.add(ljgl, sjgl);
 			d.setJzl1(String.valueOf(zksgl));//空驶公里
-			d.setZlc(String.valueOf(Arith.add(zksgl, zyygl)));
+			d.setZlc(String.valueOf(Arith.add(zksgl, zyygl)));//总公里
 			d.setBc(String.valueOf(culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "")));
+			d.setLblc(String.valueOf(lbgl)); // 损失公里
+			d.setLjlc(String.valueOf(ljgl)); // 加车公里
+			d.setCarDay(1); // 车日
 		}
 		return list;
 	}
@@ -132,6 +132,50 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 	}
 	@Override
+	public List<Map<String, Object>> exportRefuel(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		
+		List<Refuel> refuelList = this.query(map);
+		
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		for(int i = 0; i < refuelList.size(); i++){
+			Refuel r = refuelList.get(i);
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("no", i + 1);
+			m.put("dateStr", r.getDateStr());
+			m.put("lineName", r.getLineName());
+			m.put("car", r.getCar());
+			m.put("driver", r.getDriver());
+			m.put("outOil", r.getOutOil()!=null?r.getOutOil():"");
+			m.put("inOil", r.getInOil()!=null?r.getInOil():"");
+			m.put("inStation0", r.getInStation0()!=null?r.getInStation0():"");
+			m.put("inStation5", r.getInStation5()!=null?r.getInStation5():"");
+			m.put("oilCard0", r.getOilCard0()!=null?r.getOilCard0():"");
+			m.put("oilCard10", r.getOilCard10()!=null?r.getOilCard10():"");
+			m.put("eastStation0", r.getEastStation0()!=null?r.getEastStation0():"");
+			m.put("eastStation10", r.getEastStation10()!=null?r.getEastStation10():"");
+			m.put("outStation0", r.getOutStation0()!=null?r.getOutStation0():"");
+			m.put("outStation10", r.getOutStation10()!=null?r.getOutStation10():"");
+			resList.add(m);
+		}
+		
+		String date = map.get("date").toString();
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String,Object> m = new HashMap<String, Object>();
+		ReportUtils ee = new ReportUtils();
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { m }, path+"mould/refuel.xls",
+					path+"export/" + date + "-油量导入.xls");
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+		return resList;
+	}
+	
+	@Override
 	public List<Map<String, Object>> queryDaily(Map<String, Object> map) {
 		// TODO Auto-generated method stub
 		DecimalFormat df = new DecimalFormat("0.##");
@@ -737,7 +781,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		for(ScheduleRealInfo s : scheList){
 			if(s.getClZbh() != null && nbbms.contains(s.getClZbh())){
 				if(s.getClZbh().length() > 0 && s.getjGh() != null){
-					String key = s.getClZbh() + "/" + s.getjGh();
+					String key = s.getClZbh() + "/" + s.getLpName() + "/" + s.getjGh();
 					if(!(sMap.containsKey(key))){
 						sMap.put(key, new ArrayList<ScheduleRealInfo>());
 						sKeyList.add(key);
@@ -815,7 +859,8 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			m.put("date", scheList.get(0).getScheduleDateStr());
 			m.put("line", list2.get(0).getXlName());
 			m.put("car", split[0]);
-			m.put("driver", split[1]);
+			m.put("lp", split[1]);
+			m.put("driver", split[2]);
 			m.put("out", "");
 			m.put("in", "");
 			m.put("jdl", "");
@@ -837,6 +882,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		lastMap.put("date", "合计");
 		lastMap.put("line", "");
 		lastMap.put("car", "");
+		lastMap.put("lp", "");
 		lastMap.put("driver", "");
 		lastMap.put("out", "");
 		lastMap.put("in", "");
@@ -881,6 +927,189 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 	}
 	@Override
+	public List<Map<String, Object>> queryQc(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		DecimalFormat df = new DecimalFormat("0.##");
+		
+		String date = "", car = "%%", xlbm = "";
+		if(map.get("date") != null){
+			date = map.get("date").toString();
+		}
+		if(map.get("car") != null){
+			car = "%" + map.get("car").toString() + "%";
+		}
+		if(map.get("line") != null){
+			xlbm = map.get("line").toString();
+		}
+		
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Map<String, Object> lastMap = new HashMap<String, Object>();
+		String realMileage_z = "0", ksMileage_z = "0", ssMileage_z = "0",
+				jhbc_z = "0", sjbc_z = "0", bc_z = "0", yybc_z = "0", cr_z = "0";
+		
+		List<String> sKeyList = new ArrayList<String>();
+		Map<String, List<ScheduleRealInfo>> sMap = new HashMap<String, List<ScheduleRealInfo>>();
+		List<ScheduleRealInfo> scheList = new ArrayList<ScheduleRealInfo>();
+		if(xlbm.length() > 0){
+			String[] split = xlbm.split(",");
+			for(String s : split){
+				scheList.addAll(repository.scheduleByDateAndLine(date, car, s));
+			}
+		} else {
+			scheList = repository.scheduleByDateAndCar(date, car);
+		}
+		List<Cars> findCarsByHydrogen = repository.findCarsByHydrogen(true);
+		
+		Set<String> nbbms = new HashSet<String>();
+		for(Cars c : findCarsByHydrogen){	//所有氢能源车
+			nbbms.add(c.getInsideCode());
+		}
+		
+		for(ScheduleRealInfo s : scheList){
+			if(s.getClZbh() != null && nbbms.contains(s.getClZbh())){
+				if(s.getClZbh().length() > 0 && s.getjGh() != null){
+					String key = s.getClZbh() + "/" + s.getLpName() + "/" + s.getjGh();
+					if(!(sMap.containsKey(key))){
+						sMap.put(key, new ArrayList<ScheduleRealInfo>());
+						sKeyList.add(key);
+					}
+					sMap.get(key).add(s);
+				}
+			}
+		}
+		
+		for(String key : sKeyList){
+			Map<String, Object> m = new HashMap<String, Object>();
+			List<ScheduleRealInfo> list2 = sMap.get(key);
+			String[] split = key.split("/");
+			
+			String realMileage = "", ksMileage = "", ssMileage = "",
+					bc = "", jhbc = "", sjbc = "", ljbc = "", cr = "";
+			String remarks = "";
+			
+			Double sjgl = culateMileageService.culateSjgl(list2);
+			Double ksgl = culateMileageService.culateKsgl(list2);
+			Double jccgl = culateMileageService.culateJccgl(list2);
+			Double ljgl = culateMileageService.culateLjgl(list2);
+			
+			realMileage = add(add(sjgl, ksgl), add(jccgl, ljgl));
+			ksMileage = add(ksgl, jccgl);
+			ssMileage = "" + culateMileageService.culateLbgl(list2);
+			jhbc = "" + culateMileageService.culateJhbc(list2, "");
+			sjbc = "" + culateMileageService.culateSjbc(list2, "");
+			ljbc = "" + culateMileageService.culateLjbc(list2, "");
+			int bcInt = 0;
+			for(ScheduleRealInfo s : list2){
+				if(!s.isCcService() && s.getStatus() != -1){
+					bcInt++;
+				}
+			}
+			bc = "" + bcInt;
+			cr = "1";
+			
+			realMileage_z = new BigDecimal(realMileage_z).add(new BigDecimal(realMileage)).toString();
+			ksMileage_z = new BigDecimal(ksMileage_z).add(new BigDecimal(ksMileage)).toString();
+			if(ssMileage.length() > 0){
+				ssMileage_z = new BigDecimal(ssMileage_z).add(new BigDecimal(ssMileage)).toString();
+			}
+			jhbc_z = new BigDecimal(jhbc_z).add(new BigDecimal(jhbc)).toString();
+			sjbc_z = new BigDecimal(sjbc_z).add(new BigDecimal(sjbc)).toString();
+			bc_z = new BigDecimal(bc_z).add(new BigDecimal(bc)).toString();
+			yybc_z = new BigDecimal(yybc_z).add(new BigDecimal(sjbc)).add(new BigDecimal(ljbc)).toString();
+			cr_z = new BigDecimal(cr_z).add(new BigDecimal(cr)).toString();
+			
+			for(ScheduleRealInfo s : list2){
+				String remark = "";
+				if(s.getRemarks() != null){
+					remark += s.getRemarks().trim();
+				}
+				if (s.isDestroy()) {
+					remark += "(烂班)";
+	            }
+				if(remark.length() > 0 && remarks.length() > 0){
+					remarks += ";";
+				}
+				remarks += remark;
+				Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+				for(ChildTaskPlan c : childTaskPlans){
+					remark = "";
+					if(c.getRemarks() != null){
+						remark = c.getRemarks().trim();
+					}
+					if(remark.length() > 0 && remarks.length() > 0){
+						remarks += ";";
+					}
+					remarks += remark;
+				}
+			}
+			
+			m.put("date", scheList.get(0).getScheduleDateStr());
+			m.put("line", list2.get(0).getXlName());
+			m.put("car", split[0]);
+			m.put("lp", split[1]);
+			m.put("driver", split[2]);
+			m.put("jql", "");
+			m.put("jqje", "");
+			m.put("realMileage", realMileage);
+			m.put("ksMileage", ksMileage);
+			m.put("ssMileage", ssMileage);
+			m.put("consume", "");
+			m.put("bc", bc);
+			m.put("jhbc", jhbc);
+			m.put("sjbc", sjbc);
+			m.put("yybc", Integer.valueOf(sjbc)+Integer.valueOf(ljbc));
+			m.put("cr", cr);
+			m.put("remark", remarks);
+			
+			resList.add(m);
+		}
+		
+		lastMap.put("date", "合计");
+		lastMap.put("line", "");
+		lastMap.put("car", "");
+		lastMap.put("lp", "");
+		lastMap.put("driver", "");
+		lastMap.put("jql", "");
+		lastMap.put("jqje", "");
+		lastMap.put("realMileage", realMileage_z);
+		lastMap.put("ksMileage", ksMileage_z);
+		lastMap.put("ssMileage", ssMileage_z);
+		lastMap.put("consume", "");
+		lastMap.put("bc", bc_z);
+		lastMap.put("yybc", yybc_z);
+		lastMap.put("jhbc", jhbc_z);
+		lastMap.put("sjbc", sjbc_z);
+		lastMap.put("cr", cr_z);
+		lastMap.put("remark", "");
+		
+		resList.add(lastMap);
+		
+		return resList;
+	}
+	
+	@Override
+	public List<Map<String, Object>> exportQueryQc(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		
+		List<Map<String, Object>> list = this.queryQc(map);
+		
+		String date = map.get("date").toString();
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String,Object> m = new HashMap<String, Object>();
+		ReportUtils ee = new ReportUtils();
+		try {
+			listI.add(list.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { m }, path+"mould/refuelQc.xls",
+					path+"export/" + date + "-氢气车日报表.xls");
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+		return list;
+	}
+	
+	@Override
 	public String importExcel(File file) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -55,33 +55,40 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="7">调度班次日报</th>
+								<th colspan="11">调度班次日报</th>
 							</tr>
 							<tr>
 								<td>路线：</td>
-								<td colspan="2"><span id="form_line">&nbsp;</span></td>
+								<td colspan="3"><span id="form_line">&nbsp;</span></td>
 								<td>时间：</td>
-								<td colspan="3"><span id="form_date">&nbsp;</span></td>
+								<td colspan="6"><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>
 							</tr>
 						</thead>
 						<tbody id="tbody">
 						</tbody>
 						<tr>
-							<td colspan="3">小计</td>
+							<td colspan="4">小计</td>
 							<td><span id="total_zgl">&nbsp;</span></td>
 							<td><span id="total_ks">&nbsp;</span></td>
+							<td><span id="total_lbgl">&nbsp;</span></td>
+							<td><span id="total_ljgl">&nbsp;</span></td>
 							<td><span id="total_yh">&nbsp;</span></td>
 							<td><span id="total_bc">&nbsp;</span></td>
+							<td><span id="total_carDay">&nbsp;</span></td>
 						</tr>
 					</table>
 				</div>
@@ -212,18 +219,26 @@
 	        var total_zgl = 0,total_ks = 0;
 	        var total_yh = 0,total_bc = 0;
+	        var total_lbgl = 0,total_ljgl = 0;
+	        var total_carDay = 0;
 	        $.each(result, function(i, obj) {
-	        	total_zgl +=Number(obj.zlc*10000);
-	        	total_ks +=Number(obj.jzl1*10000);
+	        	total_zgl += Number(obj.zlc*10000);
+	        	total_ks += Number(obj.jzl1*10000);
 	        	total_yh += Number(obj.yh*10000);
 	        	total_bc += Number(obj.bc);
+	        	total_lbgl += Number(obj.lblc*10000);
+	        	total_ljgl += Number(obj.ljlc*10000);
+	        	total_carDay += Number(obj.carDay);
             });
             $("#total_zgl").text((total_zgl/10000).toFixed(3));
             $("#total_ks").text((total_ks/10000).toFixed(3));
             $("#total_yh").text((total_yh/10000).toFixed(2));
             $("#total_bc").text(total_bc.toFixed(0));
+            $("#total_lbgl").text((total_lbgl/10000).toFixed(3));
+            $("#total_ljgl").text((total_ljgl/10000).toFixed(3));
+            $("#total_carDay").text(total_carDay.toFixed(0));
 	        var temp = {};
 	        var today_account = 0;
@@ -261,17 +276,21 @@
 	{{each list as obj i}}
 		<tr>
 			<td>{{obj.zbh}}</td>
+			<td>{{obj.lp}}</td>
 			<td>{{obj.jgh}}</td>
 			<td>{{obj.jName}}</td>
 			<td>{{obj.zlc}}</td>
 			<td>{{obj.jzl1}}</td>
+			<td>{{obj.lblc}}</td>
+			<td>{{obj.ljlc}}</td>
 			<td>{{obj.yh}}</td>
-			<td>{{obj.bc}}</td>
+			<td>{{obj.bc}}</td>
+			<td>{{obj.carDay}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="11"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -45,7 +45,7 @@
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="筛选"/>
 						<input class="btn btn-default" type="button" id="upload" value="导入Excel"/>
-<!-- 						<input class="btn btn-default" type="button" id="export" value="导出"/> -->
+						<input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>
 			</div>
@@ -123,6 +123,22 @@
     	$.get('refuelUpload.html', function(m){$(pjaxContainer).append(m);});
     });
+	$("#export").on("click",function(){
+		if($("#date").val() == null || $("#date").val().trim().length == 0){
+			layer.msg("请选择日期");
+			return;
+		}
+		date = $("#date").val();
+		car = $("#car").val();
+		driver = $("#driver").val();
+		var i = layer.load(2);
+		$get('/refuel/exportRefuel',{date:date,car:car,driver:driver,type:'export'},function(result){
+			window.open("/downloadFile/download?fileName="
+					+date+"-油量导入");
+			layer.close(i);
+		});
+	});
+	
 });
 </script>
 <script type="text/html" id="refuel">
@@ -53,6 +53,7 @@
 								<td>日期</td>
 								<td>路别</td>
 								<td>车号</td>
+								<td>路牌</td>
 								<td>驾驶员</td>
 								<td>出场电容</td>
 								<td>进场电容</td>
@@ -222,6 +223,7 @@
 			<td>{{obj.date}}</td>
 			<td>{{obj.line}}</td>
 			<td>{{obj.car}}</td>
+			<td>{{obj.lp}}</td>
 			<td>{{obj.driver}}</td>
 			<td></td>
 			<td></td>
+<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; }
+	  .btn-default{
+	   margin-left: 5px;
+	  }
+</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: 24px;">
+                        <span class="item-label" style="width: 80px;">&nbsp;日期: </span>
+                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                    </div>
+					<div style="display: inline-block;">
+                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 180px;" multiple="multiple"></select>
+                    </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>
+								<td>序号</td>
+								<td>日期</td>
+								<td>路别</td>
+								<td>车号</td>
+								<td>路牌</td>
+								<td>驾驶员</td>
+								<td>加氢量<br/>（公斤）</td>
+								<td>加氢金额<br/>（元）</td>
+								<td>路单公里</td>
+								<td>空驶公里</td>
+								<td>损失公里</td>
+								<td>班次</td>
+								<td>营运班次</td>
+								<td>车日</td>
+								<td>备注</td>
+							</tr>
+						</thead>
+						<tbody id="tbody">
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		var d = new Date();
+		d.setTime(d.getTime() - 1*1000*60*60*24);
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		var dateTime = year + "-" + month + "-" + day;
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		$("#date").val(dateTime);
+		
+		$.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,'');
+				initCl();
+			});
+		});
+		//重置
+        $('#czcl').on('click', function () {
+            $('#code').val('').change();
+        });
+		$("#line").on("change",initCl);
+		function initCl(){
+	        $('#code').select2({
+	            ajax: {
+	                url: '/report/carList',
+	                dataType: 'json',
+	                delay: 150,
+	                data: function(params){
+	                    return{nbbm: params.term,xlbm:$('#line').val()};
+	                },
+	                processResults: function (data) {
+	                  return {
+	                    results: data
+	                  };
+	                },
+	                cache: true
+	            },
+	            templateResult: function(repo){
+	                if (repo.loading) return repo.text;
+	                var h = '<span>'+repo.text+'</span>';
+	                h += (repo.lineName?'&nbsp;<span class="select2-desc">'+repo.lineName+'</span>':'');
+	                return h;
+	            },
+	            escapeMarkup: function (markup) { return markup; },
+	            minimumInputLength: 1,
+	            templateSelection: function(repo){
+	                return repo.text;
+	            },
+	            language: {
+	               noResults: function(){
+	                   return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+	               },
+	               inputTooShort : function(e) {
+	                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+	               },
+	               searching : function() {
+	                    return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+	               }
+	            }
+	        });
+		}
+		
+	
+	var line = "", date = "", car = "";
+	$("#query").on("click",function(){
+		if($("#date").val() == null || $("#date").val().trim().length == 0){
+			layer.msg("请选择日期");
+			return;
+		}
+		line = "";
+		$($("#line").val()).each(function(i, e){
+			line += e + ",";
+		});
+		if(line.length > 0){
+			line = line.substring(0, line.length - 1);
+		} else {
+			layer.msg("请选择线路");
+			return;
+		}
+		date = $("#date").val();
+		car = $("#code").val();
+		var i = layer.load(2);
+		$get('/refuel/queryQc',{line:line,date:date,car:car,type:'query'},function(result){
+			// 把数据填充到模版中
+			var tbodyHtml = template('refuel_qc',{list:result});
+			// 把渲染好的模版html文本追加到表格中
+			$('#tbody').html(tbodyHtml);
+			layer.close(i);
+		});
+	});
+	
+	$("#export").on("click",function(){
+		if(date && date != ""){
+			var i = layer.load(2);
+			var params = {};
+			params['line'] = line;
+			params['date'] = date;
+			params['car'] = car;
+			$get('/refuel/exportQueryQc', params, function(result){
+				layer.close(i);
+				window.open("/downloadFile/download?fileName="
+						+date+"-氢气车日报表");
+				layer.close(i);
+			});
+		}
+	});
+	
+});
+</script>
+<script type="text/html" id="refuel_qc">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i + 1}}</td>
+			<td>{{obj.date}}</td>
+			<td>{{obj.line}}</td>
+			<td>{{obj.car}}</td>
+			<td>{{obj.lp}}</td>
+			<td>{{obj.driver}}</td>
+			<td>{{obj.jql}}</td>
+			<td>{{obj.jqje}}</td>
+			<td>{{obj.realMileage}}</td>
+			<td>{{obj.ksMileage}}</td>
+			<td>{{obj.ssMileage}}</td>
+			<td>{{obj.bc}}</td>
+			<td>{{obj.yybc}}</td>
+			<td>{{obj.cr}}</td>
+			<td title="{{obj.remark}}">
+             	{{if obj.remark !=""}}
+					<div class="caption">
+
+                    	<font style="font-size: 24px;font-weight: bold;">！</font>
+
+                    </div>
+				{{/if}}
+			</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 \ No newline at end of file
@@ -318,14 +318,24 @@
 <script type="text/html" id="ludan_2">
 	{{each list as obj i}}
 		<tr>
-			<td>
+			
 				{{if obj.adjustExps == "子"}}
-					{{obj.adjustExps}}
+					<td title="子任务" style="font-size: 20px;font-weight: bold;">
+						{{obj.adjustExps}}
+					</td>
 				{{/if}}
 				{{if obj.adjustExps != "子"}}
-					{{i+1}}
+					{{if obj.sflj == true}}
+						<td title="临加班次" style="font-size: 20px;font-weight: bold;">
+							临
+						</td>
+					{{/if}}
+					{{if obj.sflj == false}}
+						<td>
+							{{i+1}}
+						</td>
+					{{/if}}
 				{{/if}}
-			</td>
 			<td>{{obj.lpName}}</td>
 			<td>{{obj.jGh}}{{obj.jName}}</td>
 			<td>