路线月报台账、线路月报同比

yiming
1 parent 7f44aa98
Showing 56 changed files with 8529 additions and 126 deletions
src/main/java/com/bsth/controller/oil/JqlController.java
src/main/java/com/bsth/controller/oil/QlbController.java
src/main/java/com/bsth/controller/oil/YlxxbController.java
src/main/java/com/bsth/controller/report/XlybtbController.java
src/main/java/com/bsth/controller/report/XlybtzController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/oil/Jdl.java
src/main/java/com/bsth/entity/oil/Jql.java
src/main/java/com/bsth/entity/oil/Qlb.java
src/main/java/com/bsth/entity/oil/Ylxxb.java
src/main/java/com/bsth/entity/realcontrol/Xlybtb.java
src/main/java/com/bsth/entity/realcontrol/Xlybtz.java
src/main/java/com/bsth/entity/report/CardExcel.java
src/main/java/com/bsth/entity/report/LineCompare.java
src/main/java/com/bsth/entity/report/PWExcel.java
src/main/java/com/bsth/entity/report/QRCodeExcel.java
src/main/java/com/bsth/entity/report/Ticket.java
src/main/java/com/bsth/repository/LineInformationRepository.java
src/main/java/com/bsth/repository/oil/JdlRepository.java
+package com.bsth.controller.oil;
+
+import java.io.File;
+import java.util.HashMap;
+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 org.springframework.web.multipart.MultipartFile;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.oil.Jql;
+import com.bsth.service.oil.JqlService;
+import com.google.common.io.Files;
+
+@RestController
+@RequestMapping("jql")
+public class JqlController extends BaseController<Jql, Integer> {
+
+	@Autowired
+	JqlService jqlService;
+
+	public String getDataImportClasspath(){
+		return this.getClass().getResource("/").getPath() + "/static/pages/hydrogen/jql";
+	}
+	
+	@RequestMapping(value = "/uploadFile",method = RequestMethod.POST)
+	public String uploadFile(MultipartFile file, String gsbm_, String gsName,
+											String fgsbm_, String fgsName) throws Exception{
+		Map<String, Object> map = new HashMap<String, Object>();
+        File newFile = new File(
+        		getDataImportClasspath() + File.separator +
+                        file.getOriginalFilename());
+        Files.write(file.getBytes(), newFile);
+		String result = jqlService.importExcel(newFile, gsbm_, gsName, fgsbm_, fgsName);
+		return "{\"result\":" + "\""+result+"\"}";
+	}
+	
+	@RequestMapping(value = "/query",method = RequestMethod.GET)
+	public Map<String, Object> query(@RequestParam Map<String, Object> map) throws Exception{
+		return jqlService.query(map);
+	}
+	
+}
+package com.bsth.controller.oil;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+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.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+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.entity.oil.Qlb;
+import com.bsth.service.oil.QlbService;
+import com.bsth.util.Arith;
+import com.bsth.util.ReportUtils;
+import com.google.common.base.Splitter;
+
+@RestController
+@RequestMapping("qlb")
+public class QlbController extends BaseController<Qlb, Integer>{
+	@Autowired
+	QlbService service;
+	/**
+	 * 
+	 * @Title: list 
+	 * @Description: TODO(多条件分页查询) 
+	 * @param @param map 查询条件
+	 * @param @param page 页码
+	 * @param @param size 每页显示数量
+	 * @throws
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	public Page<Qlb> list(@RequestParam Map<String, Object> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "10") int size,
+			@RequestParam(defaultValue = "id") String order,
+			@RequestParam(defaultValue = "DESC") String direction){
+
+		Direction d;
+//		map.put("xlbm_like", map.get("xlbm_like").toString().trim());
+//		try {
+		String rq=map.get("rq").toString();
+		if(!(rq=="")){
+//			
+//			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+//			  Calendar   calendar   =   new   GregorianCalendar(); 
+//			  calendar.setTime(sdf.parse(rq)); 
+//			  calendar.add(calendar.DATE,1);
+//			  Date date=calendar.getTime();
+			map.put("rq_eq", rq);
+//			map.put("rq_lt", sdf.format(date));
+//			System.out.println(rq);
+//			System.out.println(sdf.format(date));
+		}
+//		} catch (ParseException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+		if(null != direction && direction.equals("ASC"))
+			d = Direction.ASC;
+		else
+			d = Direction.DESC;
+
+        // 允许多个字段排序，order可以写单个字段，也可以写多个字段
+        // 多个字段格式：{col1},{col2},{col3},....,{coln}
+        // 每个字段的排序方向都是一致，这个以后再看要不要改
+        List<String> list = Splitter.on(",").trimResults().splitToList(order);
+        return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
+	}
+	@RequestMapping(value = "/qlbList",method = RequestMethod.GET)
+	public List<Qlb> qlbList(@RequestParam Map<String, Object> map){
+		List<Qlb> list=service.listQlb(map);
+		return list;
+	}
+	
+	
+	
+	@RequestMapping(value = "/obtain",method = RequestMethod.GET)
+	public Map<String, Object> obtain(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list = service.obtain(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}
+		return list;
+	}
+	
+	/**
+	 * 保存氢量
+	 * @param map
+	 * @return
+	 */
+	@RequestMapping(value = "/sort",method = RequestMethod.GET)
+	public Map<String, Object> sort(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=service.sort(map);
+		return list;
+	}
+	
+	/**
+	 * 核对氢量（有加氢没里程）
+	 * @param map
+	 * @return
+	 */
+	@RequestMapping(value = "/checkQl",method = RequestMethod.GET)
+	public Map<String, Object> checkQl(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=service.checkQl(map);
+		return list;
+	}
+	
+	@RequestMapping(value = "/sumQlb",method = RequestMethod.GET)
+	public Map<String, Object> sumQlb(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=service.sumQlb(map);
+		return list;
+	}
+	
+	@RequestMapping(value = "/saveQlbList",method = RequestMethod.POST)
+	public Map<String, Object> saveQlbList(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list = service.saveQlbList(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return list;
+	}
+	
+
+	@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");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Qlb> qlb = service.listQlb(map);
+//		(new CustomerSpecs<Ylb>(map)).iterator();
+		List<Map<String, Object>>  resList = new ArrayList<Map<String, Object>>();
+		for (Qlb y : qlb) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("rq", y.getRq());
+			m.put("gsname",y.getGsname() );
+			m.put("fgsname", y.getFgsname());
+			if(y.getLinename()==null){
+				m.put("xlname", y.getXlname()==null?"":y.getXlname());
+			}else{
+				m.put("xlname", y.getLinename());
+			}			
+			m.put("nbbm", y.getNbbm());
+			m.put("jsy", y.getJsy());
+			m.put("name", y.getName());
+			m.put("jql", y.getJql()<=0?"0":y.getJql());
+			m.put("czcl", y.getCzcl()<=0?"0":y.getCzcl()+"%");
+			m.put("jzcl", y.getJzcl()<=0?"0":y.getJzcl()+"%");
+			m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
+			m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
+			m.put("hn", y.getHn()<=0?"0":y.getHn());
+			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("ns", y.getNs()<=0?"0":y.getNs());
+			m.put("shyy", shyy);
+			m.put("sh", y.getSh()<=0?"0":y.getSh());
+			m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
+			m.put("rdlx", "");
+			m.put("bglnh", y.getBglhn());
+			m.put("znh", Arith.add(y.getSh(), y.getHn()));
+			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/listQl.xls",
+				path+"export/"+map.get("rq").toString()+ "进出场存氢量.xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			
+		return resList;
+		
+	}
+	
+	
+	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
+	public String checkJsy(@RequestParam Map<String, Object> map){
+		String list=service.checkJsy(map);
+		return list;
+	}
+	
+	@RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
+    public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
+		Map<String, Object> maps=new HashMap<String, Object>();
+        try {
+        	maps= service.deleteIds(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return maps;
+    }
+	
+	@RequestMapping(value = "/saveQlb",method = RequestMethod.POST)
+	public Map<String, Object> saveQlb(Qlb t){
+//		SysUser user = SecurityUtils.getCurrentUser();
+		t.setCreatetime(new Date());
+//		Ylb t=new Ylb();
+		return service.saveQlb(t);
+	}
+	
+	@RequestMapping(value = "/updateJsy",method = RequestMethod.GET)
+	public Map<String, Object> updateJsy(@RequestParam Map<String, Object> map){
+		return service.update(map);
+	}
+}
 package com.bsth.controller.oil;
+import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import com.google.common.io.Files;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,6 +16,7 @@ import com.bsth.controller.BaseController;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.service.oil.YlxxbService;
 import com.bsth.util.PageObject;
+import org.springframework.web.multipart.MultipartFile;
 @RestController
 @RequestMapping("ylxxb")
@@ -76,5 +79,24 @@ public class YlxxbController extends BaseController&lt;Ylxxb, Integer&gt;{
 		}
 		return maps;
 	}
-	
+
+
+	public String getDataImportClasspath(){
+		return this.getClass().getResource("/").getPath() + "/static/pages/oil";
+	}
+
+	@RequestMapping(value = "/uploadFile",method = RequestMethod.POST)
+	public String uploadFile(MultipartFile file) throws Exception{
+		File newFile = new File(
+				getDataImportClasspath() + File.separator +
+						file.getOriginalFilename());
+		Files.write(file.getBytes(), newFile);
+		String result = service.importExcel(newFile);
+		return "{\"result\":" + "\""+result+"\"}";
+	}
+
+	@RequestMapping(value = "/query",method = RequestMethod.GET)
+	public Map<String, Object> query(@RequestParam Map<String, Object> map) throws Exception{
+		return service.query(map);
+	}
 }
+package com.bsth.controller.report;
+
+
+import com.bsth.service.report.XlybtbService;
+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 java.util.Map;
+
+@RestController
+@RequestMapping("xlybtb")
+public class XlybtbController {
+
+    @Autowired
+    XlybtbService xlybtbService;
+    @RequestMapping(value = "/query",method = RequestMethod.GET)
+    public Map<String, Object> query(@RequestParam Map<String, Object> map) throws Exception{
+        Map<String, Object> m= xlybtbService.query(map);
+        return m;
+    }
+
+}
+package com.bsth.controller.report;
+
+
+import com.bsth.service.report.XlybtzService;
+import com.google.common.io.Files;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.*;
+import java.util.*;
+
+@RestController
+@RequestMapping("xlybtz")
+public class XlybtzController {
+
+    @Autowired
+    XlybtzService xlybtzService;
+
+    public String getDataImportClasspath(){
+        return this.getClass().getResource("/").getPath() + "/static/pages/electricity/jdl";
+    }
+    @RequestMapping(value = "/uploadFile",method = RequestMethod.POST)
+    public String uploadFile(MultipartFile file,@RequestParam int reportType,@RequestParam String date) throws Exception{
+        File newFile = new File(getDataImportClasspath() + File.separator + file.getOriginalFilename());
+        Files.write(file.getBytes(), newFile);
+        String type=null;
+        String result=null;
+        if(reportType==1){
+            type="票务";
+            result = xlybtzService.imporPWExcel(newFile,date);
+        }else if(reportType==2){
+            type="二维码";
+            result = xlybtzService.importQRCordExcel(newFile,date);
+        }
+        else if(reportType==3){
+            type="申城通";
+            result = xlybtzService.importCardExcel(newFile,date,type);
+        }
+        else if(reportType==4){
+            type="实体卡";
+            result = xlybtzService.importCardExcel(newFile,date,type);
+        }
+        else if(reportType==5){
+            type="保通卡";
+            result = xlybtzService.importCardExcel(newFile,date,type);
+        }
+        else{
+            result="请选择导入类型";
+        }
+
+        return "{\"result\":" + "\""+result+"\"}";
+    }
+
+    @RequestMapping(value = "/query",method = RequestMethod.GET)
+    public Map<String, Object> query(@RequestParam Map<String, Object> map) throws Exception{
+        Map<String, Object> m= xlybtzService.query(map);
+        return m;
+    }
+
+}
@@ -3,9 +3,11 @@ package com.bsth.data;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.pinyin.PersionPinYinBuffer;
 import com.bsth.entity.*;
+import com.bsth.entity.report.LineCompare;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.*;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.repository.ticket.LineCompareRepository;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import org.apache.commons.lang3.StringUtils;
@@ -45,6 +47,9 @@ public class BasicData {
     //车辆自编号和牌照号对照 （K: 车辆自编号 ，V：牌照号）
     public static Map<String, String> nbbmCompanyPlateMap;
+    //牌照号和车辆自编号对照 （K: 牌照号 ，V：车辆自编号）
+    public static Map<String, String> plate2NbbmMap;
+
     //站点编码和名称对照，包括停车场 （K: lineCode_updown_stationCode ，V：站点名称）
     public static Map<String, String> stationCode2NameMap;
@@ -58,6 +63,8 @@ public class BasicData {
     public static Map<String, String> lineCode2NameMap;
     public static Map<String, String> lineCodeAllNameMap;
+    //名称和线路编码对照
+    public static Map<String, String> Name2LineCodeMap;
     //停车场
     public static List<String> parkCodeList;
@@ -79,6 +86,12 @@ public class BasicData {
     //站点名和运管处编号 对照
     public static Map<String, Integer> stationName2YgcNumber;
+    //青浦线路编码转调度线路编码
+    public static Map<String, LineCompare> lineCodeOut2LineCodeMap;
+
+    //青浦票务系统线路名转调度线路编码
+    public static Map<String, LineCompare> namePWOut2LineCodeMap;
+
     public static List<WhiteIp> whiteIpList;
     private static Map<String, SystemParam> key2param = new HashMap<>();
@@ -141,6 +154,9 @@ public class BasicData {
         @Autowired
         private SystemParamRepository systemParamRepository;
+        @Autowired
+        private LineCompareRepository lineCompareRepository;
+
         @Override
         public void run() {
             loadAllData();
@@ -170,6 +186,7 @@ public class BasicData {
                 geoCacheData.loadData();
                 station2ParkBuffer.saveAll();
                 loadSystemParam();
+                loadLineCompare();
                 logger.info("加载基础数据成功！，");
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
@@ -208,7 +225,8 @@ public class BasicData {
             //车辆自编号和拍照号对照
             Map<String, String> nbbmCompanyPlate = new HashMap<>();
-            
+            //车辆自编号和拍照号对照
+            Map<String, String> plate2nbbm = new HashMap<>();
             Iterator<Cars> carIterator = carsRepository.findAll().iterator();
             Cars car;
             while (carIterator.hasNext()) {
@@ -217,12 +235,14 @@ public class BasicData {
                 nbbm2CompanyCode.put(car.getInsideCode(), car.getBusinessCode());
                 nbbm2FgsCompanyCode.put(car.getInsideCode(), car.getBrancheCompanyCode() + "_" + car.getBusinessCode() );
                 nbbmCompanyPlate.put(car.getInsideCode(), car.getCarPlate());
+                plate2nbbm.put(car.getCarPlate(),car.getInsideCode());
             }
             deviceId2NbbmMap = deviceId2Nbbm;
             nbbm2CompanyCodeMap = nbbm2CompanyCode;
             nbbm2FgsCompanyCodeMap = nbbm2FgsCompanyCode;
             nbbmCompanyPlateMap =nbbmCompanyPlate;
+            plate2NbbmMap=plate2nbbm;
         }
         /**
@@ -285,7 +305,7 @@ public class BasicData {
             Map<Integer, String> id2SHcode = new HashMap<Integer, String>();
             Map<String, String> code2SHcode = new HashMap<String, String>();
             Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
-
+            Map<String, String> name2code = new HashMap<>();
             /**
              * 加载运管处的站点及序号
              * 上行从1开始，下行顺序续编
@@ -317,6 +337,7 @@ public class BasicData {
                 code2name.put(line.getLineCode(), line.getName());
                 id2SHcode.put(line.getId(), line.getShanghaiLinecode());
                 code2SHcode.put(line.getLineCode(), line.getShanghaiLinecode());
+                name2code.put(line.getName(), line.getLineCode());
             }
             // 特殊线路ID为0的数据 (小模块轨迹)
@@ -328,6 +349,7 @@ public class BasicData {
             lineId2ShangHaiCodeMap = id2SHcode;
             lineCode2ShangHaiCodeMap = code2SHcode;
             stationName2YgcNumber = tempStationName2YgcNumber;
+            Name2LineCodeMap =name2code;
             Map<String, String> code2nameAll = new HashMap<>();
             Iterator<Line> iteratorAll = lineRepository.findAll().iterator();
@@ -393,6 +415,22 @@ public class BasicData {
                 BasicData.key2param = key2param;
             }
         }
+        public void loadLineCompare() {
+            Iterator<LineCompare> allIterator = lineCompareRepository.findAll().iterator();
+            Map<String, LineCompare> map = new HashMap<>();
+            Map<String, LineCompare> map2 = new HashMap<>();
+
+            LineCompare lc;
+            while (allIterator.hasNext()) {
+                lc = allIterator.next();
+                if(lc.getLineCodeOut()!=null){
+                    map.put(lc.getLineCodeOut(), lc);
+                }
+                map2.put(lc.getNamePw(),lc);
+            }
+            lineCodeOut2LineCodeMap = map;
+            namePWOut2LineCodeMap =map2;
+        }
     }
     @Component
@@ -128,6 +128,8 @@ public class Cars extends BEntity implements Serializable {
     private Boolean sfdc;
     /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */
     private Boolean sfmix;
+    /** 是否氢能源车 */
+    private Boolean hydrogen;
     /** 备注/描述 */
     private String descriptions;
@@ -452,6 +454,9 @@ public class Cars extends BEntity implements Serializable {
     }
     public Boolean getSfdc() {
+        if(sfdc==null){
+            sfdc=false;
+        }
         return sfdc;
     }
@@ -516,10 +521,24 @@ public class Cars extends BEntity implements Serializable {
     }
     public Boolean getSfmix() {
+        if(sfmix==null){
+            sfmix=false;
+        }
         return sfmix;
     }
     public void setSfmix(Boolean sfmix) {
         this.sfmix = sfmix;
     }
+
+	public Boolean getHydrogen() {
+        if(hydrogen==null){
+            hydrogen=false;
+        }
+		return hydrogen;
+	}
+
+	public void setHydrogen(Boolean hydrogen) {
+		this.hydrogen = hydrogen;
+	}
 }
 package com.bsth.entity.oil;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import javax.persistence.Entity;
@@ -28,7 +29,8 @@ public class Jdl {
 	private String remarks;
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date createrDate;
-	
+	private String rqStr;
+	private String plate;
 	public Integer getId() {
 		return id;
@@ -102,7 +104,17 @@ public class Jdl {
 	public void setJsy(String jsy) {
 		this.jsy = jsy;
 	}
-	
-	
-	
+
+	static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+	public String getRqStr() {
+		return sdf.format(rq);
+	}
+
+	public String getPlate() {
+		return plate;
+	}
+
+	public void setPlate(String plate) {
+		this.plate = plate;
+	}
 }
+package com.bsth.entity.oil;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Entity
+@Table(name = "bsth_c_jql")
+public class Jql {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date rq;
+	private String gsBm;
+	private String gsName;
+	private String fgsBm;
+	private String fgsName;
+	private String nbbm;
+	private String jsy;
+	private Double jql = 0.0;
+	private String jqz;
+	private String remarks;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createrDate;
+	private String rqStr;
+	private String plate;
+	
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Date getRq() {
+		return rq;
+	}
+	public void setRq(Date rq) {
+		this.rq = rq;
+	}
+	public String getGsBm() {
+		return gsBm;
+	}
+	public void setGsBm(String gsBm) {
+		this.gsBm = gsBm;
+	}
+	public String getGsName() {
+		return gsName;
+	}
+	public void setGsName(String gsName) {
+		this.gsName = gsName;
+	}
+	public String getFgsBm() {
+		return fgsBm;
+	}
+	public void setFgsBm(String fgsBm) {
+		this.fgsBm = fgsBm;
+	}
+	public String getFgsName() {
+		return fgsName;
+	}
+	public void setFgsName(String fgsName) {
+		this.fgsName = fgsName;
+	}
+	public String getNbbm() {
+		return nbbm;
+	}
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+	public Double getJql() {
+		return jql;
+	}
+	public void setJql(Double jql) {
+		this.jql = jql;
+	}
+	public String getJqz() {
+		return jqz;
+	}
+	public void setJqz(String jqz) {
+		this.jqz = jqz;
+	}
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	public Date getCreaterDate() {
+		return createrDate;
+	}
+	public void setCreaterDate(Date createrDate) {
+		this.createrDate = createrDate;
+	}
+	public String getJsy() {
+		return jsy;
+	}
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+	public String getRqStr() {
+		return sdf.format(rq);
+	}
+
+	public String getPlate() {
+		return plate;
+	}
+
+	public void setPlate(String plate) {
+		this.plate = plate;
+	}
+}
+package com.bsth.entity.oil;
+
+import com.bsth.data.BasicData;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.text.DecimalFormat;
+import java.util.Date;
+
+@Entity
+@Table(name = "bsth_c_qlb")
+public class Qlb {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date rq;
+	private String xlbm;
+	private String linename;
+	private String ssgsdm;
+	private String fgsdm;
+	private String nbbm;
+	private String jsy;
+	private Double czlc=0.0;
+	private Double jzlc=0.0;
+	//出站存量
+	private Double czcl=0.0;
+	//进站存量
+	private Double jzcl=0.0;
+	//充电量
+	private Double jql;
+	//是否跨天营运
+	private int sfkt;
+	private String jhsj;
+	//耗能
+	private Double hn=0.0;
+	//损耗
+	private Double sh=0.0;
+	//损耗原因
+	private String shyy;
+	private Double zlc=0.0;
+	//能耗类型
+	private int nhlx;
+	//尿素
+	private Double ns=0.0;
+	private Double fyylc=0.0;
+	private Double jhzlc=0.0;
+	private Double jhfyylc=0.0;
+	private int jhzbc;
+	private int jhbc;
+	private int sjzbc;
+	private int sjbc;
+	private String edituser;
+	private Date edittime;
+	private Date createtime;
+	private Date updatetime;
+	//能源类型
+	private int nylx;
+	//进场顺序（根据最先出场和最后进场来关联车辆的存电量）
+	private int jcsx;
+	
+	private String jname;
+	@Transient
+	private String name;
+	@Transient
+	private String bglhn;
+	
+	@Transient
+	private String xlname;
+	
+	@Transient
+	private String gsname;
+	
+	@Transient
+	private String fgsname;
+	
+	
+	
+	private String lp;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Date getRq() {
+		return rq;
+	}
+
+	public void setRq(Date rq) {
+		this.rq = rq;
+	}
+
+	public String getXlbm() {
+		return xlbm;
+	}
+
+	public void setXlbm(String xlbm) {
+		this.xlbm = xlbm;
+	}
+
+	public String getLinename() {
+		return linename;
+	}
+
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+
+	public String getSsgsdm() {
+		return ssgsdm;
+	}
+
+	public void setSsgsdm(String ssgsdm) {
+		this.ssgsdm = ssgsdm;
+	}
+
+	public String getFgsdm() {
+		return fgsdm;
+	}
+
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public Double getCzlc() {
+		return czlc;
+	}
+
+	public void setCzlc(Double czlc) {
+		this.czlc = czlc;
+	}
+
+	public Double getJzlc() {
+		return jzlc;
+	}
+
+	public void setJzlc(Double jzlc) {
+		this.jzlc = jzlc;
+	}
+
+	public Double getCzcl() {
+		return czcl;
+	}
+
+	public void setCzcl(Double czcl) {
+		this.czcl = czcl;
+	}
+
+	public Double getJzcl() {
+		return jzcl;
+	}
+
+	public void setJzcl(Double jzcl) {
+		this.jzcl = jzcl;
+	}
+
+	public Double getJql() {
+		return jql;
+	}
+
+	public void setJql(Double jql) {
+		this.jql = jql;
+	}
+
+	public int getSfkt() {
+		return sfkt;
+	}
+
+	public void setSfkt(int sfkt) {
+		this.sfkt = sfkt;
+	}
+
+	public String getJhsj() {
+		return jhsj;
+	}
+
+	public void setJhsj(String jhsj) {
+		this.jhsj = jhsj;
+	}
+
+	public Double getHn() {
+		return hn;
+	}
+
+	public void setHn(Double hn) {
+		this.hn = hn;
+	}
+
+	public Double getSh() {
+		return sh;
+	}
+
+	public void setSh(Double sh) {
+		this.sh = sh;
+	}
+
+	public String getShyy() {
+		return shyy;
+	}
+
+	public void setShyy(String shyy) {
+		this.shyy = shyy;
+	}
+
+	public Double getZlc() {
+		return zlc;
+	}
+
+	public void setZlc(Double zlc) {
+		this.zlc = zlc;
+	}
+
+	public int getNhlx() {
+		return nhlx;
+	}
+
+	public void setNhlx(int nhlx) {
+		this.nhlx = nhlx;
+	}
+
+	public Double getNs() {
+		return ns;
+	}
+
+	public void setNs(Double ns) {
+		this.ns = ns;
+	}
+
+	public Double getFyylc() {
+		return fyylc;
+	}
+
+	public void setFyylc(Double fyylc) {
+		this.fyylc = fyylc;
+	}
+
+	public Double getJhzlc() {
+		return jhzlc;
+	}
+
+	public void setJhzlc(Double jhzlc) {
+		this.jhzlc = jhzlc;
+	}
+
+	public Double getJhfyylc() {
+		return jhfyylc;
+	}
+
+	public void setJhfyylc(Double jhfyylc) {
+		this.jhfyylc = jhfyylc;
+	}
+
+	public int getJhzbc() {
+		return jhzbc;
+	}
+
+	public void setJhzbc(int jhzbc) {
+		this.jhzbc = jhzbc;
+	}
+
+	public int getJhbc() {
+		return jhbc;
+	}
+
+	public void setJhbc(int jhbc) {
+		this.jhbc = jhbc;
+	}
+
+	public int getSjzbc() {
+		return sjzbc;
+	}
+
+	public void setSjzbc(int sjzbc) {
+		this.sjzbc = sjzbc;
+	}
+
+	public int getSjbc() {
+		return sjbc;
+	}
+
+	public void setSjbc(int sjbc) {
+		this.sjbc = sjbc;
+	}
+
+	public String getEdituser() {
+		return edituser;
+	}
+
+	public void setEdituser(String edituser) {
+		this.edituser = edituser;
+	}
+
+	public Date getEdittime() {
+		return edittime;
+	}
+
+	public void setEdittime(Date edittime) {
+		this.edittime = edittime;
+	}
+
+	public Date getCreatetime() {
+		return createtime;
+	}
+
+	public void setCreatetime(Date createtime) {
+		this.createtime = createtime;
+	}
+
+	public int getNylx() {
+		return nylx;
+	}
+
+	public void setNylx(int nylx) {
+		this.nylx = nylx;
+	}
+
+	public int getJcsx() {
+		return jcsx;
+	}
+
+	public void setJcsx(int jcsx) {
+		this.jcsx = jcsx;
+	}
+
+	public String getBglhn() {
+		if(this.getZlc()==0){
+			return "0";
+		}else{
+			DecimalFormat df = new DecimalFormat("0.00");
+			return df.format(this.getHn()/this.getZlc()*100);
+		}
+	}
+
+	public void setBglhn(String bglhn) {
+		this.bglhn = bglhn;
+	}
+
+	public String getXlname() {
+		return BasicData.lineCodeAllNameMap.get(this.xlbm);
+	}
+
+	public void setXlname(String xlname) {
+		this.xlname = xlname;
+	}
+
+	public String getGsname() {
+		return 	BasicData.businessCodeNameMap.get(this.ssgsdm);
+	}
+
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+
+	public String getName() {
+		return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+
+	public Date getUpdatetime() {
+		return updatetime;
+	}
+
+	public void setUpdatetime(Date updatetime) {
+		this.updatetime = updatetime;
+	}
+
+	public String getLp() {
+		return lp;
+	}
+
+	public void setLp(String lp) {
+		this.lp = lp;
+	}
+
+	public String getJname() {
+		return jname;
+	}
+
+	public void setJname(String jname) {
+		this.jname = jname;
+	}
+	
+	
+	
+}
 package com.bsth.entity.oil;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import javax.persistence.Entity;
@@ -48,8 +49,10 @@ public class Ylxxb {
 	private String linename;
 	@Transient
 	private Double zjzl;
-	
-	
+
+	private String yh;
+
+
 	public Integer getId() {
 		return id;
 	}
@@ -200,7 +203,17 @@ public class Ylxxb {
 	public void setLinename(String linename) {
 		this.linename = linename;
 	}
-	
-	
-	
+
+	static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+	public String getRqStr() {
+		return sdf.format(yyrq);
+	}
+
+	public String getYh() {
+		return yh;
+	}
+
+	public void setYh(String yh) {
+		this.yh = yh;
+	}
 }
+package com.bsth.entity.realcontrol;
+
+
+import java.text.DecimalFormat;
+import java.util.List;
+
+//线路月报同比
+public class Xlybtb {
+
+    private String xl;//路线
+    private double xlcd;//线路长度
+    private int rcjh;//人次计划
+    private int rcsj;//人次实际
+    private int rctq;//人次同期
+    private Double rctb;//人次同比
+    private Double rcjhwc;//人次计划完成
+
+    private int ysjh;//营收计划
+    private double yssj;//营收实际
+    private double ystq;//营收同期
+    private Double ystb;//营收同比
+    private Double ysybgl;//营收 元/百公里
+    private Double ysjhwc;//营收计划完成
+
+    private double lcjh;//里程计划
+    private double lcsj;//里程实际
+    private double lccy;//里程柴油
+    private double lccd;//里程纯电
+    private double lcqrl;//里程氢燃料
+    private double lctq;//里程去年同期
+    private Double lctb;//里程同比
+    private Double lcjhwc;//里程计划完成
+
+    private int bcjh;//班次计划
+    private int bcsj;//班次实际
+    private int bctq;//班次同期
+    private Double bctb;//班次同比
+    private Double bcjhwc;//班次计划完成
+
+    private double kssj;//空驶实际
+    private double kstq;//空驶同期
+    private Double kstb;//空驶同比
+
+    public String getXl() {
+        return xl;
+    }
+
+    public void setXl(String xl) {
+        this.xl = xl;
+    }
+
+    public double getXlcd() {
+        return xlcd;
+    }
+
+    public void setXlcd(double xlcd) {
+        this.xlcd = xlcd;
+    }
+
+    public int getRcjh() {
+        return rcjh;
+    }
+
+    public void setRcjh(int rcjh) {
+        this.rcjh = rcjh;
+    }
+
+    public int getRcsj() {
+        return rcsj;
+    }
+
+    public void setRcsj(int rcsj) {
+        this.rcsj = rcsj;
+    }
+
+    public int getRctq() {
+        return rctq;
+    }
+
+    public void setRctq(int rctq) {
+        this.rctq = rctq;
+    }
+
+    public Double getRctb() {
+        return rctb;
+    }
+
+    public void setRctb(Double rctb) {
+        this.rctb = rctb;
+    }
+
+    public Double getRcjhwc() {
+        return rcjhwc;
+    }
+
+    public void setRcjhwc(Double rcjhwc) {
+        this.rcjhwc = rcjhwc;
+    }
+
+    public int getYsjh() {
+        return ysjh;
+    }
+
+    public void setYsjh(int ysjh) {
+        this.ysjh = ysjh;
+    }
+
+    public double getYssj() {
+        return yssj;
+    }
+
+    public void setYssj(double yssj) {
+        this.yssj = yssj;
+    }
+
+    public double getYstq() {
+        return ystq;
+    }
+
+    public void setYstq(double ystq) {
+        this.ystq = ystq;
+    }
+
+    public Double getYstb() {
+        return ystb;
+    }
+
+    public void setYstb(Double ystb) {
+        this.ystb = ystb;
+    }
+
+    public Double getYsybgl() {
+        return ysybgl;
+    }
+
+    public void setYsybgl(Double ysybgl) {
+        this.ysybgl = ysybgl;
+    }
+
+    public Double getYsjhwc() {
+        return ysjhwc;
+    }
+
+    public void setYsjhwc(Double ysjhwc) {
+        this.ysjhwc = ysjhwc;
+    }
+
+    public double getLcjh() {
+        return lcjh;
+    }
+
+    public void setLcjh(double lcjh) {
+        this.lcjh = lcjh;
+    }
+
+    public double getLcsj() {
+        return lcsj;
+    }
+
+    public void setLcsj(double lcsj) {
+        this.lcsj = lcsj;
+    }
+
+    public double getLccy() {
+        return lccy;
+    }
+
+    public void setLccy(double lccy) {
+        this.lccy = lccy;
+    }
+
+    public double getLccd() {
+        return lccd;
+    }
+
+    public void setLccd(double lccd) {
+        this.lccd = lccd;
+    }
+
+    public double getLcqrl() {
+        return lcqrl;
+    }
+
+    public void setLcqrl(double lcqrl) {
+        this.lcqrl = lcqrl;
+    }
+
+    public double getLctq() {
+        return lctq;
+    }
+
+    public void setLctq(double lctq) {
+        this.lctq = lctq;
+    }
+
+    public Double getLctb() {
+        return lctb;
+    }
+
+    public void setLctb(Double lctb) {
+        this.lctb = lctb;
+    }
+
+    public Double getLcjhwc() {
+        return lcjhwc;
+    }
+
+    public void setLcjhwc(Double lcjhwc) {
+        this.lcjhwc = lcjhwc;
+    }
+
+    public int getBcjh() {
+        return bcjh;
+    }
+
+    public void setBcjh(int bcjh) {
+        this.bcjh = bcjh;
+    }
+
+    public int getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(int bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public int getBctq() {
+        return bctq;
+    }
+
+    public void setBctq(int bctq) {
+        this.bctq = bctq;
+    }
+
+    public Double getBctb() {
+        return bctb;
+    }
+
+    public void setBctb(Double bctb) {
+        this.bctb = bctb;
+    }
+
+    public Double getBcjhwc() {
+        return bcjhwc;
+    }
+
+    public void setBcjhwc(Double bcjhwc) {
+        this.bcjhwc = bcjhwc;
+    }
+
+    public double getKssj() {
+        return kssj;
+    }
+
+    public void setKssj(double kssj) {
+        this.kssj = kssj;
+    }
+
+    public double getKstq() {
+        return kstq;
+    }
+
+    public void setKstq(double kstq) {
+        this.kstq = kstq;
+    }
+
+    public Double getKstb() {
+        return kstb;
+    }
+
+    public void setKstb(Double kstb) {
+        this.kstb = kstb;
+    }
+
+    private static DecimalFormat df = new DecimalFormat("#.00");
+    public static Xlybtb getTotal(List<Xlybtb> xlybtbs, String name){
+        Xlybtb xlybtb = new Xlybtb();
+        xlybtb.setXl(name);
+        for (Xlybtb x : xlybtbs) {
+            xlybtb.setXlcd(Double.parseDouble(df.format(xlybtb.getXlcd()+x.getXlcd())));
+            int rcsj=xlybtb.getRcsj()+x.getRcsj();
+            int rctq=xlybtb.getRctq()+x.getRctq();
+            xlybtb.setRcjh(0);//人次计划
+            xlybtb.setRcsj(rcsj);//人次实际
+            xlybtb.setRctq(rctq);//人次同期
+            xlybtb.setRctb(rctq==0?null:Double.parseDouble(df.format((0-((double)(rctq-rcsj)/rctq))*100)));//人次同比
+            xlybtb.setRcjhwc(null);//人次计划完成
+
+            double yssj=xlybtb.getYssj()+x.getYssj();
+            double ystq=xlybtb.getYstq()+x.getYstq();
+            double lcsj=Double.parseDouble(df.format(xlybtb.getLcsj()+x.getLcsj()));
+            xlybtb.setLcsj(lcsj);
+            xlybtb.setYsjh(0);//营收计
+            xlybtb.setYssj(yssj);//营收实际
+            xlybtb.setYstq(ystq);//营收同期
+            xlybtb.setYstb(ystq==0?null:Double.parseDouble(df.format((0-((double)(ystq-yssj)/ystq))*100)));//营收同比
+            xlybtb.setYsybgl(lcsj==0?null:Double.parseDouble(df.format(yssj/lcsj*100)));//营收 元/百公里
+            xlybtb.setYsjhwc(null);//营收计划完成
+
+            double lcjh=Double.parseDouble(df.format(xlybtb.getLcjh()+x.getLcjh()));
+            double lctq=Double.parseDouble(df.format(xlybtb.getLctq()+x.getLctq()));
+            xlybtb.setLcjh(Double.parseDouble(df.format(lcjh)));//里程计划
+            xlybtb.setLccy(Double.parseDouble(df.format(xlybtb.getLccy()+x.getLccy()))); //里程柴油
+            xlybtb.setLccd(Double.parseDouble(df.format(xlybtb.getLccd()+x.getLccd())));//里程纯电
+            xlybtb.setLcqrl(Double.parseDouble(df.format(xlybtb.getLcqrl()+x.getLcqrl())));//里程氢燃料
+            xlybtb.setLctq(lctq);//里程去年同期
+            xlybtb.setLctb(lctq==0?null:Double.parseDouble(df.format((0-((lctq-lcsj)/lctq))*100)));//里程同比
+            xlybtb.setLcjhwc(lcjh==0?null:Double.parseDouble(df.format(lcsj/lcjh*100)));//里程计划完成
+
+            int bcsj=xlybtb.getBcsj()+x.getBcsj();
+            int bcjh=xlybtb.getBcjh()+x.getBcjh();
+            int bctq=xlybtb.getBctq()+x.getBctq();
+            xlybtb.setBcjh(bcjh);//班次计划
+            xlybtb.setBcsj(bcsj);//班次实际
+            xlybtb.setBctq(bctq);//班次同期
+            xlybtb.setBctb(bctq==0?null:Double.parseDouble(df.format((0-((double)(bctq-bcsj)/bctq))*100)));//班次同比
+            xlybtb.setBcjhwc(bcjh==0?null:Double.parseDouble(df.format((double)bcsj/bcjh*100)));//班次计划完成
+
+            double kssj=xlybtb.getKssj()+x.getKssj();
+            double kstq=xlybtb.getKstq()+x.getKstq();
+            xlybtb.setKssj(Double.parseDouble(df.format(kssj)));//空驶实际
+            xlybtb.setKstq(Double.parseDouble(df.format(kstq)));//空驶同期
+            xlybtb.setKstb(kstq==0?null:Double.parseDouble(df.format((0-((kstq-kssj)/kstq))*100)));//空驶同比
+        }
+        return xlybtb;
+    }
+}
+package com.bsth.entity.realcontrol;
+
+import java.text.DecimalFormat;
+import java.util.List;
+//线路月报台账
+public class Xlybtz {
+
+    private String xl;//路线
+    private double xlcd;//线路长度
+    private int cldx;//车辆数大型
+    private int clzx;//31中型
+    private int rcpw;//人次票务
+    private int rcpos;//人次POS
+    private int rchj;//人次合计
+    private int rcrjdc;//人次日均单车
+    private int yspw;//营收票务
+    private int yspos;//营收POS
+    private int ysyhhc;//营收优惠换乘
+    private int ysbtk;//营收保通卡
+    private int yshj;//营收合计
+    private int ysrjdc;//营收日均单车
+    private double bglys;// 百公里营收（元）
+    private double cygl;//柴油（公里）
+    private double ydgl;//油电（公里
+    private double cdgl;//纯电（公里）
+    private double qrlgl;//氢燃料（公里）
+    private double cys;// 柴油（升）
+    private double yds;// 油电（升）
+    private double dhd;// 电耗（度）氢能车也加少量电
+    private double cddh;// 纯电电耗（度）
+    private double qrlqk;// 氢燃料（千克）
+    private double cysbgl;// 柴油升/百公里
+    private double ydsbgl;// 油电升/百公里
+    private double cddbgl;// 纯电度/百公里
+    private int btkrc;// 保通卡（人次）
+    private int jhbc;// 计划班次
+    private int sjbc;// 实际班次
+    private double jhgl;// 计划公里
+    private double sjgl;// 实际公里
+    private double glwc;// 公里完成%
+    private double bcwc;// 班次完成%
+    private int cr;// 车日
+    private double ksgl;// 其中:空驶公里
+    private double pjpj;// 平均票价
+
+    private static DecimalFormat df = new DecimalFormat("#.00");
+    public static Xlybtz getTotal(List<Xlybtz> xlybtzs,String name,int dayCount){
+        Xlybtz xlybtz = new Xlybtz();
+        xlybtz.setXl(name);
+        for (Xlybtz x : xlybtzs) {
+            xlybtz.setXlcd(Double.parseDouble(df.format(xlybtz.getXlcd()+x.getXlcd())));
+            xlybtz.setCldx(xlybtz.getCldx()+x.getCldx());
+            xlybtz.setClzx(xlybtz.getClzx()+x.getClzx());
+            xlybtz.setRcpw(xlybtz.getRcpw()+x.getRcpw());
+            xlybtz.setRcpos(xlybtz.getRcpos()+x.getRcpos());
+            xlybtz.setRchj(xlybtz.getRchj()+x.getRchj());
+            xlybtz.setRcrjdc(xlybtz.getRchj()/(xlybtz.getCldx()+xlybtz.getClzx())/dayCount);
+            xlybtz.setYspw(xlybtz.getYspw()+x.getYspw());
+            xlybtz.setYspos(xlybtz.getYspos()+x.getYspos());
+            xlybtz.setYsyhhc(xlybtz.getYsyhhc()+x.getYsyhhc());
+            xlybtz.setYsbtk(xlybtz.getYsbtk()+x.getYsbtk());
+            xlybtz.setYshj(xlybtz.getYshj()+x.getYshj());
+            xlybtz.setYsrjdc(xlybtz.getYshj()/(xlybtz.getCldx()+xlybtz.getClzx())/dayCount);
+            xlybtz.setCygl(Double.parseDouble(df.format(xlybtz.getCygl()+x.getCygl())));
+            xlybtz.setYdgl(Double.parseDouble(df.format(xlybtz.getYdgl()+x.getYdgl())));
+            xlybtz.setCdgl(Double.parseDouble(df.format(xlybtz.getCdgl()+x.getCdgl())));
+            xlybtz.setQrlgl(Double.parseDouble(df.format(xlybtz.getQrlgl()+x.getQrlgl())));
+            if(xlybtz.getCygl()+xlybtz.getYdgl()+xlybtz.getCdgl()+xlybtz.getQrlgl()!=0){
+                xlybtz.setBglys(Double.parseDouble(df.format(xlybtz.getYshj()/(xlybtz.getCygl()+xlybtz.getYdgl()+xlybtz.getCdgl()+xlybtz.getQrlgl())*100)));
+            }
+            xlybtz.setCys(Double.parseDouble(df.format(xlybtz.getCys()+x.getCys())));
+            xlybtz.setYds(Double.parseDouble(df.format(xlybtz.getYds()+x.getYds())));
+            xlybtz.setDhd(Double.parseDouble(df.format(xlybtz.getDhd()+x.getDhd())));
+            xlybtz.setCddh(Double.parseDouble(df.format(xlybtz.getCddh()+x.getCddh())));
+            xlybtz.setQrlqk(Double.parseDouble(df.format(xlybtz.getQrlqk()+x.getQrlqk())));
+            if(xlybtz.getCygl()!=0){
+                xlybtz.setCysbgl(Double.parseDouble(df.format((xlybtz.getCys()/xlybtz.getCygl()*100))));
+            }
+            if(xlybtz.getYdgl()!=0){
+                xlybtz.setYdsbgl(Double.parseDouble(df.format((xlybtz.getYds()/xlybtz.getYdgl()*100))));
+            }
+            if(xlybtz.getCdgl()!=0){
+                xlybtz.setCddbgl(Double.parseDouble(df.format((xlybtz.getCddh()/xlybtz.getCdgl()*100))));
+            }
+            xlybtz.setBtkrc(xlybtz.getBtkrc()+x.getBtkrc());
+            xlybtz.setJhbc(xlybtz.getJhbc()+x.getJhbc());
+            xlybtz.setSjbc(xlybtz.getSjbc()+x.getSjbc());
+            xlybtz.setJhgl(Double.parseDouble(df.format(xlybtz.getJhgl()+x.getJhgl())));
+            xlybtz.setSjgl(Double.parseDouble(df.format(xlybtz.getSjgl()+x.getSjgl())));
+            if(xlybtz.getJhgl()!=0){
+                xlybtz.setGlwc(Double.parseDouble(df.format(xlybtz.getSjgl()/xlybtz.getJhgl()*100)));
+            }
+            if(xlybtz.getJhbc()!=0){
+                xlybtz.setBcwc(Double.parseDouble(df.format((double)xlybtz.getSjbc()/xlybtz.getJhbc()*100)));
+            }
+            xlybtz.setCr(xlybtz.getCr()+x.getCr());
+            xlybtz.setKsgl(xlybtz.getKsgl()+x.getKsgl());
+            if(xlybtz.getRchj()!=0){
+                xlybtz.setPjpj(Double.parseDouble(df.format((double)xlybtz.getYshj()/xlybtz.getRchj())));
+            }
+        }
+        return xlybtz;
+    }
+
+    public String getXl() {
+        return xl;
+    }
+
+    public void setXl(String xl) {
+        this.xl = xl;
+    }
+
+    public double getXlcd() {
+        return xlcd;
+    }
+
+    public void setXlcd(double xlcd) {
+        this.xlcd = xlcd;
+    }
+
+    public int getCldx() {
+        return cldx;
+    }
+
+    public void setCldx(int cldx) {
+        this.cldx = cldx;
+    }
+
+    public int getClzx() {
+        return clzx;
+    }
+
+    public void setClzx(int clzx) {
+        this.clzx = clzx;
+    }
+
+    public int getRcpw() {
+        return rcpw;
+    }
+
+    public void setRcpw(int rcpw) {
+        this.rcpw = rcpw;
+    }
+
+    public int getRcpos() {
+        return rcpos;
+    }
+
+    public void setRcpos(int rcpos) {
+        this.rcpos = rcpos;
+    }
+
+    public int getRchj() {
+        return rchj;
+    }
+
+    public void setRchj(int rchj) {
+        this.rchj = rchj;
+    }
+
+    public int getRcrjdc() {
+        return rcrjdc;
+    }
+
+    public void setRcrjdc(int rcrjdc) {
+        this.rcrjdc = rcrjdc;
+    }
+
+    public int getYspw() {
+        return yspw;
+    }
+
+    public void setYspw(int yspw) {
+        this.yspw = yspw;
+    }
+
+    public int getYspos() {
+        return yspos;
+    }
+
+    public void setYspos(int yspos) {
+        this.yspos = yspos;
+    }
+
+    public int getYsyhhc() {
+        return ysyhhc;
+    }
+
+    public void setYsyhhc(int ysyhhc) {
+        this.ysyhhc = ysyhhc;
+    }
+
+    public int getYsbtk() {
+        return ysbtk;
+    }
+
+    public void setYsbtk(int ysbtk) {
+        this.ysbtk = ysbtk;
+    }
+
+    public int getYshj() {
+        return yshj;
+    }
+
+    public void setYshj(int yshj) {
+        this.yshj = yshj;
+    }
+
+    public int getYsrjdc() {
+        return ysrjdc;
+    }
+
+    public void setYsrjdc(int ysrjdc) {
+        this.ysrjdc = ysrjdc;
+    }
+
+    public double getBglys() {
+        return bglys;
+    }
+
+    public void setBglys(double bglys) {
+        this.bglys = bglys;
+    }
+
+    public double getCygl() {
+        return cygl;
+    }
+
+    public void setCygl(double cygl) {
+        this.cygl = cygl;
+    }
+
+    public double getYdgl() {
+        return ydgl;
+    }
+
+    public void setYdgl(double ydgl) {
+        this.ydgl = ydgl;
+    }
+
+    public double getCdgl() {
+        return cdgl;
+    }
+
+    public void setCdgl(double cdgl) {
+        this.cdgl = cdgl;
+    }
+
+    public double getQrlgl() {
+        return qrlgl;
+    }
+
+    public void setQrlgl(double qrlgl) {
+        this.qrlgl = qrlgl;
+    }
+
+    public double getCys() {
+        return cys;
+    }
+
+    public void setCys(double cys) {
+        this.cys = cys;
+    }
+
+    public double getYds() {
+        return yds;
+    }
+
+    public void setYds(double yds) {
+        this.yds = yds;
+    }
+
+    public double getDhd() {
+        return dhd;
+    }
+
+    public void setDhd(double dhd) {
+        this.dhd = dhd;
+    }
+
+    public double getQrlqk() {
+        return qrlqk;
+    }
+
+    public void setQrlqk(double qrlqk) {
+        this.qrlqk = qrlqk;
+    }
+
+    public double getCysbgl() {
+        return cysbgl;
+    }
+
+    public void setCysbgl(double cysbgl) {
+        this.cysbgl = cysbgl;
+    }
+
+    public double getYdsbgl() {
+        return ydsbgl;
+    }
+
+    public void setYdsbgl(double ydsbgl) {
+        this.ydsbgl = ydsbgl;
+    }
+
+    public double getCddbgl() {
+        return cddbgl;
+    }
+
+    public void setCddbgl(double cddbgl) {
+        this.cddbgl = cddbgl;
+    }
+
+    public int getBtkrc() {
+        return btkrc;
+    }
+
+    public void setBtkrc(int btkrc) {
+        this.btkrc = btkrc;
+    }
+
+    public int getJhbc() {
+        return jhbc;
+    }
+
+    public void setJhbc(int jhbc) {
+        this.jhbc = jhbc;
+    }
+
+    public int getSjbc() {
+        return sjbc;
+    }
+
+    public void setSjbc(int sjbc) {
+        this.sjbc = sjbc;
+    }
+
+    public double getJhgl() {
+        return jhgl;
+    }
+
+    public void setJhgl(double jhgl) {
+        this.jhgl = jhgl;
+    }
+
+    public double getGlwc() {
+        return glwc;
+    }
+
+    public void setGlwc(double glwc) {
+        this.glwc = glwc;
+    }
+
+    public double getBcwc() {
+        return bcwc;
+    }
+
+    public void setBcwc(double bcwc) {
+        this.bcwc = bcwc;
+    }
+
+    public int getCr() {
+        return cr;
+    }
+
+    public void setCr(int cr) {
+        this.cr = cr;
+    }
+
+    public double getKsgl() {
+        return ksgl;
+    }
+
+    public void setKsgl(double ksgl) {
+        this.ksgl = ksgl;
+    }
+
+    public double getPjpj() {
+        return pjpj;
+    }
+
+    public void setPjpj(double pjpj) {
+        this.pjpj = pjpj;
+    }
+
+    public double getCddh() {
+        return cddh;
+    }
+
+    public void setCddh(double cddh) {
+        this.cddh = cddh;
+    }
+
+    public double getSjgl() {
+        return sjgl;
+    }
+
+    public void setSjgl(double sjgl) {
+        this.sjgl = sjgl;
+    }
+}
+package com.bsth.entity.report;
+
+public class CardExcel {
+
+
+    private String gs;//公司
+    private String xl;//线路
+    private String jylx;//交易类型
+    private int zcbs;//正常笔数
+    private double zcje;//正常金额
+    private double yhje;//优惠金额
+    private int kybs;//可疑笔数
+    private double kyje;//可疑金额
+    private double yhje2;//优惠金额
+    private int tzbs;//调整笔数
+    private double tzje;//调整金额
+    private double yhje3;//优惠金额
+
+    private int sjbs;//实际笔数
+    private double sjje;//实际金额
+
+    public static String[] columns = new String[]{"gs","xl","jylx","zcbs","zcje","yhje","kybs","kyje","yhje2","tzbs","tzje","yhje3"};
+
+    public String getGs() {
+        return gs;
+    }
+
+    public void setGs(String gs) {
+        this.gs = gs;
+    }
+
+    public String getXl() {
+        return xl;
+    }
+
+    public void setXl(String xl) {
+        this.xl = xl;
+    }
+
+    public String getJylx() {
+        return jylx;
+    }
+
+    public void setJylx(String jylx) {
+        this.jylx = jylx;
+    }
+
+    public int getZcbs() {
+        return zcbs;
+    }
+
+    public void setZcbs(int zcbs) {
+        this.zcbs = zcbs;
+    }
+
+    public double getZcje() {
+        return zcje;
+    }
+
+    public void setZcje(double zcje) {
+        this.zcje = zcje;
+    }
+
+    public double getYhje() {
+        return yhje;
+    }
+
+    public void setYhje(double yhje) {
+        this.yhje = yhje;
+    }
+
+    public int getKybs() {
+        return kybs;
+    }
+
+    public void setKybs(int kybs) {
+        this.kybs = kybs;
+    }
+
+    public double getKyje() {
+        return kyje;
+    }
+
+    public void setKyje(double kyje) {
+        this.kyje = kyje;
+    }
+
+    public double getYhje2() {
+        return yhje2;
+    }
+
+    public void setYhje2(double yhje2) {
+        this.yhje2 = yhje2;
+    }
+
+    public int getTzbs() {
+        return tzbs;
+    }
+
+    public void setTzbs(int tzbs) {
+        this.tzbs = tzbs;
+    }
+
+    public double getTzje() {
+        return tzje;
+    }
+
+    public void setTzje(double tzje) {
+        this.tzje = tzje;
+    }
+
+    public double getYhje3() {
+        return yhje3;
+    }
+
+    public void setYhje3(double yhje3) {
+        this.yhje3 = yhje3;
+    }
+
+
+    public int getSjbs() {
+        return zcbs+tzbs;
+    }
+
+    public double getSjje() {
+        return zcje+yhje+tzje+yhje3;
+    }
+}
+package com.bsth.entity.report;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "bsth_c_line_compare")
+public class LineCompare {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+    private String lineCodeOut;//青浦线路编码
+    private String name;//线路名
+    private String convoy;//车队
+    private String lineCode;//线路编码
+    private String namePw;//票务系统线路名
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getLineCodeOut() {
+        if(lineCodeOut==null){
+            return null;
+        }
+        else if(lineCodeOut.length()>4){
+            return lineCodeOut.substring(lineCodeOut.length()-4);
+        }else {
+            while (lineCodeOut.length()<4){
+                lineCodeOut="0"+lineCodeOut;
+            }
+            return lineCodeOut;
+        }
+    }
+
+    public void setLineCodeOut(String lineCodeOut) {
+        this.lineCodeOut = lineCodeOut;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getConvoy() {
+        return convoy;
+    }
+
+    public void setConvoy(String convoy) {
+        this.convoy = convoy;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getNamePw() {
+        return namePw;
+    }
+
+    public void setNamePw(String namePw) {
+        this.namePw = namePw;
+    }
+}
+package com.bsth.entity.report;
+
+public class PWExcel {
+
+
+    private String xl;//线路名
+    private int pj1;
+    private int pj2;
+    private int pj3;
+    private int pj4;
+    private int pj5;
+    private int pj6;
+    private int pj7;
+    private int pj8;
+    private int pj9;
+    private int pj10;
+    private int pj11;
+    private int pj12;
+    private int pj13;
+    private int cls;//车辆数
+    private int dtrc;//当天人次
+    private int ljrc;//累计人次
+    private double dtje;//当天金额
+    private double ljje;//累计金额
+
+    public static String[] columns = new String[]{"xl","pj1","pj2","pj3","pj4","pj5","pj6","pj7","pj8","pj9","pj10","pj11","pj12","pj13","cls","dtrc","ljrc","dtje","ljje"};
+
+    public String getXl() {
+        return xl;
+    }
+
+    public void setXl(String xl) {
+        this.xl = xl;
+    }
+
+    public int getPj1() {
+        return pj1;
+    }
+
+    public void setPj1(int pj1) {
+        this.pj1 = pj1;
+    }
+
+    public int getPj2() {
+        return pj2;
+    }
+
+    public void setPj2(int pj2) {
+        this.pj2 = pj2;
+    }
+
+    public int getPj3() {
+        return pj3;
+    }
+
+    public void setPj3(int pj3) {
+        this.pj3 = pj3;
+    }
+
+    public int getPj4() {
+        return pj4;
+    }
+
+    public void setPj4(int pj4) {
+        this.pj4 = pj4;
+    }
+
+    public int getPj5() {
+        return pj5;
+    }
+
+    public void setPj5(int pj5) {
+        this.pj5 = pj5;
+    }
+
+    public int getPj6() {
+        return pj6;
+    }
+
+    public void setPj6(int pj6) {
+        this.pj6 = pj6;
+    }
+
+    public int getPj7() {
+        return pj7;
+    }
+
+    public void setPj7(int pj7) {
+        this.pj7 = pj7;
+    }
+
+    public int getPj8() {
+        return pj8;
+    }
+
+    public void setPj8(int pj8) {
+        this.pj8 = pj8;
+    }
+
+    public int getPj9() {
+        return pj9;
+    }
+
+    public void setPj9(int pj9) {
+        this.pj9 = pj9;
+    }
+
+    public int getPj10() {
+        return pj10;
+    }
+
+    public void setPj10(int pj10) {
+        this.pj10 = pj10;
+    }
+
+    public int getPj11() {
+        return pj11;
+    }
+
+    public void setPj11(int pj11) {
+        this.pj11 = pj11;
+    }
+
+    public int getPj12() {
+        return pj12;
+    }
+
+    public void setPj12(int pj12) {
+        this.pj12 = pj12;
+    }
+
+    public int getPj13() {
+        return pj13;
+    }
+
+    public void setPj13(int pj13) {
+        this.pj13 = pj13;
+    }
+
+    public int getCls() {
+        return cls;
+    }
+
+    public void setCls(int cls) {
+        this.cls = cls;
+    }
+
+    public int getDtrc() {
+        return dtrc;
+    }
+
+    public void setDtrc(int dtrc) {
+        this.dtrc = dtrc;
+    }
+
+    public int getLjrc() {
+        return ljrc;
+    }
+
+    public void setLjrc(int ljrc) {
+        this.ljrc = ljrc;
+    }
+
+    public double getDtje() {
+        return dtje;
+    }
+
+    public void setDtje(double dtje) {
+        this.dtje = dtje;
+    }
+
+    public double getLjje() {
+        return ljje;
+    }
+
+    public void setLjje(double ljje) {
+        this.ljje = ljje;
+    }
+}
+package com.bsth.entity.report;
+
+public class QRCodeExcel {
+
+
+    private String gs;//公司
+    private String xl;//线路
+    private String jylx;//交易类型
+    private int zcbs;//正常笔数
+    private double zcje;//正常金额
+    private double yhje;//优惠金额
+    private int kybs;//可疑笔数
+    private double kyje;//可疑金额
+    private double yhje2;//优惠金额
+    private int tzbs;//调整笔数
+    private double tzje;//调整金额
+    private double yhje3;//优惠金额
+    private int bkkbs;//补扣款笔数
+    private double bkkje;//补扣款金额
+
+    private int sjbs;//实际笔数
+    private double sjje;//实际金额
+
+    public static String[] columns = new String[]{"gs","xl","jylx","zcbs","zcje","yhje","kybs","kyje","yhje2","tzbs","tzje","yhje3","bkkbs","bkkje"};
+
+    public String getGs() {
+        return gs;
+    }
+
+    public void setGs(String gs) {
+        this.gs = gs;
+    }
+
+    public String getXl() {
+        return xl;
+    }
+
+    public void setXl(String xl) {
+        this.xl = xl;
+    }
+
+    public String getJylx() {
+        return jylx;
+    }
+
+    public void setJylx(String jylx) {
+        this.jylx = jylx;
+    }
+
+    public int getZcbs() {
+        return zcbs;
+    }
+
+    public void setZcbs(int zcbs) {
+        this.zcbs = zcbs;
+    }
+
+    public double getZcje() {
+        return zcje;
+    }
+
+    public void setZcje(double zcje) {
+        this.zcje = zcje;
+    }
+
+    public double getYhje() {
+        return yhje;
+    }
+
+    public void setYhje(double yhje) {
+        this.yhje = yhje;
+    }
+
+    public int getKybs() {
+        return kybs;
+    }
+
+    public void setKybs(int kybs) {
+        this.kybs = kybs;
+    }
+
+    public double getKyje() {
+        return kyje;
+    }
+
+    public void setKyje(double kyje) {
+        this.kyje = kyje;
+    }
+
+    public double getYhje2() {
+        return yhje2;
+    }
+
+    public void setYhje2(double yhje2) {
+        this.yhje2 = yhje2;
+    }
+
+    public int getTzbs() {
+        return tzbs;
+    }
+
+    public void setTzbs(int tzbs) {
+        this.tzbs = tzbs;
+    }
+
+    public double getTzje() {
+        return tzje;
+    }
+
+    public void setTzje(double tzje) {
+        this.tzje = tzje;
+    }
+
+    public double getYhje3() {
+        return yhje3;
+    }
+
+    public void setYhje3(double yhje3) {
+        this.yhje3 = yhje3;
+    }
+
+    public int getBkkbs() {
+        return bkkbs;
+    }
+
+    public void setBkkbs(int bkkbs) {
+        this.bkkbs = bkkbs;
+    }
+
+    public double getBkkje() {
+        return bkkje;
+    }
+
+    public void setBkkje(double bkkje) {
+        this.bkkje = bkkje;
+    }
+
+    public int getSjbs() {
+        return zcbs+tzbs+bkkbs;
+    }
+
+    public double getSjje() {
+        return zcje+yhje+tzje+yhje3+bkkje;
+    }
+}
+package com.bsth.entity.report;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import javax.persistence.*;
+import java.util.Date;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Entity
+@Table(name = "ticket_info")
+public class Ticket implements Comparable<Ticket>{
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String date;
+
+    /**
+     * 车队
+     */
+    private String convoy;
+
+    /**
+     * 线路名
+     */
+    private String lineName;
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 线路编码
+     */
+    private Integer lineId;
+
+    /**
+     * 人次
+     */
+    private int count;
+
+    /**
+     * 金额
+     */
+    private double amount;
+
+    /**
+     * 支付方式
+     */
+    private String payType;
+
+    /**
+     * 创建日期
+     */
+    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getConvoy() {
+        return convoy;
+    }
+
+    public void setConvoy(String convoy) {
+        this.convoy = convoy;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        if(lineName.contains(".")){
+            lineName=lineName.split("\\.")[0];
+        }
+        this.lineName = lineName;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Integer getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(Integer lineId) {
+        this.lineId = lineId;
+    }
+
+    @Override
+    public int compareTo(Ticket o) {
+       return this.getConvoy().compareTo(o.getConvoy());
+    }
+}
@@ -31,4 +31,7 @@ public interface LineInformationRepository extends BaseRepository&lt;LineInformatio
 	List<LineInformation> findByLine(List<String> lineCodes);
 	List<LineInformation> findByLine(Line line);
+
+	@Query("select i from LineInformation i")
+	List<LineInformation> findAll();
 }
@@ -17,10 +17,10 @@ public interface JdlRepository extends BaseRepository&lt;Jdl, Integer&gt;{
 	@Transactional
     @Modifying
     @Query(value="INSERT INTO bsth_c_jdl("+
-    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date)" +
+    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date, jsy, plate)" +
     			 " VALUES(" +
-    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'))", nativeQuery=true)
-	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate);
+    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'),?11,?12)", nativeQuery=true)
+	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate, String jsy, String plate);
 	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4% " ,nativeQuery=true)
 	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm);
@@ -35,7 +35,9 @@ public interface JdlRepository extends BaseRepository&lt;Jdl, Integer&gt;{
 	@Transactional
     @Modifying
-	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5",nativeQuery=true)
-	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm);
-	
+	@Query(value="UPDATE bsth_c_jdl set jdl = ?1,jsy=?6,plate=?7 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5",nativeQuery=true)
+	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jsy, String plate);
+
+	@Query(value="SELECT * FROM bsth_c_jdl where rq >= ?1 and rq <= ?2",nativeQuery=true)
+	List<Jdl> JdlList( String rqS, String rqE);
 }
+package com.bsth.repository.oil;
+
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.oil.Jql;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface JqlRepository extends BaseRepository<Jql, Integer>{
+	
+	@Transactional
+    @Modifying
+    @Query(value="INSERT INTO bsth_c_jql("+
+    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jql, jqz, remarks, creater_date,jsy,plate)" +
+    			 " VALUES(" +
+    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'),?11,?12)", nativeQuery=true)
+	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jql, String jqz, String remarks, String createrDate,String jsy,String plate);
+	
+	@Query(value="SELECT * FROM bsth_c_jql where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4% " ,nativeQuery=true)
+	List<Jql> query(String gsbm, String fgsbm, String rq, String nbbm);
+	
+	@Query(value="SELECT * FROM bsth_c_jql where gs_bm = ?1 and rq = ?2 and nbbm like %?3% " ,nativeQuery=true)
+	List<Jql> query(String gsbm, String rq, String nbbm);
+	
+	@Query(value="SELECT * FROM bsth_c_jql where rq = ?",nativeQuery=true)
+	List<Jql> JqlList( String rq);
+	
+	@Query(value="SELECT * FROM bsth_c_jql where rq = ?1 and gs_bm like %?2% and fgs_bm like %?3%",nativeQuery=true)
+	List<Jql> JqlList_1( String rq, String gsbm, String fgsbm);
+	
+	@Query(value="SELECT jql FROM bsth_c_jql where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4 ",nativeQuery=true)
+	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm);
+	
+	
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_jql set jql = ?1,jsy=?6,plate=?7 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5",nativeQuery=true)
+	void UpdateJql(String jql, String gsbm, String fgsbm, String rq, String nbbm,String jsy,String plate);
+
+	@Query(value="SELECT * FROM bsth_c_jql where rq >= ?1 and  rq <= ?2",nativeQuery=true)
+	List<Jql> JqlList( String rqS,String rqE);
+	
+}
+package com.bsth.repository.oil;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.oil.Qlb;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface QlbRepository extends BaseRepository<Qlb, Integer>{
+	/**
+	 * 前一天DLB信息
+	 * @param rq
+	 * @return
+	 */
+	@Query(value="SELECT a.* FROM bsth_c_qlb a where to_days(?1)-to_days(a.rq)=1 "
+			+ " and jcsx=(select max(b.jcsx) from bsth_c_qlb b where a.nbbm=b.nbbm and "
+			+ " to_days(?1)-to_days(b.rq)=1) and ssgsdm like %?2% and fgsdm like %?3% and "
+			+ " xlbm like %?4% and nbbm like %?5%",nativeQuery=true)
+	List<Qlb> obtainQlbefore(String rq,String gsdm,String fgsdm,String xlbm,String nbbm);
+	/**
+	 * 当天DLB信息
+	 * @param rq
+	 * @return
+	 */
+	@Query(value="SELECT * FROM bsth_c_qlb  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<Qlb> obtainQl(String rq,String gsbm,String fgsdm,String xlbm,String nbbm,String px);
+	
+	@Query(value="select s from Qlb s "
+			+ " where to_days(s.rq)=to_days(?1) "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3%"
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 order by nbbm,jcsx")
+	List<Qlb> listQlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	@Query(value="select s from Qlb s "
+			+ " where s.rq=?1 "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3%"
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 order by nbbm,jcsx")
+	List<Qlb> listQlb_s(Date rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	
+	/**
+	 * 
+	 * @param nbbm
+	 * @param rq
+	 * @param xlbm
+	 * @return
+	 */
+	@Query(value="select nbbm,count(nbbm) from bsth_c_qlb where rq=?1 "
+			+ " and ssgsdm like %?2% "
+			+ " and fgsdm like %?3% "
+			+ " and xlbm like %?4%  and nbbm  like %?5% "
+			+ " group by nbbm,rq,ssgsdm,fgsdm",nativeQuery=true)
+	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	@Query(value="select nbbm,sum(jql*100) as jql ,sum(zlc*100) as zlc from bsth_c_qlb where rq= ?1 "
+			+ " and ssgsdm like %?2% "
+			+ " and fgsdm like %?3% "
+			+ " and xlbm like %?4%  and nbbm  like %?5% "
+			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
+	List<Object[]> checkNbmmQl(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	
+	@Query(value="select jql,hn,sh from Qlb s "
+			+ " where to_days(s.rq)=to_days(?1) "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3% "
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 ")
+	List<Object[]> sumQlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	@Query(value="select jql,hn,sh from Qlb s "
+			+ " where s.rq=?1 "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3% "
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 ")
+	List<Object[]> sumQlb_s(Date rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	
+	@Query(value="select ifnull(jql,0),ifnull(hn,0),ifnull(sh,0) from bsth_c_qlb "
+			+ " where rq=?1 "
+			+ " and ssgsdm like %?2% "
+			+ " and fgsdm like %?3% "
+			+ " and xlbm like %?4% "
+			+ " and nbbm like %?5%",nativeQuery=true)
+	List<Object[]> sumQlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_qlb SET " +
+				" czcl= ?2," +
+				" jzcl = ?3, " +
+				" hn = ?4, " +
+				" sh = ?5, " +
+				" shyy = ?6, " +
+				" nhlx = ?7 " +
+				" WHERE id = ?1", nativeQuery=true)
+	public void qlbUpdate(Integer id,double czcl,double jzcl,double hn, double sh,String shyy,int nhlx);
+	
+	@Query(value="SELECT * FROM bsth_c_qlb  where rq=?1 and nbbm=?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
+	List<Qlb> queryListQlb(String rq,String nbbm,String jgh,String xlbm);
+
+	@Query(value="SELECT * FROM bsth_c_qlb  where rq=?1 and xlbm=?2",nativeQuery=true)
+	List<Qlb> queryQlbByRqXlbm(String rq, String xlbm);
+
+	@Query(value="SELECT * FROM bsth_c_qlb  where id=?1",nativeQuery=true)
+	Qlb findById(int id);
+
+	//按照日期删除数据
+	@Modifying
+	@javax.transaction.Transactional
+	@Query(value="DELETE from bsth_c_qlb where id = ?1", nativeQuery=true)
+	void deleteById(int id);
+	
+}
@@ -29,7 +29,26 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	@Query(value="select * from bsth_c_ylxxb s where s.nbbm = ?1 and "
 			+ "s.yyrq=?2",nativeQuery=true)
 	List<Ylxxb> queryListYlxxb(String clZbh,String date);
-	
-	
-	
+
+	@Query(value="SELECT * FROM bsth_c_ylxxb where yyrq >= ?1 and yyrq <= ?2",nativeQuery=true)
+	List<Ylxxb> ylxxbList(String rqS, String rqE);
+
+	@Query(value="SELECT jzl FROM bsth_c_ylxxb where gsdm = ?1 and yyrq = ?2 and nbbm = ?3 and jylx = '1' ",nativeQuery=true)
+	List<Double> import_queryBySame( String gsbm, String rq, String nbbm);
+
+	@Transactional
+	@Modifying
+	@Query(value="INSERT INTO bsth_c_ylxxb("+
+			"gsdm, yyrq, nbbm, jsy, jzl, stationid, bz, createtime, nylx, jylx, plate, yh) " +
+			"VALUES(" +
+			"?1,str_to_date(?2,'%Y-%m-%d'),?3,?4,?5,?6,?7,str_to_date(?8,'%Y-%m-%d %H:%i:%s'), '0', '1',?9,?10) ", nativeQuery=true)
+	void import_insertData(String gsbm, String rq, String nbbm, String jsy, String jzl, String jyz, String remarks, String createtime, String plate, String yh);
+
+	@Transactional
+	@Modifying
+	@Query(value="UPDATE bsth_c_ylxxb set jzl = ?1, jsy = ?2, stationid = ?3, bz = ?4 , plate = ?8 , yh = ?9 "
+			+ "where gsdm = ?5 and yyrq = ?6 and nbbm = ?7 and jylx = '1' ",nativeQuery=true)
+	void import_UpdateJzl(String jzl, String jsy, String jyz, String remarks, String gsbm, String rq, String nbbm, String plate, String yh);
+
+
 }
+package com.bsth.repository.ticket;
+
+import com.bsth.entity.report.LineCompare;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface LineCompareRepository extends BaseRepository<LineCompare, Integer> {
+
+	@Query(value="select l from LineCompare l")
+	List<LineCompare> findAll();
+
+}
+package com.bsth.repository.ticket;
+
+
+import com.bsth.entity.report.Ticket;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface TicketRepository extends BaseRepository<Ticket, Integer>{
+	
+
+	
+	@Query(value="SELECT ticket FROM Ticket ticket where ticket.lineName = ?1 and ticket.date = ?2" )
+	List<Ticket> query(String line, String date);
+
+}
+package com.bsth.service.oil;
+
+import com.bsth.entity.oil.Jql;
+import com.bsth.service.BaseService;
+
+import java.io.File;
+import java.util.Map;
+
+public interface JqlService extends BaseService<Jql, Integer> {
+	
+	public String importExcel(File file, String gsbm_, String gsName, String fgsbm, String fgsName);
+
+	public Map<String, Object> query(Map<String, Object> map);
+	
+}
+package com.bsth.service.oil;
+
+import com.bsth.entity.oil.Qlb;
+import com.bsth.service.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+public interface QlbService extends BaseService<Qlb, Integer>{
+	Map<String, Object> obtain(Map<String, Object> map) throws Exception;
+	
+	Map<String, Object> sort(Map<String, Object> map);
+	
+	Map<String, Object> checkQl(Map<String, Object> map);
+	
+	List<Qlb> listQlb(Map<String, Object> map);
+	
+	Map<String, Object> sumQlb(Map<String, Object> map);
+	
+	Map<String, Object> saveQlbList(Map<String, Object> map) throws Exception;
+	
+	String obtainDsq() throws Exception;
+	
+	String checkJsy(Map<String, Object> map);
+	
+	Map<String, Object> saveQlb(Qlb t);
+	
+	Map<String, Object> deleteIds(Map<String, Object> map) throws Exception;
+	
+	Map<String, List<Qlb>> updeteHistory(List<Map<String, Object>> list,String date,
+		String gsdm,String fgsdm,String line) ;
+	
+	Map<String, Object> update(Map<String, Object> map);
+
+
+}
 package com.bsth.service.oil;
+import java.io.File;
 import java.util.List;
 import java.util.Map;
@@ -17,4 +18,8 @@ public interface YlxxbService extends BaseService&lt;Ylxxb, Integer&gt;{
 	Map<String, Object> saveYlxxb(Map<String, Object> map);
+	String importExcel(File file);
+
+	Map<String, Object> query(Map<String, Object> map);
+
 }
@@ -2,8 +2,12 @@ package com.bsth.service.oil.impl;
 import java.io.File;
 import java.io.FileInputStream;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -11,12 +15,16 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import com.bsth.entity.report.Ticket;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import com.bsth.entity.oil.Jdl;
@@ -24,6 +32,10 @@ import com.bsth.repository.oil.JdlRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.JdlService;
 import com.bsth.util.ReportUtils;
+import org.springframework.transaction.TransactionException;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
 @Service
 public class JdlServiceImpl extends BaseServiceImpl<Jdl, Integer> implements JdlService {
@@ -31,8 +43,18 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 	@Autowired
 	JdlRepository repository;
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+
+	@Autowired
+	private TransactionTemplate transactionTemplate;
+
 	@Override
 	public String importExcel(File file, String gsbm, String gsName, String fgsbm, String fgsName) {
+		gsbm="99";
+		gsName="青浦公交";
+		fgsbm="100";
+		fgsName="青浦公交";
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		DecimalFormat df = new DecimalFormat("######0.00");
@@ -41,6 +63,19 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file));
 			HSSFWorkbook wb = new HSSFWorkbook(fs);
 			HSSFSheet sheet = wb.getSheetAt(0);
+			String n=sheet.getSheetName();
+			String y=n.split("年")[0];
+			if(n.split("年").length<2){
+				return "报表日期读取失败";
+			}
+			String m=n.split("年")[1].split("月")[0];
+			if(y.length()==2){
+				y="20"+y;
+			}
+			if(m.length()==1){
+				m="0"+m;
+			}
+			System.out.println(y+"-"+m);
 			// 取得总行数
 			int rowNum = sheet.getLastRowNum() + 1;
 			// 取得总列数
@@ -59,7 +94,15 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 						text += ",";
 						continue;
 					}
+					if(cell.getCellType()==2){//处理公式类数据
+						try {
+							text +=(cell.getNumericCellValue()+ ",");
+						} catch (IllegalStateException e) {
+							text +=(cell.getRichStringCellValue()+ ",");
+						}
+					}else {
 						text += String.valueOf(cell) + ",";
+					}
 				}
 				String[] split = (text+";").split(",");
 				String str = "";
@@ -70,29 +113,68 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 					continue;
 				textList.add(text + ";");
 			}
+			String rq = y+"-"+m+"-"+"01";//日期
+			List<Jdl> jdlList=new ArrayList<>();
 			for(int i = 0; i < textList.size(); i++){
 				String text = textList.get(i);
 				String[] split = text.split(",");
-				String rq = split[0].trim();
-				String nbbm = split[1].trim();
-//				String jsy= split[2].trim();
-				double jdl = Double.valueOf(split[2].trim().length()!=0?split[2]:"0");
-				String jdz = split[3].trim();
-				String remarks = split[4].trim();
-				if(rq.trim().length() == 0){
-					rq = sdf.format(new Date());
+				String plate = split[2].trim();//车牌号
+				if ("合计".equals(plate)){
+					break;
 				}
-				
-				List<Double> jdl_ = repository.queryBySame(gsbm, fgsbm, rq, nbbm);
-				
-				if(jdl_.size() == 0){
-					repository.insertData(gsbm, gsName, fgsbm, fgsName, rq, nbbm,
-							df.format(jdl), jdz, remarks, sd.format(new Date()));
-				}else{
-//					jdl += jdl_.get(0);
-					repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm);
+				String nbbm = split[3].trim();//内部编号
+				if ("".equals(nbbm)){
+					continue;
 				}
+				double jdl = Double.valueOf(split[4].trim().length()!=0?split[4]:"0");//加注量
+
+				String jsy= "";//驾驶员工号
+				String jdz = "";//能源站
+				String remarks = "";//备注
+				Jdl j=new Jdl();
+				j.setGsBm(gsbm);
+				j.setGsName(gsName);
+				j.setFgsBm(fgsbm);
+				j.setFgsName(fgsName);
+				j.setNbbm(nbbm);
+				j.setJdl(jdl);
+				j.setJdz(jdz);
+				j.setRemarks(remarks);
+				j.setCreaterDate(new Date());
+				j.setJsy(jsy);
+				j.setPlate(plate);
+				jdlList.add(j);
 			}
+			transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+				@Override
+				public void doInTransactionWithoutResult(TransactionStatus status) {
+					//删除
+					jdbcTemplate.update("delete from bsth_c_jdl where rq =+rq");
+					//重新写入
+							jdbcTemplate.batchUpdate("insert into bsth_c_jdl(gs_bm,gs_name,fgs_bm,fgs_name,rq,nbbm,jdl,jdz,remarks,jsy,plate)" +
+									" VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+								@Override
+								public void setValues(PreparedStatement ps, int i) throws SQLException {
+									Jdl jdl = jdlList.get(i);
+									ps.setString(1, jdl.getGsBm());
+									ps.setString(2, jdl.getGsName());
+									ps.setString(3, jdl.getFgsBm());
+									ps.setString(4, jdl.getFgsName());
+									ps.setString(5, rq);
+									ps.setString(6, jdl.getNbbm());
+									ps.setString(7, df.format(jdl.getJdl()));
+									ps.setString(8, jdl.getJdz());
+									ps.setString(9, jdl.getRemarks());
+									ps.setString(10, jdl.getJsy());
+									ps.setString(11, jdl.getPlate());
+								}
+								@Override
+								public int getBatchSize() {
+									return jdlList.size();
+								}
+							});
+				}
+			});
 			wb.close();
 			fs.close();
 		} catch (Exception e) {
@@ -108,13 +190,15 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 	@Override
 	public Map<String, Object> query(Map<String, Object> map) {
 		Map<String, Object> modelMap = new HashMap<String, Object>();
-		String gsbm = map.get("gsbm").toString();
-		String fgsbm = map.get("fgsbm").toString();
-		String rq = map.get("rq").toString();
-		String nbbm = map.get("nbbm").toString();
-//		String jsy =map.get("jsy").toString();
 		Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
-		List<Jdl> query = repository.query(gsbm, fgsbm, rq, nbbm);
+		StringBuffer sql=new StringBuffer("SELECT * FROM bsth_c_jdl where 1=1 ");
+		if(map.get("rq")!=null && !"".equals(map.get("rq").toString())){
+			sql.append("and rq>='"+map.get("rq")+"'");
+		}
+		if(map.get("nbbm")!=null && !"".equals(map.get("nbbm").toString())){
+			sql.append("and nbbm='"+map.get("nbbm")+"'");
+		}
+		List<Jdl> query = jdbcTemplate.query(sql.toString(), BeanPropertyRowMapper.newInstance(Jdl.class));
 		if(!map.containsKey("type")){
@@ -133,11 +217,12 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				m.put("nbbm", jdl.getNbbm());
 				m.put("jdl", jdl.getJdl());
 				m.put("jdz", jdl.getJdz());
+				m.put("plate", jdl.getPlate());
 				m.put("remarks", jdl.getRemarks());
 				list.add(m);
 			}
-			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		/*	List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
 			ReportUtils ee = new ReportUtils();
 			try {
@@ -148,9 +233,9 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
-			}
+			}*/
 		}
 		return modelMap;
 	}
-	
+
 }
+package com.bsth.service.oil.impl;
+
+import com.bsth.entity.oil.Jql;
+import com.bsth.entity.report.Ticket;
+import com.bsth.repository.oil.JqlRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.oil.JqlService;
+import com.bsth.util.ReportUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Service
+public class JqlServiceImpl extends BaseServiceImpl<Jql, Integer> implements JqlService {
+	
+	@Autowired
+	JqlRepository repository;
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+
+	@Override
+	public String importExcel(File file, String gsbm, String gsName, String fgsbm, String fgsName) {
+		gsbm="99";
+		gsName="青浦公交";
+		fgsbm="100";
+		fgsName="青浦公交";
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		DecimalFormat df = new DecimalFormat("######0.00");
+		List<String> textList = new ArrayList<String>();
+		try {
+			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file));
+			HSSFWorkbook wb = new HSSFWorkbook(fs);
+			HSSFSheet sheet = wb.getSheetAt(0);
+			// 取得总行数
+			int rowNum = sheet.getLastRowNum() + 1;
+			// 取得总列数
+			int cellNum = sheet.getRow(0).getLastCellNum();
+			HSSFRow row = null;
+			HSSFCell cell = null;
+			for(int i = 2; i < rowNum; i++){
+				row = sheet.getRow(i);
+				if (row == null){
+					continue;
+				}
+				String text = "";
+				for(int j = 0; j < cellNum; j++){
+					cell = row.getCell(j);
+					if(cell == null){
+						text += ",";
+						continue;
+					}
+						text += String.valueOf(cell) + ",";
+				}
+				String[] split = (text+";").split(",");
+				String str = "";
+				for(int j = 0; j < split.length && j < 5; j++){
+					str += split[j];
+				}
+				if(str.trim().length() == 0)
+					continue;
+				textList.add(text + ";");
+			}
+			for(int i = 0; i < textList.size(); i++){
+				String text = textList.get(i);
+				String[] split = text.split(",");
+				String rq = split[0].trim();//日期
+				String nbbm = split[1].trim();//内部编号
+				/*String jsy= split[2].trim();//驾驶员工号*/
+				String jsy="";
+				double jql = Double.valueOf(split[2].trim().length()!=0?split[2]:"0");//加注量
+				String jqz = split[3].trim();//能源站
+				String plate = split[4].trim();//车牌号
+				String remarks = split[5].trim();//备注
+				if(rq.trim().length() == 0){
+					rq = sdf.format(new Date());
+				}
+				
+				List<Double> jql_ = repository.queryBySame(gsbm, fgsbm, rq, nbbm);
+				
+				if(jql_.size() == 0){
+					repository.insertData(gsbm, gsName, fgsbm, fgsName, rq, nbbm,
+							df.format(jql), jqz, remarks, sd.format(new Date()),jsy,plate);
+				}else{
+					repository.UpdateJql(df.format(jql), gsbm, fgsbm, rq, nbbm,jsy,plate);
+				}
+			}
+			wb.close();
+			fs.close();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return "文件导入失败";
+		} finally {
+			file.delete();
+		}
+		return "文件导入成功";
+	}
+
+	@Override
+	public Map<String, Object> query(Map<String, Object> map) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
+		StringBuffer sql=new StringBuffer("SELECT * FROM bsth_c_jql where 1=1 ");
+		if(map.get("rq")!=null && !"".equals(map.get("rq").toString())){
+			sql.append("and rq>='"+map.get("rq")+"'");
+		}
+		if(map.get("nbbm")!=null && !"".equals(map.get("nbbm").toString())){
+			sql.append("and nbbm='"+map.get("nbbm")+"'");
+		}
+		List<Jql> query = jdbcTemplate.query(sql.toString(), BeanPropertyRowMapper.newInstance(Jql.class));
+
+		if(!map.containsKey("type")){
+			
+			int end = (page+1)*10>query.size()?query.size():(page+1)*10;
+			modelMap.put("dataList", query.subList(page*10, end));
+			modelMap.put("totalPages", query.size()%10>0?query.size()/10+1:query.size()/10);
+			
+		} else if(map.get("type").toString().equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			
+			List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+			for(Jql jql : query){
+				Map<String, Object> m = new HashMap<String, Object>();
+				m.put("rq", sdfMonth.format(jql.getRq()));
+				m.put("nbbm", jql.getNbbm());
+				m.put("jql", jql.getJql());
+				m.put("jqz", jql.getJqz());
+				m.put("plate", jql.getPlate());
+				m.put("remarks", jql.getRemarks());
+				list.add(m);
+			}
+			
+			/*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/export_Jql.xls",
+						path+"export/车辆加氢量" + sdfSimple.format(sdfMonth.parse(rq)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}*/
+		}
+		return modelMap;
+	}
+	
+}
+package com.bsth.service.oil.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+import com.bsth.entity.oil.Jql;
+import com.bsth.entity.oil.Nylog;
+import com.bsth.entity.oil.Qlb;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.CarsRepository;
+import com.bsth.repository.oil.*;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.oil.QlbService;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.Arith;
+import com.bsth.util.BatchSaveUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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 javax.transaction.Transactional;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Service
+public class QlbServiceImpl extends BaseServiceImpl<Qlb,Integer> implements QlbService{
+	@Autowired
+	QlbRepository repository;
+	@Autowired
+	NylogRepository nylogRepository;
+	@Autowired
+	YlxxbRepository ylxxbRepository;
+	@Autowired
+	JdlRepository jdlRepository;
+	@Autowired
+	JqlRepository jqlRepository;
+	@Autowired
+	CarsRepository carsRepository;
+	@Autowired
+	ScheduleRealInfoService scheduleRealInfoService;
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Transactional
+	@Override
+	public String obtainDsq() throws Exception{
+		String result = "failure";
+		List<Cars> carsList=carsRepository.findCars();
+		 Map<String, Boolean> carsMap=new HashMap<String, Boolean>();
+		 for (int i = 0; i < carsList.size(); i++) {
+			 Cars c=carsList.get(i);
+			 carsMap.put(c.getInsideCode(), c.getHydrogen());
+		}
+		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			Date dNow = new Date();   //当前时间
+			Date dBefore = new Date();
+			Calendar calendar = Calendar.getInstance(); //得到日历
+			calendar.setTime(dNow);//把当前时间赋给日历
+			calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
+			dBefore = calendar.getTime();   //得到前一天的时间
+			String rq=sdf.format(dBefore);
+//		 String rq="2017-11-02";
+		String line="";
+		//保留两位小数
+		DecimalFormat df = new DecimalFormat("#.00");
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		//当天QLB信息
+		List<Qlb> qlList=repository.obtainQl(rq, "", "", line, "", "nbbm");
+		//当天YLXXB信息
+		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,"");
+		//当天加氢信息表
+		List<Jql> jqlList=jqlRepository.JqlList(rq);
+		//前一天所有车辆最后进场班次信息
+		List<Qlb> qlListBe=repository.obtainQlbefore(rq, "", "", "", "");
+		//从排班表中计算出行驶的总里程
+		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
+		for(int x=0;x<listpb.size();x++){
+			String type="add";
+			boolean sfHydrogen=false;
+			Map<String, Object> map=listpb.get(x);
+			if (carsMap.get(map.get("clZbh").toString())!=null) {
+				sfHydrogen = carsMap.get(map.get("clZbh").toString());
+			}else{
+				sfHydrogen = false;
+			}
+			if(sfHydrogen){
+				//判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+				Qlb t=new Qlb();
+				for(int k=0;k<qlList.size();k++){
+					Qlb t1=qlList.get(k);
+					if(t1.getNbbm().equals(map.get("clZbh").toString())
+							&&t1.getJsy().equals(map.get("jGh").toString())
+							&&t1.getXlbm().equals(map.get("xlBm").toString())
+							&&t1.getLp().equals(map.get("lpName").toString()))
+					{
+						t=t1;
+						type="update";
+					}
+				}
+				try {
+					//当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+					Double jzl=0.0;
+					if(map.get("seqNumber").toString().equals("1")){
+						boolean fage=true;
+						for (int i = 0; i < qlListBe.size(); i++) {
+							Qlb qlb=qlListBe.get(i);
+							if(map.get("clZbh").toString().equals(qlb.getNbbm())){
+								t.setCzcl(qlb.getJzcl());
+								fage=false;
+								break;
+							}
+						}
+						if(fage){
+							t.setCzcl(0.0);
+						}
+						
+						//手动导入没有驾驶员工号
+						for (int i = 0; i < jqlList.size(); i++) {
+							Jql jql=jqlList.get(i);
+							if(map.get("clZbh").toString().equals(jql.getNbbm()) 
+									&&map.get("jGh").toString().equals(jql.getJsy())){
+								jzl+=jql.getJql();
+							}
+						}
+					}
+					
+					
+//					//把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+//					for(int j=0;j<ylxxList.size();j++){
+//						Ylxxb ylxxb = ylxxList.get(j);
+//						if(map.get("clZbh").toString().equals(ylxxb.getNbbm()) &&map.get("jGh").toString().equals(ylxxb.getJsy())){
+//							jzl+=ylxxb.getJzl();
+//						}
+//					}
+					
+					t.setJql(jzl);
+					if(type.equals("add")){
+						t.setHn(jzl);
+						t.setJzcl(t.getCzcl());
+					}
+					
+					t.setNbbm(map.get("clZbh").toString());
+					t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
+					t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
+					t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
+					t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
+					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+					t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
+					t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
+					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+					t.setLp(map.get("lpName").toString());
+					t.setRq(sdf.parse(rq));
+					t.setCreatetime(new Date());
+					t.setJname(map.get("jName").toString());
+					repository.save(t);
+					newMap.put("status", ResponseCode.SUCCESS);
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					newMap.put("status", ResponseCode.ERROR);
+					e.printStackTrace();
+				}
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * 获取进存油信息
+	 * @Transactional 回滚事物
+	 */
+	@Transactional  
+	@Override
+	public Map<String, Object> obtain(Map<String, Object> map2) throws Exception{
+		Map<String, Object> newMap = new HashMap<String, Object>();
+		try {
+			Date date=new Date();
+			List<Cars> carsList = carsRepository.findCars();
+			Map<String, Boolean> carsMap = new HashMap<String, Boolean>();
+			for (int i = 0; i < carsList.size(); i++) {
+				Cars c = carsList.get(i);
+				carsMap.put(c.getInsideCode(), c.getHydrogen());
+			}
+			String rq = map2.get("rq").toString();
+			String line = "";
+			if (map2.get("xlbm_like") != null) {
+				line = map2.get("xlbm_like").toString().trim();
+			}
+			String gsbm="";
+			if(map2.get("ssgsdm_like")!=null){
+				gsbm=map2.get("ssgsdm_like").toString();
+			}
+			String fgsbm="";
+			if(map2.get("fgsdm_like")!=null){
+				fgsbm=map2.get("fgsdm_like").toString();
+			}
+			String nbbm="";
+			if(map2.get("nbbm_eq")!=null){
+				nbbm=map2.get("nbbm_eq").toString();
+			}
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			// 保留两位小数
+			DecimalFormat df = new DecimalFormat("#.00");
+			// TODO Auto-generated method stub
+			// 当天QLB信息
+			List<Qlb> qlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
+			// 当天YLXXB信息
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0, gsbm);
+			// 从排班表中计算出行驶的总里程
+			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
+			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
+		    Map<String, Double> lcMap=new HashMap<String,Double>();
+			for (int i = 0; i < listpbs.size(); i++) {
+				String cl=listpbs.get(i).get("clZbh").toString();
+				Double lc=listpbs.get(i).get("totalKilometers") == null ? 0.0
+						: Double.parseDouble(listpbs.get(i).get("totalKilometers").toString());
+				if(lcMap.get(cl)==null){
+					lcMap.put(cl, lc);
+				}else{
+					double lc_=lcMap.get(cl);
+					lcMap.remove(cl);
+					lcMap.put(cl, Arith.add(lc, lc_));
+				}
+			}
+			
+			List<Jql> jqlList=jqlRepository.JqlList(rq);
+			List<Jql> jqlList_1=jqlRepository.JqlList_1(rq, gsbm, "-1");
+			String sxtj=map2.get("sxtj").toString();
+			if(sxtj.equals("0")){
+				listpb=listpbs;
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, "", nbbm);
+				List<String> stringList=new ArrayList<String>();
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}	
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+				
+				for (int i = 0; i < stringList.size(); i++) {
+					String strNbbm=stringList.get(i);
+					for (int j = 0; j < listpbs.size(); j++) {
+						Map<String, Object> map = listpbs.get(j);
+						String mapNbbm=map.get("clZbh").toString();
+						if(strNbbm.equals(mapNbbm)){
+							listpb.add(map);
+						}
+					}
+				}
+			}
+			Map<String, Object> newMap_=new HashMap<String,Object>();
+			List<Qlb> addList = new ArrayList<Qlb>();
+			List<Qlb> updateList = new ArrayList<Qlb>();
+			Map<String, Object> cMap=new HashMap<String, Object>();
+			List<Map<String, Object>> listpb_=listpb;
+			Collections.sort(listpb,new NbbmJcsxMap2());
+			
+			Map<String, String> clFgs=new HashMap<String, String>(); // 电车当天在哪几个公司运营了
+			for(int x = 0; x < listpb_.size(); x++){
+				boolean sfHydrogen = false;
+				Map<String, Object> map_ = listpb_.get(x);
+				String clZbh = map_.get("clZbh").toString();
+				if (carsMap.get(clZbh) != null) {
+					sfHydrogen = carsMap.get(clZbh);
+				} else {
+					sfHydrogen = false;
+				}
+				if (sfHydrogen) {
+					if(clFgs.get(clZbh)==null){
+						clFgs.put(clZbh, "");
+					}
+					String gsFgs = map_.get("company").toString() + "_" + map_.get("bCompany").toString();
+					if(!(clFgs.get(clZbh).contains(gsFgs))){
+						clFgs.put(clZbh, clFgs.get(clZbh) + "/" + gsFgs);
+					}
+				}
+			}
+			
+			for (int x = 0; x < listpb_.size(); x++) {
+				String type = "add";
+				boolean sfHydrogen = false;
+				Map<String, Object> map_ = listpb_.get(x);
+				if (carsMap.get(map_.get("clZbh").toString()) != null) {
+					sfHydrogen = carsMap.get(map_.get("clZbh").toString());
+				} else {
+					sfHydrogen = false;
+				}
+				if (sfHydrogen) {
+					if(newMap_.get(map_.get("clZbh").toString())==null){
+						newMap_.put(map_.get("clZbh").toString(), map_.get("clZbh").toString());
+						//车辆总里程
+						double zlc =lcMap.get(map_.get("clZbh").toString());
+						//车辆总加氢量
+						double zjzl = 0.0, zjzl_1 = 0.0;
+//						for (int j = 0; j < ylxxList.size(); j++) {
+//							Ylxxb ylxxb = ylxxList.get(j);
+//							if (map_.get("clZbh").toString().equals(ylxxb.getNbbm())
+//									&& map_.get("company").toString().equals(ylxxb.getGsdm())) {
+//								zjzl = Arith.add(zjzl, ylxxb.getJzl());
+//							}
+//						}
+						for (int i = 0; i < jqlList.size(); i++) {
+							Jql jql=jqlList.get(i);
+							if(map_.get("clZbh").toString().equals(jql.getNbbm()) 
+									&&clFgs.get(map_.get("clZbh").toString()).contains(jql.getGsBm()+"_"+jql.getFgsBm())){
+								zjzl = Arith.add(zjzl,jql.getJql());
+							}
+						}
+						
+						int num = 0; // 2022年12月20号要求不按车队导入，这之后导入的加注量将覆盖原加注量
+						for (int i = 0; i < jqlList_1.size(); i++) {
+							Jql jql=jqlList_1.get(i);
+							if(map_.get("clZbh").toString().equals(jql.getNbbm()) 
+									&&map_.get("company").toString().equals(jql.getGsBm())){
+								zjzl_1 = Arith.add(zjzl_1,jql.getJql());
+								num++;
+							}
+						}
+						if(num > 0){
+							zjzl = zjzl_1;
+						}
+						
+						Double nextJzyl = 0.0;
+						for (int i = 0; i < listpb.size(); i++) {
+							Map<String, Object> map = listpb.get(i);
+							if(map_.get("clZbh").toString().equals(map.get("clZbh").toString())){
+								// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+								Qlb t = new Qlb();
+								for (int k = 0; k < qlList.size(); k++) {
+									Qlb t1 = qlList.get(k);
+									if (t1.getNbbm().equals(map.get("clZbh").toString())
+											&& t1.getJsy().equals(map.get("jGh").toString())
+											&& t1.getXlbm().equals(map.get("xlBm").toString())) {
+										if(t1.getLp()==null){
+											//同人同车同线路不同路牌的过滤  （考虑到历史数据）
+											if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
+												t = t1;
+												type = "update";
+												cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
+														map.get("clZbh").toString());
+											}
+										}else{
+											if(t1.getLp().equals(map.get("lpName").toString())){
+												t = t1;
+												type = "update";
+											}
+											
+										}
+									}
+								}
+								Double lc= Double.parseDouble(map.get("totalKilometers").toString());
+								if(map.get("seqNumber").toString().equals("1")){
+									// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+									Double dh=0.0;
+									if(zlc>0){
+										dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+									}
+									nextJzyl =Arith.sub(zjzl,dh);
+									if(zlc>0){
+//										long l=Math.round(nextJzyl);
+										double ylxs=nextJzyl;
+										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+										if(dh<0){
+											t.setHn(0.0);
+											t.setJql(0.0);
+											nextJzyl=Arith.add(ylxs, dh);
+										}else{
+											t.setHn(dh);
+											t.setJql(dh);
+											nextJzyl=ylxs;
+										}
+									}else{
+										t.setHn(0.0);
+										t.setJql(0.0);
+									}
+								}else{
+									Double dh=0.0;
+									if(zlc>0){
+										dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+									}
+									nextJzyl =Arith.sub( nextJzyl,dh);
+									if(zlc>0){
+//										long l=0l;
+										double ylxs=0.0;
+										if(i==listpb.size()-1){
+//											ylxs=czyl;
+										}else{
+											if(listpb.get(i+1).get("clZbh").toString().equals(map.get("clZbh").toString())){
+//												l=Math.round(nextJzyl);
+												ylxs=nextJzyl;
+											}
+											
+										}
+										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+										if(dh<0){
+											t.setHn(0.0);
+											t.setJql(0.0);
+											nextJzyl=Arith.add(ylxs, dh);
+										}else{
+											t.setHn(dh);
+											t.setJql(dh);
+											nextJzyl=ylxs;
+										}
+									}else{
+										t.setHn(0.0);
+										t.setJql(0.0);
+									}
+								}
+								t.setCzcl(100.0);
+								t.setJzcl(100.0);
+								t.setNbbm(map.get("clZbh").toString());
+								t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
+								t.setZlc(map.get("totalKilometers") == null ? 0.0
+										: Double.parseDouble(map.get("totalKilometers").toString()));
+								t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+								t.setLinename(map.get("lineName")==null?"":map.get("lineName").toString());
+								t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+								t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
+								t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
+								t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+								t.setRq(sdf.parse(rq));
+								t.setLp(map.get("lpName").toString());
+								t.setJname(map.get("jName").toString());
+								if (!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))) {
+									if (t.getHn() < 0) {
+										t.setHn(0.0);
+									}
+									if (t.getJql() < 0) {
+										t.setJql(0.0);
+									}
+									if (type.equals("add")) {
+										t.setCreatetime(date);
+										addList.add(t);
+									} else {
+										t.setUpdatetime(date);
+										updateList.add(t);
+									}
+								}
+								newMap.put("status", ResponseCode.SUCCESS);
+							}
+						}
+					}
+				}
+			}
+			if(addList.size()>0){ 
+				try {
+					new BatchSaveUtils<Qlb>().saveList2(addList, Qlb.class); 
+				} catch (Exception e) {
+					// TODO: handle exception
+					if(e.getMessage().indexOf("PK_QLB_UK")>0){
+						newMap.put("fage", "存在相同数据,数据已经过滤");
+						logger.info("获取:存在相同数据,数据已经过滤");
+					}
+				}
+				
+			}
+			
+			if(updateList.size()>0){
+				for (int i = 0; i < updateList.size(); i++) {
+					repository.save(updateList.get(i));
+				}
+			}
+			SysUser user = SecurityUtils.getCurrentUser();
+			Nylog nylog=new Nylog();
+			nylog.setCreatedate(new Date());
+			nylog.setCzmc("获取");
+			nylog.setNylx("氢");
+			nylog.setUserid(user.getUserName());
+			nylog.setUsername(user.getName());
+			nylog.setCxtj(line+"-"+ date+"-"+gsbm+"-"+fgsbm);
+			nylogRepository.save(nylog);
+			newMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			newMap.put("status", ResponseCode.ERROR);
+			throw e;
+		}
+
+		return newMap;
+	}
+	
+	/**
+	 * 拆分
+	 */
+	@Transactional  
+	@Override
+	public Map<String, Object> sort(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap = new HashMap<String, Object>();
+		try{
+			int id=Integer.parseInt(map.get("id").toString());
+			//最后存油量
+			Double jzcl=Double.parseDouble(map.get("jzdl").toString());
+			Double hn=Double.parseDouble(map.get("hdl").toString());
+			Qlb qlb=repository.findById(id);
+			qlb.setJzcl(jzcl);
+			qlb.setHn(hn);
+			repository.save(qlb);
+			newMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return newMap;
+	}
+
+	
+	/**
+	 * 核对，有加注没里程
+	 * @param map
+	 * @return
+	 */
+	@Transactional
+	@Override
+	public Map<String, Object> checkQl(Map<String, Object> map) {
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		
+		try{
+			//获取车辆存油信息
+			
+			String rq=map.get("rq").toString();
+			String xlbm="";
+			if(map.get("xlbm_like")!=null){
+				xlbm= map.get("xlbm_like").toString().trim();
+			}
+			String gsbm="";
+			if(map.get("ssgsdm_like")!=null){
+				gsbm=map.get("ssgsdm_like").toString();
+			}
+			String fgsbm="";
+			if(map.get("fgsdm_like")!=null){
+				fgsbm=map.get("fgsdm_like").toString();
+			}
+			String nbbm="";
+			if(map.get("nbbm_eq")!=null){
+				nbbm=map.get("nbbm_eq").toString();
+			}
+			
+			String sql="select * from bsth_c_jql j where"
+					+ " j.gs_bm = ? and j.fgs_bm = ? and rq = ? "
+					+ " and nbbm not in (select nbbm from bsth_c_qlb d "
+					+ " where ssgsdm = ? and fgsdm = ?  and rq = ?)";
+			Object[] objects = {gsbm, fgsbm, rq, gsbm, fgsbm, rq};
+			List<Jql> listJql=jdbcTemplate.query(sql,
+					objects,
+					new RowMapper<Jql>(){
+				@Override
+				public Jql mapRow(ResultSet rs, int rowNum) throws SQLException {
+					Jql s  = new Jql();
+					s.setNbbm(rs.getString("nbbm"));
+					s.setGsBm(rs.getString("gs_bm"));
+					s.setFgsBm(rs.getString("fgs_bm"));
+					s.setJql(rs.getDouble("jql"));
+					s.setRq(rs.getDate("rq"));
+					return s;
+				}
+			});
+			for (int i = 0; i < listJql.size(); i++) {
+				Jql j=listJql.get(i);
+				Qlb t=new Qlb();
+				Line line = BasicData.nbbm2LineMap.get(j.getNbbm());
+				if(null !=line){
+					t.setJql(j.getJql());
+					t.setNbbm(j.getNbbm());
+					t.setRq(j.getRq());
+					t.setJsy("");
+					t.setJql(j.getJql());
+					t.setSsgsdm(j.getGsBm());
+					t.setFgsdm(j.getFgsBm());
+					t.setJzcl(100.0);
+					t.setCzcl(100.0);
+					t.setHn(0.0);
+					t.setJcsx(1);
+					t.setXlbm(line.getLineCode());
+					t.setLp("");
+					repository.save(t);
+				}
+			}
+			
+			SysUser user = SecurityUtils.getCurrentUser();
+			Nylog nylog=new Nylog();
+			nylog.setCreatedate(new Date());
+			nylog.setCzmc("核对");
+			nylog.setNylx("氢");
+			nylog.setUserid(user.getUserName());
+			nylog.setUsername(user.getName());
+			nylog.setCxtj(xlbm+"-"+ rq+"-"+gsbm+"-"+fgsbm);
+			nylogRepository.save(nylog);
+			newMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e;
+		}
+		
+		return newMap;
+	}
+
+	@Override
+	public List<Qlb> listQlb(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Qlb> listQlb = new ArrayList<Qlb>();
+		List<String> stringList = new ArrayList<String>();
+		String rq = map.get("rq").toString();
+		String gsbm = map.get("ssgsdm_like").toString();
+		String fgsbm = map.get("fgsdm_like").toString();
+		String xlbm = map.get("xlbm_like").toString().trim();
+		String nbbm = map.get("nbbm_eq").toString();
+		String sxtj = map.get("sxtj").toString();
+		String type = map.get("type").toString();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try {
+			if (nbbm.trim() != "") {
+				stringList.add(nbbm);
+				if (type.equals("1"))
+					listQlb = repository.listQlb(rq, gsbm, fgsbm, xlbm, stringList);
+				else
+					listQlb = repository.listQlb_s(sdf.parse(rq + " 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+
+			} else {
+				// 全部
+				if (sxtj.equals("0")) {
+					List<Object[]> objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm = objectLists.get(i)[0].toString();
+						stringList.add(clbm);
+					}
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listQlb = repository.listQlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listQlb = repository.listQlb_s(sdf.parse(rq + " 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
+				} else {
+					List<Object[]> objectLists;
+					if (sxtj.equals("3")) {
+						// 有加油没里程
+						objectLists = repository.checkNbmmQl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (jzl > 0 && zlc <= 0) {
+								stringList.add(clbm);
+							}
+
+						}
+
+					} else if (sxtj.equals("4")) {
+						// 有里程没加油
+						objectLists = repository.checkNbmmQl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (zlc > 0 && jzl <= 0) {
+								stringList.add(clbm);
+							}
+
+						}
+					} else {
+						objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							int cs = Integer.parseInt(objectLists.get(i)[1].toString());
+							// 一车一单
+							if (sxtj.equals("1")) {
+								if (cs == 1) {
+									stringList.add(clbm);
+								}
+							}
+							// 一车多单
+							if (sxtj.equals("2")) {
+								if (cs > 1) {
+									stringList.add(clbm);
+								}
+							}
+						}
+					}
+
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listQlb = repository.listQlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listQlb = repository.listQlb_s(sdf.parse(rq + " 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
+				}
+			}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return listQlb;
+	}
+
+	@Override
+	public Map<String, Object> sumQlb(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<String> stringList = new ArrayList<String>();
+		String rq = map.get("rq").toString();
+		String gsbm = map.get("ssgsdm_like").toString();
+		String fgsbm = map.get("fgsdm_like").toString();
+		String xlbm = map.get("xlbm_like").toString().trim();
+		String nbbm = map.get("nbbm_eq").toString();
+		String sxtj = map.get("sxtj").toString();
+		String type = map.get("type").toString();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		List<Object[]> sumQlbList = new ArrayList<Object[]>();
+		try {
+			if (nbbm.trim() != "") {
+				stringList.add(nbbm);
+			} else {
+				if (!sxtj.equals("0")) {
+					List<Object[]> objectLists;
+					if (sxtj.equals("3")) {
+						// 有加油没里程
+						objectLists = repository.checkNbmmQl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (jzl > 0 && zlc <= 0) {
+								stringList.add(clbm);
+							}
+
+						}
+
+					} else if (sxtj.equals("4")) {
+						// 有里程没加油
+						objectLists = repository.checkNbmmQl(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+							double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+							if (zlc > 0 && jzl <= 0) {
+								stringList.add(clbm);
+							}
+
+						}
+					} else {
+						objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+						for (int i = 0; i < objectLists.size(); i++) {
+							String clbm = objectLists.get(i)[0].toString();
+							int cs = Integer.parseInt(objectLists.get(i)[1].toString());
+							// 一车一单
+							if (sxtj.equals("1")) {
+								if (cs == 1) {
+									stringList.add(clbm);
+								}
+							}
+							// 一车多单
+							if (sxtj.equals("2")) {
+								if (cs > 1) {
+									stringList.add(clbm);
+								}
+							}
+						}
+					}
+				}
+			}
+			if (sxtj.equals("0")) {
+				sumQlbList = repository.sumQlb2(rq, gsbm, fgsbm, xlbm, nbbm);
+			} else {
+				if (stringList.size() > 0) {
+					if (type.equals("1"))
+						sumQlbList = repository.sumQlb(rq, gsbm, fgsbm, xlbm, stringList);
+					else
+						sumQlbList = repository.sumQlb_s(sdf.parse(rq + " 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+
+				}
+			}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Double jzl = 0.0, yh = 0.0, sh = 0.0;
+		for (int i = 0; i < sumQlbList.size(); i++) {
+			jzl = Arith.add(jzl, Double.valueOf(sumQlbList.get(i)[0].toString()));
+			yh = Arith.add(yh, Double.valueOf(sumQlbList.get(i)[1].toString()));
+			sh = Arith.add(sh, Double.valueOf(sumQlbList.get(i)[2].toString()));
+		}
+
+		Map<String, Object> sumMap = new HashMap<String, Object>();
+		sumMap.put("jzl", jzl);
+		sumMap.put("yh", yh);
+		sumMap.put("sh", sh);
+		return sumMap;
+	}
+	
+	
+	@Transactional  
+	@Override
+	public Map<String, Object> saveQlbList(Map<String, Object> map) throws Exception {
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		try{
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String json =StringEscapeUtils.unescapeHtml4(map.get("qlbList").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		for (int i = 0; i < jsonArray.size(); i++) {
+			jsonObject=jsonArray.getJSONObject(i);
+			double czcl = jsonObject.getDoubleValue("czcl");
+//			double jql =jsonObject.getDoubleValue("jql");
+			double jzcl =jsonObject.getDoubleValue("jzcl");
+			double sh =jsonObject.getDoubleValue("sh");
+			String shyy =jsonObject.getString("shyy");
+			double hn = jsonObject.getDoubleValue("hn");
+			int nhlx =jsonObject.getIntValue("nhlx");
+			Integer id =jsonObject.getInteger("id");
+			repository.qlbUpdate(id, czcl, jzcl, hn, sh, shyy, nhlx);
+		
+		}
+		
+		SysUser user = SecurityUtils.getCurrentUser();
+		Nylog nylog=new Nylog();
+		nylog.setCreatedate(new Date());
+		nylog.setCzmc("保存全部");
+		nylog.setNylx("氢");
+		nylog.setUserid(user.getUserName());
+		nylog.setUsername(user.getName());
+		nylog.setCxtj("");
+		nylogRepository.save(nylog);
+		newMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e;
+		}
+		return newMap;
+	}
+	
+	public  List<Qlb> listOrderBy(String rq,String gsdm,
+			String fgsdm,String xlbm,String nbbm,
+			String px) {
+		
+		List<String> objList = new ArrayList<>();
+		String sql="SELECT * FROM bsth_c_qlb "
+				+ " where rq=? ";
+		objList.add(rq);
+		if(gsdm.trim().length() > 0 && fgsdm.trim().length() > 0){
+			sql += " and ssgsdm like CONCAT('%',?,'%') "
+				+ " and fgsdm like CONCAT('%',?,'%') ";
+			objList.add(gsdm);
+			objList.add(fgsdm);
+		} else if(gsdm.trim().length() > 0){
+			sql += " and ssgsdm like CONCAT('%',?,'%') ";
+			objList.add(gsdm);
+		}
+		if(xlbm.trim().length() > 0){
+			sql+= " and xlbm = ? ";
+			objList.add(xlbm);
+		}
+		sql += "and nbbm like CONCAT('%',?,'%') order by "+px+" asc ";
+		objList.add(nbbm);
+		
+		List<Qlb> list = jdbcTemplate.query(sql, objList.toArray(), new RowMapper<Qlb>() {
+			@Override
+			public Qlb mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Qlb y = new Qlb();
+				y.setId(arg0.getInt("id"));
+				return y;
+			}
+		});
+		List<Qlb> lists=new ArrayList<Qlb>();
+		List<Qlb> qlbLists=repository.obtainQl(rq,gsdm,fgsdm,xlbm,nbbm,"jcsx");
+		for (int i = 0; i < list.size(); i++) {
+			Qlb t=list.get(i);
+			for (int j = 0; j < qlbLists.size(); j++) {
+				Qlb t2=qlbLists.get(j);
+				if(t.getId().intValue()==t2.getId().intValue()){
+					lists.add(t2);
+					break;
+				}
+			}
+		}
+		
+		return lists;
+	}
+	
+	
+	@Override
+	public String checkJsy(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		String rq=map.get("date").toString();
+		String nbbm=map.get("nbbm").toString();
+		String jsy =map.get("jsy").toString();
+		String xlbm=map.get("xlbm").toString();
+		List<Qlb> list= repository.queryListQlb(rq, nbbm, jsy, xlbm);
+		String type="1";
+		if(list.size()>0){
+			type="0";
+		}
+		return type;
+	}
+
+	@Override
+	public Map<String, Object> saveQlb(Qlb t) {
+		// TODO Auto-generated method stub
+		Map<String, Object> map = new HashMap<>();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String rq=sdf.format(t.getRq());
+		String gsdm=t.getSsgsdm();
+		String fgsdm=t.getFgsdm();
+		String xlbm=t.getXlbm();
+		String jhsj=t.getJhsj();
+		String nbbm=t.getNbbm();
+		t.setCreatetime(new Date());
+		String[] jhsjStr = jhsj.split(":");
+		long fcsjL= Long.parseLong(jhsjStr[0])*60+Long.parseLong(jhsjStr[1]);
+		List<Qlb> list=this.listOrderBy(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+		int jcsx=1;
+		if(list.size()>0){
+			for (int i = 0; i < list.size(); i++) {
+				Qlb y=list.get(i);
+				String[] fcsjStr = y.getJhsj().split(":");
+				long fcsj=Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+				if(fcsjL>fcsj){
+					jcsx=jcsx+y.getJcsx();
+				}else{
+					y.setJcsx(y.getJcsx()+1);
+					repository.save(y);
+				}
+			}
+		}
+		t.setJcsx(jcsx);
+		repository.save(t);
+		
+		SysUser user = SecurityUtils.getCurrentUser();
+		Nylog nylog=new Nylog();
+		nylog.setCreatedate(new Date());
+		nylog.setCzmc("手动添加");
+		nylog.setNylx("氢");
+		nylog.setUserid(user.getUserName());
+		nylog.setUsername(user.getName());
+		nylog.setCxtj("");
+		nylogRepository.save(nylog);
+		map.put("status", ResponseCode.SUCCESS);
+        map.put("t", t);
+		return map;
+	}
+	
+	@Transactional  
+	@Override
+	public Map<String, Object> deleteIds(Map<String, Object> map) throws Exception{
+		// TODO Auto-generated method stub
+		Map<String, Object> maps = new HashMap<>();
+		try{
+		String json =StringEscapeUtils.unescapeHtml4(map.get("ids").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		for (int x = 0; x < jsonArray.size(); x++) {
+			jsonObject=jsonArray.getJSONObject(x);
+			Integer id =jsonObject.getInteger("id");
+			repository.deleteById(id);
+		}
+		
+		SysUser user = SecurityUtils.getCurrentUser();
+		Nylog nylog=new Nylog();
+		nylog.setCreatedate(new Date());
+		nylog.setCzmc("删除");
+		nylog.setNylx("氢");
+		nylog.setUserid(user.getUserName());
+		nylog.setUsername(user.getName());
+		nylog.setCxtj("");
+		nylogRepository.save(nylog);
+		maps.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			maps.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e; 
+		}
+		return maps;
+	}
+
+	@Override
+	public Map<String, List<Qlb>> updeteHistory(List<Map<String, Object>> listpbQc,String date,
+			String gsdm,String fgsdm,String line) {
+		// TODO Auto-generated method stub
+		Map<String, List<Qlb>> mapList=new HashMap<String,List<Qlb>>();
+		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		// 保留两位小数
+		DecimalFormat df = new DecimalFormat("#.00");
+		List<Qlb> qlbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
+		List<Qlb> qlbList_upd=new ArrayList<Qlb>(); 
+		List<Qlb> qlbList_del=new ArrayList<Qlb>(); 
+		try{
+		for (int j = 0; j < qlbList.size(); j++) {
+			Qlb t=qlbList.get(j);
+			boolean fage=true;
+			if(StringUtils.isEmpty(t.getLp())){
+				fage=false;
+			}else{
+				for (int i = 0; i < listpbQc.size(); i++) {
+					Map<String, Object> m = listpbQc.get(i);
+					if(t.getNbbm().equals(m.get("clZbh").toString())
+					&&t.getJsy().equals(m.get("jGh").toString())
+					&&t.getXlbm().equals(m.get("xlBm").toString())
+					&&t.getLp().equals(m.get("lpName").toString())){
+						//该条记录不用删除
+						fage =false;
+						qlbList_upd.add(t);
+					}
+				}
+			}
+			
+			if(fage){
+				if(t.getXlbm().equals(line)){
+					qlbList_del.add(t);
+				}
+			}
+		}
+		mapList.put("delList", qlbList_del);
+		Map<String, Double> lcMap=new HashMap<String,Double>();
+		for (int i = 0; i < listpbQc.size(); i++) {
+			String cl=listpbQc.get(i).get("clZbh").toString();
+			Double lc= listpbQc.get(i).get("totalKilometers") == null ? 0.0
+					: Double.parseDouble(listpbQc.get(i).get("totalKilometers").toString());
+			if(lcMap.get(cl)==null){
+				lcMap.put(cl, lc);
+			}else{
+				double lc_=lcMap.get(cl);
+				lcMap.remove(cl);
+				lcMap.put(cl, Arith.add(lc, lc_));
+			}
+		}
+		Map<String, Double> shMap=new HashMap<String,Double>();
+		for (int i = 0; i < qlbList_upd.size(); i++) {
+			Qlb qlb=qlbList_upd.get(i);
+			String cl=qlb.getNbbm();
+			if(shMap.get(cl)==null){
+				shMap.put(cl, qlb.getSh());
+			}else{
+				double sh=shMap.get(cl);
+				shMap.remove(cl);
+				shMap.put(cl, Arith.add(sh, qlb.getSh()));
+			}
+		}
+		List<Jql> jqlList=jqlRepository.JqlList(date);
+		List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 0, gsdm);
+		Map<String, Object> newMap_=new HashMap<String,Object>();
+		Map<String, Object> cMap=new HashMap<String, Object>();
+		List<Map<String, Object>> listpb_=listpbQc;
+		Collections.sort(listpbQc,new NbbmJcsxMap2());
+		List<Qlb> updateQlb=new ArrayList<Qlb>();
+		for (int x = 0; x < listpb_.size(); x++) {
+			String type = "add";
+			Map<String, Object> map_ = listpb_.get(x);
+				if(newMap_.get(map_.get("clZbh").toString())==null){
+					newMap_.put(map_.get("clZbh").toString(), map_.get("clZbh").toString());
+					//车辆总里程
+					double zlc =lcMap.get(map_.get("clZbh").toString());
+					//车辆总加氢量
+					double zjzl = 0.0;
+//					for (int j = 0; j < ylxxList.size(); j++) {
+//						Ylxxb ylxxb = ylxxList.get(j);
+//						if (map_.get("clZbh").toString().equals(ylxxb.getNbbm())
+//								&& map_.get("company").toString().equals(ylxxb.getGsdm())) {
+//							zjzl = Arith.add(zjzl, ylxxb.getJzl());
+//						}
+//					}
+					for (int i = 0; i < jqlList.size(); i++) {
+						Jql jql=jqlList.get(i);
+						if(map_.get("clZbh").toString().equals(jql.getNbbm()) 
+								&&map_.get("company").toString().equals(jql.getGsBm())
+								&&map_.get("bCompany").toString().equals(jql.getFgsBm())){
+							zjzl = Arith.add(zjzl,jql.getJql());
+						}
+					}
+					double clsh=0.0;
+					if(shMap.get(map_.get("clZbh").toString())==null){
+						clsh=0.0;
+					}else{
+						clsh=shMap.get(map_.get("clZbh").toString());
+					}
+					zjzl =Arith.sub(zjzl, clsh);
+					Double nextJzyl = 0.0;
+					for (int i = 0; i < listpbQc.size(); i++) {
+						Map<String, Object> map = listpbQc.get(i);
+						if(map_.get("clZbh").toString().equals(map.get("clZbh").toString())){
+							// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+							Qlb t = new Qlb();
+							for (int k = 0; k < qlbList_upd.size(); k++) {
+								Qlb t1 = qlbList_upd.get(k);
+								if (t1.getNbbm().equals(map.get("clZbh").toString())
+										&& t1.getJsy().equals(map.get("jGh").toString())
+										&& t1.getXlbm().equals(map.get("xlBm").toString())
+										&& t1.getLp().equals(map.get("lpName").toString())) {
+											t = t1;
+											type = "update";
+								}
+								
+							}
+							Double lc= Double.parseDouble(map.get("totalKilometers").toString());
+							if(map.get("seqNumber").toString().equals("1")){
+								// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+								Double dh=0.0;
+								if(zlc>0){
+									dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+								}
+								nextJzyl =Arith.sub(zjzl,dh);
+								if(zlc>0){
+//									long l=Math.round(nextJzyl);
+									double ylxs=nextJzyl;
+									dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+									if(dh<0){
+										t.setHn(0.0);
+										t.setJql(0.0);
+										nextJzyl=Arith.add(ylxs, dh);
+									}else{
+										t.setHn(dh);
+										t.setJql(dh);
+										nextJzyl=ylxs;
+									}
+								}else{
+									t.setHn(0.0);
+									t.setJql(0.0);
+								}
+							}else{
+								Double dh=0.0;
+								if(zlc>0){
+									dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+								}
+								nextJzyl =Arith.sub( nextJzyl,dh);
+								if(zlc>0){
+//									long l=0l;
+									double ylxs=0.0;
+									if(i==listpbQc.size()-1){
+//										ylxs=czyl;
+									}else{
+										if(listpbQc.get(i+1).get("clZbh").toString().equals(map.get("clZbh").toString())){
+//											l=Math.round(nextJzyl);
+											ylxs=nextJzyl;
+										}
+										
+									}
+									dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+									if(dh<0){
+										t.setHn(0.0);
+										t.setJql(0.0);
+										nextJzyl=Arith.add(ylxs, dh);
+									}else{
+										t.setHn(dh);
+										t.setJql(dh);
+										nextJzyl=ylxs;
+									}
+								}else{
+									t.setHn(0.0);
+									t.setJql(0.0);
+								}
+							}
+							t.setCzcl(100.0);
+							t.setJzcl(100.0);
+							t.setNbbm(map.get("clZbh").toString());
+							t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
+							t.setZlc(map.get("totalKilometers") == null ? 0.0
+									: Double.parseDouble(map.get("totalKilometers").toString()));
+							t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+							t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+							t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
+							t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
+							t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+							t.setRq(sdf.parse(date));
+							t.setLp(map.get("lpName").toString());
+							t.setJql(Arith.add(t.getJql(), t.getSh()));
+							if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+								 if(type.equals("add")){
+									 t.setCreatetime(new Date());
+								 }else{
+									 t.setUpdatetime(new Date());
+								 }
+							 }
+							
+							if(t.getHn()<0){
+								t.setHn(0.0);
+							}
+							if(t.getJql()<0){
+								t.setJql(0.0);
+							}
+							updateQlb.add(t);
+						}
+					}
+				}
+			}
+			mapList.put("updList", updateQlb);
+		}catch(Exception e){
+			logger.error("save erro.", e);
+		}
+		return mapList;
+	}
+	
+	@Override
+	public Map<String, Object> update(Map<String, Object> map) {
+		if(map.get("id")!=null){
+			if(map.get("id").toString().length()>0){
+				Integer id=Integer.parseInt(map.get("id").toString());
+				String jsy=map.get("jsy").toString();
+				Qlb t=repository.findById(id);
+				t.setJsy(jsy);
+				repository.save(t);
+				map.put("status", ResponseCode.SUCCESS);
+			}
+		}
+		return map;
+	}
+	
+}
+
+class NbbmJcsxMap2 implements Comparator<Map<String, Object>>{
+	 @Override
+		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+			// TODO Auto-generated method stub
+			return  (o1.get("clZbh").toString()+o1.get("seqNumber").toString()).compareTo((o2.get("clZbh").toString()+o1.get("seqNumber").toString()));
+		}
+}
 package com.bsth.service.oil.impl;
+import java.io.File;
+import java.io.FileInputStream;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import javax.transaction.Transactional;
+import com.bsth.entity.oil.Jdl;
+import com.bsth.util.ReportUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
@@ -49,6 +55,10 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 	YlbRepository ylbRepository;
 	@Autowired
 	JdbcTemplate jdbcTemplate;
+
+	@Autowired
+	YlxxbRepository ylxxbRepository;
+
 	@Override
 	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
@@ -287,4 +297,139 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		}
 		return newMap;
 	}
+
+	@Override
+	public String importExcel(File file) {
+		String gsbm="100";
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		DecimalFormat df = new DecimalFormat("######0.00");
+		List<String> textList = new ArrayList<String>();
+		try {
+			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file));
+			HSSFWorkbook wb = new HSSFWorkbook(fs);
+			HSSFSheet sheet = wb.getSheetAt(0);
+			// 取得总行数
+			int rowNum = sheet.getLastRowNum() + 1;
+			// 取得总列数
+			int cellNum = sheet.getRow(0).getLastCellNum();
+			HSSFRow row = null;
+			HSSFCell cell = null;
+			for(int i = 2; i < rowNum; i++){
+				row = sheet.getRow(i);
+				if (row == null){
+					continue;
+				}
+				String text = "";
+				for(int j = 0; j < cellNum; j++){
+					cell = row.getCell(j);
+					if(cell == null){
+						text += ",";
+						continue;
+					}
+					text += String.valueOf(cell) + ",";
+				}
+				String[] split = (text+";").split(",");
+				String str = "";
+				for(int j = 0; j < split.length && j < 5; j++){
+					str += split[j];
+				}
+				if(str.trim().length() == 0){
+					continue;
+				}
+				textList.add(text + ";");
+			}
+			for(int i = 0; i < textList.size(); i++){
+				String text = textList.get(i);
+				System.out.println(text);
+				String[] split = text.split(",");
+				String rq = split[0].trim();//日期
+				String nbbm = split[1].trim();//内部编号
+				/*String jsy = split[2].trim();//驾驶员工号*/
+				String jsy ="";//
+				double jzl = Double.valueOf(split[2].trim().length()!=0?split[2]:"0");//加注量
+				String jyz = split[3].trim();//能源站
+				String plate = split[4].trim();//车牌号
+				String remarks = split[5].trim();//备注
+				String yh = split[6].trim();//油号
+				if(rq.trim().length() == 0){
+					rq = sdf.format(new Date());
+				}
+			/*	System.out.println(jsy);
+				if(jsy != null && jsy.length() > 0 && !(jsy.equals(jsy.replaceAll("\\p{P}", "")))){
+					return "加油：驾驶员工号错误，请检查是否导入错误excel";
+				}*/
+
+				List<Double> jzl_ = ylxxbRepository.import_queryBySame(gsbm, rq, nbbm);
+//
+				if(jzl_.size() == 0){
+					ylxxbRepository.import_insertData(gsbm, rq, nbbm, jsy,
+							df.format(jzl), jyz, remarks, sd.format(new Date()),plate,yh);
+				}else{
+					ylxxbRepository.import_UpdateJzl(df.format(jzl), jsy, jyz, remarks, gsbm, rq, nbbm,plate,yh);
+				}
+			}
+
+			wb.close();
+			fs.close();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return "文件导入失败";
+		} finally {
+			file.delete();
+		}
+		return "文件导入成功";
+	}
+
+	@Override
+	public Map<String, Object> query(Map<String, Object> map) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
+		StringBuffer sql=new StringBuffer("SELECT * FROM bsth_c_ylxxb where 1=1 ");
+		if(map.get("rq")!=null && !"".equals(map.get("rq").toString())){
+			sql.append("and yyrq>='"+map.get("rq")+"'");
+		}
+		if(map.get("nbbm")!=null && !"".equals(map.get("nbbm").toString())){
+			sql.append("and nbbm='"+map.get("nbbm")+"'");
+		}
+		List<Ylxxb> query = jdbcTemplate.query(sql.toString(), BeanPropertyRowMapper.newInstance(Ylxxb.class));
+
+		if(!map.containsKey("type")){
+
+			int end = (page+1)*10>query.size()?query.size():(page+1)*10;
+			modelMap.put("dataList", query.subList(page*10, end));
+			modelMap.put("totalPages", query.size()%10>0?query.size()/10+1:query.size()/10);
+
+		} else if(map.get("type").toString().equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+
+			List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+			for(Ylxxb jdl : query){
+				Map<String, Object> m = new HashMap<String, Object>();
+				m.put("rq", sdfMonth.format(jdl.getYyrq()));
+				m.put("nbbm", jdl.getNbbm());
+				m.put("jyl", jdl.getJzl());
+				m.put("jyz", jdl.getStationid());
+				m.put("remarks", jdl.getBz());
+				m.put("yh", jdl.getYh());
+				list.add(m);
+			}
+/*
+			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/export_Jdl.xls",
+						path+"export/车辆充电量" + sdfSimple.format(sdfMonth.parse(rq)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}*/
+		}
+		return modelMap;
+	}
 }
+package com.bsth.service.report;
+
+import java.util.Map;
+
+public interface XlybtbService {
+    Map<String, Object> query(Map<String, Object> map);
+}
+
+package com.bsth.service.report;
+
+import java.io.File;
+import java.util.Map;
+
+public interface XlybtzService {
+
+    String imporPWExcel(File file,String date);
+
+    String importQRCordExcel(File file,String date);
+
+    String importCardExcel(File file,String date,String type);
+
+    String importExcel(File file);
+
+    Map<String, Object> query(Map<String, Object> map);
+}
+
+package com.bsth.service.report.impl;
+
+
+
+import com.bsth.entity.LineInformation;
+import com.bsth.entity.realcontrol.Xlybtb;
+import com.bsth.entity.report.Ticket;
+import com.bsth.repository.LineInformationRepository;
+import com.bsth.repository.calc.CalcWaybillRepository;
+import com.bsth.repository.oil.JdlRepository;
+import com.bsth.repository.oil.JqlRepository;
+import com.bsth.repository.oil.YlxxbRepository;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.service.report.XlybtbService;
+import com.bsth.util.ReportUtils;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.text.Collator;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+@Service
+public class XlybtbServiceImpl implements XlybtbService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    LineInformationRepository lineInformationRepository;
+
+    @Autowired
+    JdlRepository jdlRepository;
+
+    @Autowired
+    JqlRepository jqlRepository;
+
+    @Autowired
+    YlxxbRepository ylxxbRepository;
+
+    @Autowired
+    CalcWaybillRepository calcWaybillRepository;
+
+    @Autowired
+    CarConfigInfoRepository carConfigInfoRepository;
+
+
+    private static DecimalFormat df = new DecimalFormat("#.00");
+    @Override
+    public Map<String, Object> query(Map<String, Object> map) {
+        Map<String, Object> modelMap = new HashMap<>();
+        String dateS = map.get("dateS").toString().trim();
+        String dateE = map.get("dateE").toString().trim();
+        String date=dateS.substring(0,7)+"~"+dateE.substring(0,7);
+        StringBuffer sql=new StringBuffer("SELECT sum(amount) amount,max(convoy) convoy,sum(count) count,line_code,max(line_id) line_id," +
+                "max(line_name) line_name FROM `ticket_info` where pay_type != '保通卡' ");
+        if(dateS!=null && !"".equals(dateS)){
+            sql.append("and date>='"+dateS+"'");
+        }
+        if(dateE!=null && !"".equals(dateE)){
+            sql.append("and date<='"+dateE+"'");
+        }
+        sql.append("GROUP BY line_code");
+        DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate ds=LocalDate.parse(dateS,dtf);
+        ds=ds.minusYears(1);
+        String dateSo=ds.format(dtf);
+        LocalDate de=LocalDate.parse(dateE,dtf);
+        de=de.minusYears(1);
+        String dateEo=de.format(dtf);
+        StringBuffer sql2=new StringBuffer("SELECT sum(amount) amount,max(convoy) convoy,sum(count) count,line_code,max(line_id) line_id," +
+                "max(line_name) line_name FROM `ticket_info` where pay_type != '保通卡' ");
+        if(dateS!=null && !"".equals(dateS)){
+            sql2.append("and date>='"+dateSo+"'");
+        }
+        if(dateE!=null && !"".equals(dateE)){
+            sql2.append("and date<='"+dateEo+"'");
+        }
+        sql2.append("GROUP BY line_code");
+        List<Ticket> query = jdbcTemplate.query(sql.toString(), BeanPropertyRowMapper.newInstance(Ticket.class));
+        List<Ticket> query2 = jdbcTemplate.query(sql2.toString(), BeanPropertyRowMapper.newInstance(Ticket.class));
+        //查询线路信息
+        List<LineInformation> lineList=lineInformationRepository.findAll();
+        Map<String,LineInformation> lines=new HashMap<>();
+        for (LineInformation line : lineList) {
+            lines.put(line.getLine().getLineCode(),line);
+        }
+
+        //查询1对多线路 用于后续合并线路数据
+        List<Map<String,Object>> lineCompare =jdbcTemplate.queryForList("SELECT line_code,line_code2,name_pw,convoy FROM `bsth_c_line_compare` where line_code is not null");
+        Map<String,String> compareMap=new HashMap<>();
+        for (Map<String, Object> m : lineCompare) {
+            if(m.get("line_code2")!=null){
+                compareMap.put(m.get("line_code2").toString(),m.get("line_code").toString());
+            }
+        }
+
+        //查询路单数据
+        List<Map<String,Object>> ldList =jdbcTemplate.queryForList(
+                "SELECT c.sfdc d,c.sfmix h,c.hydrogen q,b.xl lineCode,b.cl nbbm,b.jhyybc,b.sjyybc,b.jhyylc,b.sjyylc,b.sjfyylc,b.rq_str rq,b.j_gh jgh from calc_waybill b LEFT JOIN " +
+                        "bsth_c_cars c on c.inside_code=b.cl where b.rq_str>='"+dateS+"' and b.rq_str<='"+dateE+"'");
+        if(ldList.size()==0){
+            modelMap.put("code","500");
+            modelMap.put("msg","缺少路单统计数据");
+            return modelMap;
+        }
+
+        //线路里程、班次、车次计算
+        Map<String,Integer> bcMap=new HashMap<>();
+        Map<String,Double> lcMap=new HashMap<>();
+        Map<String,Integer> ccMap=new HashMap<>();
+        for (Map<String, Object> m : ldList) {
+            String lineCode= (String) m.get("lineCode");
+            if(compareMap.get(lineCode)!=null){
+                lineCode=compareMap.get(lineCode);
+            }
+            //各类型车实际里程
+            if(m.get("d")!=null&&(boolean)m.get("d")){//电车
+                Double lc=lcMap.get(lineCode+"_d")==null?0d:lcMap.get(lineCode+"_d");
+                lcMap.put(lineCode+"_d",lc+(double)m.get("sjyylc"));
+            }else if(m.get("h")!=null&&(boolean)m.get("h")){//混动
+                Double lc=lcMap.get(lineCode+"_h")==null?0d:lcMap.get(lineCode+"_h");
+                lcMap.put(lineCode+"_h",lc+(double)m.get("sjyylc"));
+            }else if(m.get("q")!=null&&(boolean)m.get("q")){//氢能
+                Double lc=lcMap.get(lineCode+"_q")==null?0d:lcMap.get(lineCode+"_q");
+                lcMap.put(lineCode+"_q",lc+(double)m.get("sjyylc"));
+            }else {//油车
+                Double lc=lcMap.get(lineCode+"_y")==null?0d:lcMap.get(lineCode+"_y");
+                lcMap.put(lineCode+"_y",lc+(double)m.get("sjyylc"));
+            }
+            //计划运营里程
+            double jhyylc=lcMap.get(lineCode+"_jhyylc")==null?0d:lcMap.get(lineCode+"_jhyylc");
+            lcMap.put(lineCode+"_jhyylc",jhyylc+(double)m.get("jhyylc"));
+            //实际运营里程
+            double sjyylc=lcMap.get(lineCode+"_sjyylc")==null?0d:lcMap.get(lineCode+"_sjyylc");
+            lcMap.put(lineCode+"_sjyylc",sjyylc+(double)m.get("sjyylc"));
+            //实际非运营里程
+            double sjfyylc=lcMap.get(lineCode+"_sjfyylc")==null?0d:lcMap.get(lineCode+"_sjfyylc");
+            lcMap.put(lineCode+"_sjfyylc",sjfyylc+(double)m.get("sjfyylc"));
+            //计划班次数
+            int jhyybc=bcMap.get(lineCode+"_jhyybc")==null?0:bcMap.get(lineCode+"_jhyybc");
+            bcMap.put(lineCode+"_jhyybc",jhyybc+(int)m.get("jhyybc"));
+            //实际班次数
+            int sjyybc=bcMap.get(lineCode+"_sjyybc")==null?0:bcMap.get(lineCode+"_sjyybc");
+            bcMap.put(lineCode+"_sjyybc",sjyybc+(int)m.get("sjyybc"));
+            //车次
+            int cc=ccMap.get(lineCode)==null?0:ccMap.get(lineCode);
+            ccMap.put(lineCode,cc+=1);
+        }
+
+        //查询历史路单数据
+        List<Map<String,Object>> ldOldList =jdbcTemplate.queryForList(
+                "SELECT xl,sum(sjyylc) sjyylc,sum(sjyybc) sjyybc,sum(sjfyylc) sjfyylc from calc_waybill " +
+                        "where rq_str>='"+dateSo+"' and rq_str<='"+dateEo+"' GROUP BY xl ");
+        Map<String,Map<String,Object>> ldOlds=new HashMap<>();
+        for (Map<String, Object> m : ldOldList) {
+            ldOlds.put(m.get("xl").toString(),m);
+        }
+
+        //查询票务数据
+        if(query.size()==0){
+            modelMap.put("code","500");
+            modelMap.put("msg","缺少票务数据");
+            return modelMap;
+        }
+        //历史票务数据
+        Map<String,Ticket> ticketMap=new HashMap<>();
+        for (Ticket ticket : query2) {
+            ticketMap.put(ticket.getLineCode(),ticket);
+        }
+
+        Map<String,Ticket> ticketsMap = new HashMap<>();
+        Map<String,List<Ticket>> ticketGroup= query.stream().collect(Collectors.groupingBy(Ticket::getLineCode));
+        for (Ticket ticket : query) {
+            ticketsMap.put(ticket.getLineCode(),ticket);
+        }
+        ListMultimap<String, Xlybtb> list = ArrayListMultimap.create();
+
+        for (Map<String, Object> m : lineCompare) {
+            String lineCode=m.get("line_code").toString();
+            String lineName=m.get("name_pw").toString();
+            String convoy=m.get("convoy").toString();
+            Ticket ticket = ticketsMap.get(lineCode);
+            Map<String,Object> old=ldOlds.get(lineCode);
+            Ticket ticketOld=ticketMap.get(lineCode);
+            Xlybtb xlybtb=new Xlybtb();
+            xlybtb.setXl(lineName);//路线
+            xlybtb.setXlcd((lines.get(lineCode).getUpMileage()+lines.get(lineCode).getDownMileage())/2);//线路长度
+            xlybtb.setRcjh(0);//人次计划
+            int rcsj=ticket==null?0:ticket.getCount();
+            xlybtb.setRcsj(rcsj);//人次实际
+            int rctq=ticketOld==null?0:ticketOld.getCount();
+            xlybtb.setRctq(rctq);//人次同期
+            xlybtb.setRctb(rctq==0?null:Double.parseDouble(df.format((0-((double)(rctq-rcsj)/rctq))*100)));//人次同比
+            xlybtb.setRcjhwc(null);//人次计划完成
+
+            xlybtb.setYsjh(0);//营收计划
+            double yssj=ticket==null?0:ticket.getAmount();
+            xlybtb.setYssj(yssj);//营收实际
+            double ystq=ticketOld==null?0:ticketOld.getAmount();
+            xlybtb.setYstq(ystq);//营收同期
+            xlybtb.setYstb(ystq==0?null:Double.parseDouble(df.format((0-((double)(ystq-yssj)/ystq))*100)));//营收同比
+            double sjyylc=lcMap.get(lineCode+"_sjyylc")==null?0:lcMap.get(lineCode+"_sjyylc");
+            xlybtb.setLcsj(sjyylc);//实际实际
+            xlybtb.setYsybgl(sjyylc==0?null:Double.parseDouble(df.format(yssj/sjyylc*100)));//营收 元/百公里
+            xlybtb.setYsjhwc(null);//营收计划完成
+
+            double jhyylc=lcMap.get(lineCode+"_jhyylc")==null?0:lcMap.get(lineCode+"_jhyylc");
+            double sjyylcOld=(old==null||old.get("sjyylc")==null)?0:(double)old.get("sjyylc");
+            xlybtb.setLcjh(Double.parseDouble(df.format(jhyylc)));//里程计划
+            double hy=lcMap.get(lineCode+"_h")==null?0:lcMap.get(lineCode+"_h");//混动
+            double yy=lcMap.get(lineCode+"_y")==null?0:lcMap.get(lineCode+"_y");//油车
+            xlybtb.setLccy(Double.parseDouble(df.format(hy+yy))); //里程柴油
+            double d=lcMap.get(lineCode+"_d")==null?0:lcMap.get(lineCode+"_d");
+            xlybtb.setLccd(Double.parseDouble(df.format(d)));//里程纯电
+            double q=lcMap.get(lineCode+"_q")==null?0:lcMap.get(lineCode+"_q");
+            xlybtb.setLcqrl(Double.parseDouble(df.format(q)));//里程氢燃料
+            xlybtb.setLctq(Double.parseDouble(df.format(sjyylcOld)));//里程去年同期
+            xlybtb.setLctb(sjyylcOld==0?null:Double.parseDouble(df.format((0-((sjyylcOld-sjyylc)/sjyylcOld))*100)));//里程同比
+            xlybtb.setLcjhwc(jhyylc==0?null:Double.parseDouble(df.format(sjyylc/jhyylc*100)));//里程计划完成
+
+            int sjyybc=bcMap.get(lineCode+"_sjyybc")==null?0:bcMap.get(lineCode+"_sjyybc");
+            int jhyybc=bcMap.get(lineCode+"_jhyybc")==null?0:bcMap.get(lineCode+"_jhyybc");
+            int sjyybcOld=(old==null||old.get("sjyybc")==null)?0:Integer.parseInt(old.get("sjyybc").toString());
+            xlybtb.setBcjh(jhyybc);//班次计划
+            xlybtb.setBcsj(sjyybc);//班次实际
+            xlybtb.setBctq(sjyybcOld);//班次同期
+            xlybtb.setBctb(sjyybcOld==0?null:Double.parseDouble(df.format(0-((double)(sjyybcOld-sjyybc)/sjyybcOld)*100)));//班次同比
+            xlybtb.setBcjhwc(jhyybc==0?null:Double.parseDouble(df.format((double)sjyybc/jhyybc*100)));//班次计划完成
+            double sjfyylc=lcMap.get(lineCode+"_sjfyylc")==null?0:lcMap.get(lineCode+"_sjfyylc");
+            double sjfyylcOld=(old==null||old.get("sjfyylc")==null)?0:(double)old.get("sjfyylc");
+            xlybtb.setKssj(Double.parseDouble(df.format(sjfyylc)));//空驶实际
+            xlybtb.setKstq(Double.parseDouble(df.format(sjfyylcOld)));//空驶同期
+            xlybtb.setKstb(sjfyylcOld==0?null:Double.parseDouble(df.format((0-((sjfyylcOld-sjfyylc)/sjfyylcOld))*100)));//空驶同比
+            list.put(convoy,xlybtb);
+        }
+
+        Set<String> keys=list.keySet();
+        List<String>keyList=keys.stream().sorted(Collator.getInstance(Locale.TRADITIONAL_CHINESE)).collect(Collectors.toList());//车队名排序
+        List<Xlybtb> xlybtbList=new ArrayList<>();//含合计数据集
+        List<Xlybtb> xlybtbListAll=new ArrayList<>();//不含合计数据集
+        for (String s : keyList) {
+            List<Xlybtb> xlybtbs=list.get(s);//车队
+            xlybtbList.addAll(list.get(s));
+            xlybtbList.add(Xlybtb.getTotal(xlybtbs,s));//车队合计
+            xlybtbListAll.addAll(list.get(s));
+        }
+        xlybtbList.add(Xlybtb.getTotal(xlybtbListAll,"公司合计:"));//公司合计
+        if(!map.containsKey("type")){
+            Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
+            int end = (page+1)*10>xlybtbList.size()?xlybtbList.size():(page+1)*10;
+            modelMap.put("dataList", xlybtbList.subList(page*10, end));
+            modelMap.put("totalPages", xlybtbList.size()%10>0?xlybtbList.size()/10+1:xlybtbList.size()/10);
+        } else if(map.get("type").toString().equals("export")){
+            List<Iterator<?>> listI = new ArrayList<>();
+            Map<String, Object> m = new HashMap<>();
+            m.put("date",date);
+            ReportUtils ee = new ReportUtils();
+            try {
+                listI.add(xlybtbList.iterator());
+                String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+                ee.excelReplace(listI, new Object[] { m }, path+"mould/路线生产月报同比表.xls",
+                        path+"export/路线生产月报同比表.xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            }
+        }
+        modelMap.put("code","00");
+        return modelMap;
+    }
+
+}
+package com.bsth.service.report.impl;
+
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.Cars;
+import com.bsth.entity.LineInformation;
+import com.bsth.entity.report.*;
+import com.bsth.entity.oil.Jdl;
+import com.bsth.entity.oil.Jql;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.entity.realcontrol.Xlybtz;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.repository.CarsRepository;
+import com.bsth.repository.LineInformationRepository;
+import com.bsth.repository.calc.CalcWaybillRepository;
+import com.bsth.repository.oil.JdlRepository;
+import com.bsth.repository.oil.JqlRepository;
+import com.bsth.repository.oil.YlxxbRepository;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.service.report.XlybtzService;
+import com.bsth.service.schedule.utils.PoiUtils;
+import com.bsth.util.ReportUtils;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionException;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+import java.io.File;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.text.Collator;
+import java.text.DecimalFormat;
+import java.time.YearMonth;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+
+@Service
+public class XlybtzServiceImpl implements XlybtzService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Autowired
+    LineInformationRepository lineInformationRepository;
+
+    @Autowired
+    JdlRepository jdlRepository;
+
+    @Autowired
+    JqlRepository jqlRepository;
+
+    @Autowired
+    YlxxbRepository ylxxbRepository;
+
+    @Autowired
+    CalcWaybillRepository calcWaybillRepository;
+
+    @Autowired
+    CarConfigInfoRepository carConfigInfoRepository;
+
+    @Autowired
+    CarsRepository carsRepository;
+
+
+    public String imporPWExcel(File file,String date) {
+        List<PWExcel> list = PoiUtils.importFromExcel2(file, 4, PWExcel.columns, PWExcel.class);
+        List<PWExcel> pwList = new ArrayList<>();
+        for (PWExcel pw : list) {
+            if(pw.getXl()!=null && !"小计".equals(pw.getXl()) && !"合计".equals(pw.getXl())){
+                pwList.add(pw);
+            }
+        }
+        List<Ticket> ticketList = new ArrayList<>();
+        for (int i = 0; i < pwList.size(); i++) {
+            PWExcel pw = pwList.get(i);
+            LineCompare lineCompare=BasicData.namePWOut2LineCodeMap.get(pw.getXl());
+            if(lineCompare==null){
+                return pw.getXl()+"未找到对应线路编码,请确认数据！";
+            }
+            if(lineCompare.getLineCode()==null){
+                continue;
+            }
+            Ticket ticket=new Ticket();
+            ticket.setDate(date);
+            ticket.setConvoy(lineCompare.getConvoy());
+            ticket.setLineName(BasicData.lineCode2NameMap.get(lineCompare.getLineCode()));
+            ticket.setLineCode(lineCompare.getLineCode());
+            ticket.setLineId(BasicData.lineId2CodeMap.inverse().get(lineCompare.getLineCode()));
+            ticket.setCount(pw.getDtrc());
+            ticket.setAmount(pw.getDtje());
+            ticket.setPayType("票务");
+            ticketList.add(ticket);
+        }
+        try {
+            transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                @Override
+                public void doInTransactionWithoutResult(TransactionStatus status) {
+                    String date="";
+                    for (Ticket ticket : ticketList) {
+                        if(!date.contains(ticket.getDate())){
+                            date+=("'"+ ticket.getDate()+"',");
+                        }
+                    }
+                    //删除
+                    jdbcTemplate.update("delete from ticket_info where pay_type='票务' and date in ("+date.substring(0,date.length()-1)+")");
+                    //重新写入
+                    jdbcTemplate.batchUpdate("insert into ticket_info(date,convoy,line_name,count,amount,pay_type,line_code,line_id)" +
+                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            Ticket ticket = ticketList.get(i);
+                            ps.setString(1, ticket.getDate());
+                            ps.setString(2, ticket.getConvoy());
+                            ps.setString(3, ticket.getLineName());
+                            ps.setInt(4, ticket.getCount());
+                            ps.setDouble(5, ticket.getAmount());
+                            ps.setString(6, ticket.getPayType());
+                            ps.setString(7, ticket.getLineCode());
+                            ps.setInt(8, ticket.getLineId());
+                        }
+                        @Override
+                        public int getBatchSize() {
+                            return ticketList.size();
+                        }
+                    });
+                }
+            });
+        } catch (TransactionException e) {
+            e.printStackTrace();
+            return "文件导入失败";
+        }finally {
+            file.delete();
+        }
+        return "文件导入成功";
+    }
+
+    public String importQRCordExcel(File file,String date) {
+        List<QRCodeExcel> list = PoiUtils.importFromExcel2(file, 6, QRCodeExcel.columns, QRCodeExcel.class);
+        List<QRCodeExcel> qrList = new ArrayList<>();
+        for (QRCodeExcel qrCode : list) {
+            if(qrCode.getJylx()!=null && "小计".equals(qrCode.getJylx().trim())){
+                qrList.add(qrCode);
+            }
+        }
+        List<Ticket> ticketList = new ArrayList<>();
+        for (int i = 0; i < qrList.size(); i++) {
+            QRCodeExcel qrCode = qrList.get(i);
+            LineCompare lineCompare=BasicData.lineCodeOut2LineCodeMap.get(qrCode.getXl());
+            if(lineCompare==null){
+                return qrCode.getXl()+"未找到对应线路编码,请确认数据！";
+            }
+            Ticket ticket=new Ticket();
+            ticket.setDate(date);
+            ticket.setConvoy(lineCompare.getConvoy());
+            ticket.setLineName(BasicData.lineCode2NameMap.get(lineCompare.getLineCode()));
+            ticket.setLineCode(lineCompare.getLineCode());
+            ticket.setLineId(BasicData.lineId2CodeMap.inverse().get(lineCompare.getLineCode()));
+            ticket.setCount(qrCode.getSjbs());
+            ticket.setAmount(qrCode.getSjje());
+            ticket.setPayType("二维码");
+            ticketList.add(ticket);
+        }
+        try {
+            transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                @Override
+                public void doInTransactionWithoutResult(TransactionStatus status) {
+                    String date="";
+                    for (Ticket ticket : ticketList) {
+                        if(!date.contains(ticket.getDate())){
+                            date+=("'"+ ticket.getDate()+"',");
+                        }
+                    }
+                    //删除
+                    jdbcTemplate.update("delete from ticket_info where pay_type='二维码' and date in ("+date.substring(0,date.length()-1)+")");
+                    //重新写入
+                    jdbcTemplate.batchUpdate("insert into ticket_info(date,convoy,line_name,count,amount,pay_type,line_code,line_id)" +
+                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            Ticket ticket = ticketList.get(i);
+                            ps.setString(1, ticket.getDate());
+                            ps.setString(2, ticket.getConvoy());
+                            ps.setString(3, ticket.getLineName());
+                            ps.setInt(4, ticket.getCount());
+                            ps.setDouble(5, ticket.getAmount());
+                            ps.setString(6, ticket.getPayType());
+                            ps.setString(7, ticket.getLineCode());
+                            ps.setInt(8, ticket.getLineId());
+                        }
+                        @Override
+                        public int getBatchSize() {
+                            return ticketList.size();
+                        }
+                    });
+                }
+            });
+        } catch (TransactionException e) {
+            e.printStackTrace();
+            return "文件导入失败";
+        }finally {
+            file.delete();
+        }
+        return "文件导入成功";
+    }
+
+    public String importCardExcel(File file,String date,String type) {
+        List< CardExcel > list = PoiUtils.importFromExcel2(file, 6, CardExcel.columns, CardExcel.class);
+        List<CardExcel> cardList = new ArrayList<>();
+        for (CardExcel card : list) {
+            if(card.getJylx()!=null && "小计".equals(card.getJylx().trim())){
+                cardList.add(card);
+            }
+        }
+        List<Ticket> ticketList = new ArrayList<>();
+        for (int i = 0; i < cardList.size(); i++) {
+            CardExcel card = cardList.get(i);
+            LineCompare lineCompare=BasicData.lineCodeOut2LineCodeMap.get(card.getXl());
+            if(lineCompare==null){
+                return card.getXl()+"未找到对应线路编码,请确认数据！";
+            }
+            Ticket ticket=new Ticket();
+            ticket.setDate(date);
+            ticket.setConvoy(lineCompare.getConvoy());
+            ticket.setLineName(BasicData.lineCode2NameMap.get(lineCompare.getLineCode()));
+            ticket.setLineCode(lineCompare.getLineCode());
+            ticket.setLineId(BasicData.lineId2CodeMap.inverse().get(lineCompare.getLineCode()));
+            ticket.setCount(card.getSjbs());
+            ticket.setAmount(card.getSjje());
+            ticket.setPayType(type);
+            ticketList.add(ticket);
+        }
+        try {
+            transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                @Override
+                public void doInTransactionWithoutResult(TransactionStatus status) {
+                    String date="";
+                    for (Ticket ticket : ticketList) {
+                        if(!date.contains(ticket.getDate())){
+                            date+=("'"+ ticket.getDate()+"',");
+                        }
+                    }
+                    //删除
+                    jdbcTemplate.update("delete from ticket_info where pay_type='"+type+"' and date in ("+date.substring(0,date.length()-1)+")");
+                    //重新写入
+                    jdbcTemplate.batchUpdate("insert into ticket_info(date,convoy,line_name,count,amount,pay_type,line_code,line_id)" +
+                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            Ticket ticket = ticketList.get(i);
+                            ps.setString(1, ticket.getDate());
+                            ps.setString(2, ticket.getConvoy());
+                            ps.setString(3, ticket.getLineName());
+                            ps.setInt(4, ticket.getCount());
+                            ps.setDouble(5, ticket.getAmount());
+                            ps.setString(6, ticket.getPayType());
+                            ps.setString(7, ticket.getLineCode());
+                            ps.setInt(8, ticket.getLineId());
+                        }
+                        @Override
+                        public int getBatchSize() {
+                            return ticketList.size();
+                        }
+                    });
+                }
+            });
+        } catch (TransactionException e) {
+            e.printStackTrace();
+            return "文件导入失败";
+        }finally {
+            file.delete();
+        }
+        return "文件导入成功";
+    }
+
+    public String importExcel(File file) {
+        String[] columns = new String[]{"date","convoy","lineName","count","amount","payType"};
+        final List<Ticket> ticketList = PoiUtils.importFromExcel(file, 1, columns, Ticket.class);
+        for (int i = 0; i < ticketList.size(); i++) {
+            Ticket ticket = ticketList.get(i);
+            String lineCode=BasicData.Name2LineCodeMap.get(ticket.getLineName());
+            if(lineCode==null){
+                return "第"+(i+2)+"行数据有误,请确认数据！";
+            }
+            ticket.setLineCode(lineCode);
+            ticket.setLineId(BasicData.lineId2CodeMap.inverse().get(lineCode));
+        }
+        try {
+            transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                @Override
+                public void doInTransactionWithoutResult(TransactionStatus status) {
+                    String date="";
+                    for (Ticket ticket : ticketList) {
+                        if(!date.contains(ticket.getDate())){
+                            date+=("'"+ ticket.getDate()+"',");
+                        }
+                    }
+                    //删除
+                    jdbcTemplate.update("delete from ticket_info where date in ("+date.substring(0,date.length()-1)+")");
+                    //重新写入
+                    jdbcTemplate.batchUpdate("insert into ticket_info(date,convoy,line_name,count,amount,pay_type,line_code,line_id)" +
+                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            Ticket ticket = ticketList.get(i);
+                            ps.setString(1, ticket.getDate());
+                            ps.setString(2, ticket.getConvoy());
+                            ps.setString(3, ticket.getLineName());
+                            ps.setInt(4, ticket.getCount());
+                            ps.setDouble(5, ticket.getAmount());
+                            ps.setString(6, ticket.getPayType());
+                            ps.setString(7, ticket.getLineCode());
+                            ps.setInt(8, ticket.getLineId());
+                        }
+                        @Override
+                        public int getBatchSize() {
+                            return ticketList.size();
+                        }
+                    });
+                }
+            });
+        } catch (TransactionException e) {
+            e.printStackTrace();
+            return "文件导入失败";
+        }finally {
+            file.delete();
+        }
+        return "文件导入成功";
+    }
+    private static DecimalFormat df = new DecimalFormat("#.00");
+    @Override
+    public Map<String, Object> query(Map<String, Object> map) {
+        Map<String, Object> modelMap = new HashMap<>();
+        String dateS = map.get("dateS").toString().trim();
+        String dateE = map.get("dateE").toString().trim();
+
+        int dayCount = getDayCount(dateS,dateE);
+
+
+        String date=dateS.substring(0,7)+"~"+dateE.substring(0,7);
+        StringBuffer sql=new StringBuffer("SELECT * FROM ticket_info where 1=1 ");
+        if(dateS!=null && !"".equals(dateS)){
+            sql.append("and date>='"+dateS+"'");
+        }
+        if(dateE!=null && !"".equals(dateE)){
+            sql.append("and date<='"+dateE+"'");
+        }
+        List<Ticket> query = jdbcTemplate.query(sql.toString(), BeanPropertyRowMapper.newInstance(Ticket.class));
+        Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
+        if(!map.containsKey("type")){
+            int end = (page+1)*10>query.size()?query.size():(page+1)*10;
+            modelMap.put("dataList", query.subList(page*10, end));
+            modelMap.put("totalPages", query.size()%10>0?query.size()/10+1:query.size()/10);
+        } else if(map.get("type").toString().equals("export")){
+            //查询线路信息
+            List<LineInformation> lineList=lineInformationRepository.findAll();
+            Map<String,LineInformation> lines=new HashMap<>();
+            for (LineInformation line : lineList) {
+                lines.put(line.getLine().getLineCode(),line);
+            }
+            //查询车辆数
+            List<Map<String,Object>> carCountList =jdbcTemplate.queryForList("SELECT xl,count(*) c FROM `bsth_c_s_ccinfo` where is_cancel=0 GROUP BY xl");
+            Map<String,Integer> carCounts=new HashMap<>();
+            for (Map<String, Object> stringObjectMap : carCountList) {
+                carCounts.put(stringObjectMap.get("xl").toString(),Integer.valueOf(stringObjectMap.get("c").toString()));
+            }
+            //查询1对多线路 用于后续合并线路数据
+            List<Map<String,Object>> lineCompare =jdbcTemplate.queryForList("SELECT line_code,line_code2,name_pw,convoy FROM `bsth_c_line_compare` where line_code is not null");
+            Map<String,String> compareMap=new HashMap<>();
+            for (Map<String, Object> m : lineCompare) {
+                if(m.get("line_code2")!=null){
+                    compareMap.put(m.get("line_code2").toString(),m.get("line_code").toString());
+                }
+            }
+
+            //查询路单数据
+            List<Map<String,Object>> ldList =jdbcTemplate.queryForList(
+                    "SELECT c.sfdc d,c.sfmix h,c.hydrogen q,b.xl lineCode,b.cl nbbm,b.jhyybc,b.sjyybc,b.jhyylc,b.sjyylc,b.sjfyylc,b.rq_str rq,b.j_gh jgh from calc_waybill b LEFT JOIN " +
+                            "bsth_c_cars c on c.inside_code=b.cl where b.rq_str>='"+dateS+"' and b.rq_str<='"+dateE+"'");
+            if(ldList.size()==0){
+                modelMap.put("code","500");
+                modelMap.put("msg","缺少路单统计数据");
+                return modelMap;
+            }
+            //查询车辆配置
+            List<CarConfigInfo> carConfigInfoList = carConfigInfoRepository.findAll();
+            List<Cars> carList=carsRepository.findCars();
+            Map<String,Map<String,Object>> ccinfos=new HashMap<>();
+            for (Cars cars : carList) {
+                Map<String,Object> ccinfo=new HashMap<>();
+                ccinfo.put("d",cars.getSfdc());
+                ccinfo.put("h",cars.getSfmix());
+                ccinfo.put("q",cars.getHydrogen());
+                ccinfos.put(cars.getInsideCode().replace("-",""),ccinfo);
+            }
+            for (CarConfigInfo carConfigInfo : carConfigInfoList) {
+                Map<String,Object> ccinfo=new HashMap<>();
+                ccinfo.put("lineCode",carConfigInfo.getXl().getLineCode());
+                ccinfo.put("d",carConfigInfo.getCl().getSfdc());
+                ccinfo.put("h",carConfigInfo.getCl().getSfmix());
+                ccinfo.put("q",carConfigInfo.getCl().getHydrogen());
+                ccinfos.put(carConfigInfo.getCl().getInsideCode().replace("-",""),ccinfo);
+            }
+            //线路里程、班次、车次计算
+            Map<String,Integer> bcMap=new HashMap<>();
+            Map<String,Double> lcMap=new HashMap<>();
+            Map<String,Integer> ccMap=new HashMap<>();
+            Map<String,Map<String,Double>> clxllcMap=new HashMap<>();
+            for (Map<String, Object> m : ldList) {
+                String lineCode= (String) m.get("lineCode");
+                if(compareMap.get(lineCode)!=null){
+                    lineCode=compareMap.get(lineCode);
+                }
+                //各类型车实际里程
+                if(m.get("d")!=null&&(boolean)m.get("d")){//电车
+                    Double lc=lcMap.get(lineCode+"_d")==null?0d:lcMap.get(lineCode+"_d");
+                    lcMap.put(lineCode+"_d",lc+(double)m.get("sjyylc"));
+                }else if(m.get("h")!=null&&(boolean)m.get("h")){//混动
+                    Double lc=lcMap.get(lineCode+"_h")==null?0d:lcMap.get(lineCode+"_h");
+                    lcMap.put(lineCode+"_h",lc+(double)m.get("sjyylc"));
+                }else if(m.get("q")!=null&&(boolean)m.get("q")){//氢能
+                    Double lc=lcMap.get(lineCode+"_q")==null?0d:lcMap.get(lineCode+"_q");
+                    lcMap.put(lineCode+"_q",lc+(double)m.get("sjyylc"));
+                }else {//油车
+                    Double lc=lcMap.get(lineCode+"_y")==null?0d:lcMap.get(lineCode+"_y");
+                    lcMap.put(lineCode+"_y",lc+(double)m.get("sjyylc"));
+                }
+                //计划运营里程
+                double jhyylc=lcMap.get(lineCode+"_jhyylc")==null?0d:lcMap.get(lineCode+"_jhyylc");
+                lcMap.put(lineCode+"_jhyylc",jhyylc+(double)m.get("jhyylc"));
+                //实际运营里程
+                double sjyylc=lcMap.get(lineCode+"_sjyylc")==null?0d:lcMap.get(lineCode+"_sjyylc");
+                lcMap.put(lineCode+"_sjyylc",sjyylc+(double)m.get("sjyylc"));
+                //实际非运营里程
+                double sjfyylc=lcMap.get(lineCode+"_sjfyylc")==null?0d:lcMap.get(lineCode+"_sjfyylc");
+                lcMap.put(lineCode+"_sjfyylc",sjfyylc+(double)m.get("sjfyylc"));
+                //计划班次数
+                int jhyybc=bcMap.get(lineCode+"_jhyybc")==null?0:bcMap.get(lineCode+"_jhyybc");
+                bcMap.put(lineCode+"_jhyybc",jhyybc+(int)m.get("jhyybc"));
+                //实际班次数
+                int sjyybc=bcMap.get(lineCode+"_sjyybc")==null?0:bcMap.get(lineCode+"_sjyybc");
+                bcMap.put(lineCode+"_sjyybc",sjyybc+(int)m.get("sjyybc"));
+                //车次
+                int cc=ccMap.get(lineCode)==null?0:ccMap.get(lineCode);
+                ccMap.put(lineCode,cc+=1);
+                String nbbm= m.get("nbbm").toString().replace("-","");
+                Map<String,Double> lclcMap=clxllcMap.get(nbbm);
+                if(lclcMap==null){
+                    Map<String,Double> lclcMap2=new HashMap<>();
+                    lclcMap2.put(lineCode,(double)m.get("sjyylc"));
+                    lclcMap2.put("sum",(double)m.get("sjyylc"));
+                    clxllcMap.put(nbbm,lclcMap2);
+                }else {
+                    Double lcxlcl=lclcMap.get(lineCode)==null?0d:lclcMap.get(lineCode);
+                    lclcMap.put(lineCode,lcxlcl+(double)m.get("sjyylc"));
+                    Double lcxlclSum=lclcMap.get("sum")==null?0d:lclcMap.get("sum");
+                    lclcMap.put("sum",lcxlclSum+(double)m.get("sjyylc"));
+                }
+            }
+
+            Map<String,Map<String,Object>> clMap=new HashMap<>();
+            for (Map<String, Object> m : ldList) {
+                clMap.put(m.get("rq")+"_"+m.get("nbbm").toString().replace("-","")/*+"_"+m.get("jgh")*/,m);
+            }
+            //线路燃料计算
+            Map<String,Double> rlMap=new HashMap<>();
+            dateS+=" 00:00:00";
+            dateE+=" 23:59:59";
+            //计算加油数据(包含油车和混动)
+            List<Ylxxb> jyList = ylxxbRepository.ylxxbList(dateS,dateE);
+            for (Ylxxb y : jyList) {
+                Map<String,Object> m=clMap.get(y.getRqStr()+"_"+y.getNbbm().replace("-","")/*+"_"+y.getJsy()*/);
+                if(m==null){//找不到路单以车辆配置表为准
+                    m=ccinfos.get(y.getNbbm().replace("-",""));
+                    logger.info("未查询到路单:"+y.getRqStr()+"_"+y.getNbbm()+" 使用默认配置线路:"+m.get("lineCode"));
+                }
+                String lineCode= (String) m.get("lineCode");
+                if(compareMap.get(lineCode)!=null){
+                    lineCode=compareMap.get(lineCode);
+                }
+                if(m.get("h")!=null&&(boolean)m.get("h")){//混动
+                    Double jyl=rlMap.get(lineCode+"_h_y")==null?0d:rlMap.get(lineCode+"_h_y");
+                    rlMap.put(lineCode+"_h_y",jyl+y.getJzl());//线路混动车加油量
+                    Double jylSum=rlMap.get(lineCode+"_y")==null?0d:rlMap.get(lineCode+"_y");
+                    rlMap.put(lineCode+"_y",jylSum+y.getJzl());//线路加油量
+                }else if((m.get("h")==null||!(boolean)m.get("h")) && (m.get("d")==null||!(boolean)m.get("d")) &&
+                        (m.get("q")==null||!(boolean)m.get("q"))) {//油车
+                    Double jyl=rlMap.get(lineCode+"_y_y")==null?0d:rlMap.get(lineCode+"_y_y");
+                    rlMap.put(lineCode+"_y_y",jyl+y.getJzl());//线路油车加油量
+                    Double jylSum=rlMap.get(lineCode+"_y")==null?0d:rlMap.get(lineCode+"_y");
+                    rlMap.put(lineCode+"_y",jylSum+y.getJzl());//线路加油量
+                }
+            }
+
+            //计算充电数据(包含电车和氢能)
+            List<Jdl> jdList = jdlRepository.JdlList(dateS,dateE);
+            for (Jdl d : jdList) {
+                Map<String,Double> lclcMap=clxllcMap.get(d.getNbbm().replace("-",""));
+                Map<String,Object> m=ccinfos.get(d.getNbbm().replace("-",""));
+                double cljdlSum=d.getJdl();
+                if(lclcMap==null){//找不到路单以车辆配置表为准
+                    logger.info("未查询到路单:"+d.getNbbm());
+                    if(m==null){
+                        logger.info("车辆不存在:"+d.getNbbm());
+                        modelMap.put("code","500");
+                        modelMap.put("msg","车辆不存在:"+d.getNbbm());
+                        return modelMap;
+
+                    }
+                    else if(m.get("lineCode")==null){
+                        logger.info("车辆线路未配置:"+d.getNbbm());
+                        modelMap.put("code","500");
+                        modelMap.put("msg","车辆未配置:"+d.getNbbm());
+                        return modelMap;
+                    }
+                    String lineCode=m.get("lineCode").toString();
+                    if(compareMap.get(lineCode)!=null){
+                        lineCode=compareMap.get(lineCode);
+                    }
+                    if((boolean)m.get("d")){//电车
+                        Double jdl=rlMap.get(lineCode+"_d_d")==null?0d:rlMap.get(lineCode+"_d_d");
+                        rlMap.put(lineCode+"_d_d",jdl+cljdlSum);//线路电车加电量
+                        Double jdlSum=rlMap.get(lineCode+"_d")==null?0d:rlMap.get(lineCode+"_d");
+                        rlMap.put(lineCode+"_d",jdlSum+cljdlSum);//线路加电量
+                    }else if((boolean)m.get("q")){//氢能车
+                        Double jdl=rlMap.get(lineCode+"_q_d")==null?0d:rlMap.get(lineCode+"_q_d");
+                        rlMap.put(lineCode+"_q_d",jdl+cljdlSum);//线路氢能车加电量
+                        Double jdlSum=rlMap.get(lineCode+"_d")==null?0d:rlMap.get(lineCode+"_d");
+                        rlMap.put(lineCode+"_d",jdlSum+cljdlSum);//线路加电量
+                    }
+                }else{
+                    double sum=lclcMap.get("sum");
+                    Set<String>keys=lclcMap.keySet();
+                    for (String lineCode : keys) {
+                        if(compareMap.get(lineCode)!=null){
+                            lineCode=compareMap.get(lineCode);
+                        }
+                        double lc=lclcMap.get(lineCode);
+                        if(!lineCode.equals("sum")){
+                            double sjjdl=cljdlSum;
+                            if(sum!=0){
+                                sjjdl=cljdlSum*lc/sum;
+                            }
+                            if((boolean)m.get("d")){//电车
+                                Double jdl=rlMap.get(lineCode+"_d_d")==null?0d:rlMap.get(lineCode+"_d_d");
+                                rlMap.put(lineCode+"_d_d",jdl+sjjdl);//线路电车加电量
+                                Double jdlSum=rlMap.get(lineCode+"_d")==null?0d:rlMap.get(lineCode+"_d");
+                                rlMap.put(lineCode+"_d",jdlSum+sjjdl);//线路加电量
+                            }else if((boolean)m.get("q")){//氢能车
+                                Double jdl=rlMap.get(lineCode+"_q_d")==null?0d:rlMap.get(lineCode+"_q_d");
+                                rlMap.put(lineCode+"_q_d",jdl+sjjdl);//线路氢能车加电量
+                                Double jdlSum=rlMap.get(lineCode+"_d")==null?0d:rlMap.get(lineCode+"_d");
+                                rlMap.put(lineCode+"_d",jdlSum+sjjdl);//线路加电量
+                            }
+                        }
+                    }
+                }
+            }
+            //查询加氢数据
+            List<Jql> jqList = jqlRepository.JqlList(dateS,dateE);
+            for (Jql q : jqList) {
+                Map<String,Object> m=clMap.get(q.getRqStr()+"_"+q.getNbbm().toString().replace("-","")/*+"_"+q.getJsy()*/);
+                if(m==null){//找不到路单以车辆配置表为准
+                    m=ccinfos.get(q.getNbbm());
+                    logger.info("未查询到路单:"+q.getRqStr()+"_"+q.getNbbm()+" 使用默认配置线路:"+m.get("lineCode"));
+                }
+                String lineCode= (String) m.get("lineCode");
+                if(compareMap.get(lineCode)!=null){
+                    lineCode=compareMap.get(lineCode);
+                }
+                if((boolean)m.get("q")){//氢能车
+                    Double jql=rlMap.get(lineCode+"_q_q")==null?0d:rlMap.get(lineCode+"_q_q");
+                    rlMap.put(lineCode+"_q_q",jql+q.getJql());//线路氢能车加氢量
+                    Double jdlSum=rlMap.get(lineCode+"_q")==null?0d:rlMap.get(lineCode+"_q");
+                    rlMap.put(lineCode+"_q",jdlSum+q.getJql());//线路加氢量
+                }
+            }
+            //查询票务数据
+            if(query.size()==0){
+                modelMap.put("code","500");
+                modelMap.put("msg","缺少票务数据");
+                return modelMap;
+            }
+
+            ListMultimap<String, Xlybtz> list = ArrayListMultimap.create();
+            Map<String,List<Ticket>> ticketGroup= query.stream().collect(Collectors.groupingBy(Ticket::getLineCode));
+            for (Map<String, Object> m : lineCompare) {
+                String lineCode=m.get("line_code").toString();
+                String lineName=m.get("name_pw").toString();
+                String convoy=m.get("convoy").toString();
+                List<Ticket> tickets=ticketGroup.get(lineCode);
+                int rcpw=0;//人次票务
+                int rcpos=0;//人次POS
+                int yspw=0;//营收票务
+                int yspos=0;//营收POS
+                int rcbtk=0;//人次保通卡
+
+                if(tickets!=null){
+                    for (Ticket ticket : tickets) {
+                        if("申城通".equals(ticket.getPayType())||"二维码".equals(ticket.getPayType())||"实体卡".equals(ticket.getPayType())){
+                            rcpos+= ticket.getCount();
+                            yspos+= ticket.getAmount();
+                        }
+                        if ("票务".equals(ticket.getPayType())){
+                            rcpw+= ticket.getCount();
+                            yspw+= ticket.getAmount();
+                        }
+                        if ("保通卡".equals(ticket.getPayType())){
+                            rcbtk+= ticket.getCount();
+                        }
+                    }
+                }
+                Xlybtz xlybtz=new Xlybtz();
+                xlybtz.setXl(lineName);// 路线
+                xlybtz.setXlcd((lines.get(lineCode).getUpMileage()+lines.get(lineCode).getDownMileage())/2);// 线路长度
+                if(carCounts.get(BasicData.lineId2CodeMap.inverse().get(lineCode))==null){
+                    System.out.println(BasicData.lineId2CodeMap.inverse().get(lineCode));
+                }
+                int clsdx=carCounts.get(BasicData.lineId2CodeMap.inverse().get(lineCode).toString());
+                xlybtz.setCldx(clsdx);// 车辆数大型
+                xlybtz.setClzx(0);// 31中型
+                xlybtz.setRcpw(rcpw);// 人次票务
+                xlybtz.setRcpos(rcpos);// 人次POS
+                xlybtz.setRchj(rcpw+rcpos);//人次合计
+                int sjyybc=bcMap.get(lineCode+"_sjyybc")==null?0:bcMap.get(lineCode+"_sjyybc");
+                xlybtz.setRcrjdc(xlybtz.getRchj()/( xlybtz.getCldx()+xlybtz.getClzx())/dayCount);// 人次日均单车
+                xlybtz.setYspw(yspw);// 营收票务
+                xlybtz.setYspos(yspos);// 营收POS
+                xlybtz.setYsyhhc(0);// 营收优惠换乘
+                xlybtz.setYsbtk(0);// 营收保通卡
+                xlybtz.setYshj(yspw+yspos);//营收合计
+                xlybtz.setYsrjdc(xlybtz.getYshj()/( xlybtz.getCldx()+xlybtz.getClzx())/dayCount);// 营收日均单车
+
+                double cygl=lcMap.get(lineCode+"_y")==null?0d:lcMap.get(lineCode+"_y");
+                double ydgl=lcMap.get(lineCode+"_h")==null?0d:lcMap.get(lineCode+"_h");
+                double cdgl=lcMap.get(lineCode+"_d")==null?0d:lcMap.get(lineCode+"_d");
+                double qrlgl=lcMap.get(lineCode+"_q")==null?0d:lcMap.get(lineCode+"_q");
+                double zlc=cygl+ydgl+cdgl+qrlgl;
+                if(zlc!=0){
+                    xlybtz.setBglys(Double.parseDouble(df.format((yspw+yspos)/zlc*100)));// 百公里营收（元）
+                }
+                xlybtz.setCygl(Double.parseDouble(df.format(cygl)));// 柴油（公里）
+                xlybtz.setYdgl(Double.parseDouble(df.format(ydgl)));// 油电（公里）
+                xlybtz.setCdgl(Double.parseDouble(df.format(cdgl)));// 纯电（公里）
+                xlybtz.setQrlgl(Double.parseDouble(df.format(qrlgl)));// 氢燃料（公里）
+                double cys=rlMap.get(lineCode+"_y_y")==null?0d:rlMap.get(lineCode+"_y_y");
+                double yds=rlMap.get(lineCode+"_h_y")==null?0d:rlMap.get(lineCode+"_h_y");
+                double dhd=rlMap.get(lineCode+"_d")==null?0d:rlMap.get(lineCode+"_d");
+                /*rlMap.remove(lineCode+"_d");*/
+                double qrlqk=rlMap.get(lineCode+"_q")==null?0d:rlMap.get(lineCode+"_q");
+                double cddh=rlMap.get(lineCode+"_d_d")==null?0d:rlMap.get(lineCode+"_d_d");
+                xlybtz.setCys(Double.parseDouble(df.format(cys)));// 柴油（升）
+                xlybtz.setYds(Double.parseDouble(df.format(yds)));// 油电（升）
+                xlybtz.setDhd(Double.parseDouble(df.format(dhd)));// 电耗（度）
+                xlybtz.setCddh(Double.parseDouble(df.format(cddh)));// 纯度电耗（度）
+                xlybtz.setQrlqk(Double.parseDouble(df.format(qrlqk)));// 氢燃料（千克）
+                if(cygl!=0){
+                    xlybtz.setCysbgl(Double.parseDouble(df.format((cys/cygl*100))));// 柴油升/百公里
+                }
+                if(ydgl!=0){
+                    xlybtz.setYdsbgl(Double.parseDouble(df.format((yds/ydgl*100))));// 油电升/百公里
+                }
+                if(cdgl!=0){
+                    xlybtz.setCddbgl(Double.parseDouble(df.format((cddh/cdgl*100))));// 纯电度/百公里
+                }
+                xlybtz.setBtkrc(rcbtk);// 保通卡（人次）
+                int jhyybc=bcMap.get(lineCode+"_jhyybc")==null?0:bcMap.get(lineCode+"_jhyybc");
+                xlybtz.setJhbc(jhyybc);// 计划班次
+                xlybtz.setSjbc(sjyybc);// 实际班次
+                double jhyylc=lcMap.get(lineCode+"_jhyylc")==null?0:Double.parseDouble(df.format(lcMap.get(lineCode+"_jhyylc")));
+                xlybtz.setJhgl(jhyylc);// 计划公里
+                double sjyylc=lcMap.get(lineCode+"_sjyylc")==null?0:Double.parseDouble(df.format(lcMap.get(lineCode+"_sjyylc")));
+                xlybtz.setSjgl(sjyylc);// 实际公里
+                if(jhyylc!=0){
+                    xlybtz.setGlwc(Double.parseDouble(df.format( sjyylc/jhyylc*100)));// 公里完成%
+                }
+                if(jhyybc!=0){
+                    xlybtz.setBcwc(Double.parseDouble(df.format((double)sjyybc/jhyybc*100)));// 班次完成%
+                }
+                xlybtz.setCr(ccMap.get(lineCode)==null?0:ccMap.get(lineCode));// 车日
+                double sjfyylc=lcMap.get(lineCode+"_sjfyylc")==null?0:Double.parseDouble(df.format(lcMap.get(lineCode+"_sjfyylc")));
+                xlybtz.setKsgl(sjfyylc);// 其中:空驶公里
+                if(rcpw+rcpos!=0){
+                    xlybtz.setPjpj(Double.parseDouble(df.format((double)(yspw+yspos)/(rcpw+rcpos))));// 平均票价
+                }
+                list.put(convoy,xlybtz);
+            }
+
+            /*rlMap.forEach((k,v)->{
+                if(k.contains("_d")&&k.split("_").length==2){
+                    System.out.println(k+"_"+v);
+                }
+            });*/
+            Set<String> keys=list.keySet();
+            List<String>keyList=keys.stream().sorted(Collator.getInstance(Locale.TRADITIONAL_CHINESE)).collect(Collectors.toList());//车队名排序
+            List<Xlybtz> xlybtzList=new ArrayList<>();//含合计数据集
+            List<Xlybtz> xlybtzListAll=new ArrayList<>();//不含合计数据集
+            for (String s : keyList) {
+                List<Xlybtz> xlybtzs=list.get(s);//车队
+                xlybtzList.addAll(list.get(s));
+                xlybtzList.add(Xlybtz.getTotal(xlybtzs,s,dayCount));//车队合计
+                xlybtzListAll.addAll(list.get(s));
+            }
+            xlybtzList.add(Xlybtz.getTotal(xlybtzListAll,"公司合计:",dayCount));///公司合计
+            List<Iterator<?>> listI = new ArrayList<>();
+            Map<String, Object> m = new HashMap<>();
+            m.put("date",date);
+            ReportUtils ee = new ReportUtils();
+            try {
+                listI.add(xlybtzList.iterator());
+                String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+                ee.excelReplace(listI, new Object[] { m }, path+"mould/路线生产月报台账.xls",
+                        path+"export/路线生产月报台账.xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            }
+        }
+        modelMap.put("code","00");
+        return modelMap;
+    }
+
+
+
+    public static int getDayCount(String start, String end) {
+        YearMonth startYearMonth = YearMonth.of(Integer.parseInt(start.substring(0,4)), Integer.parseInt(start.substring(5,7))); // 起始年月
+        YearMonth endYearMonth = YearMonth.of(Integer.parseInt(end.substring(0,4)), Integer.parseInt(end.substring(6,7)));   // 结束年月
+        List<YearMonth> yearMonthsBetween = getYearMonthsBetween(startYearMonth, endYearMonth);
+        int count = yearMonthsBetween.stream().mapToInt(yearMonth -> YearMonth.of(yearMonth.getYear(), yearMonth.getMonth()).lengthOfMonth()).sum();
+        return count;
+    }
+    //计算间隔月
+    public static List<YearMonth> getYearMonthsBetween(YearMonth start, YearMonth end) {
+        List<YearMonth> months = new ArrayList<>();
+        YearMonth current = start;
+        while (current.isBefore(end) || current.equals(end)) {
+            months.add(current);
+            current = current.plusMonths(1);
+        }
+        return months;
+    }
+}
@@ -274,25 +274,27 @@ public class PoiUtils {
         Object value = null;
         if (cell != null) {
             CellValue cellValue = evaluator.evaluate(cell);
-            switch (cellValue.getCellType()) {
-                case Cell.CELL_TYPE_NUMERIC:
-                    value = cellValue.getNumberValue();
-                    if (HSSFDateUtil.isCellDateFormatted(cell)) {
-                        value = cell.getDateCellValue();
-                    }
-                    break;
-                case Cell.CELL_TYPE_STRING:
-                    value = cellValue.getStringValue();
-                    break;
-                case Cell.CELL_TYPE_BOOLEAN:
-                    value = cellValue.getBooleanValue();
-                    break;
-                case Cell.CELL_TYPE_BLANK:
-                case Cell.CELL_TYPE_ERROR:
-                    value = "";
-                    break;
-                default:
-                    break;
+            if(cellValue!=null){
+                switch (cellValue.getCellType()) {
+                    case Cell.CELL_TYPE_NUMERIC:
+                        value = cellValue.getNumberValue();
+                        if (HSSFDateUtil.isCellDateFormatted(cell)) {
+                            value = cell.getDateCellValue();
+                        }
+                        break;
+                    case Cell.CELL_TYPE_STRING:
+                        value = cellValue.getStringValue();
+                        break;
+                    case Cell.CELL_TYPE_BOOLEAN:
+                        value = cellValue.getBooleanValue();
+                        break;
+                    case Cell.CELL_TYPE_BLANK:
+                    case Cell.CELL_TYPE_ERROR:
+                        value = "";
+                        break;
+                    default:
+                        break;
+                }
             }
         }
@@ -307,5 +309,44 @@ public class PoiUtils {
         List<Energy> energies = importFromExcel(new File("C:\\Users\\Hill\\Downloads\\充电数据.xls"), 2, columns, Energy.class);
         System.out.println(energies);
     }
+
+    /**
+     * 导入数据
+     * @param file 文件
+     * @param skipRows 跳过行数
+     * @param columns 对应的字段列信息
+     * @param cls 对象类型class
+     * @param <T> 对象类型
+     * @return
+     */
+    public static <T> List<T> importFromExcel2(File file, int skipRows, String[] columns, Class<T> cls) {
+        List<T> list = new ArrayList<>();
+        try {
+            POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file));
+            HSSFWorkbook wb = new HSSFWorkbook(fs);
+            HSSFFormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
+            HSSFSheet sheet = wb.getSheetAt(0);
+            int rows = sheet.getLastRowNum() + 1;
+
+            List<Map<String, Object>> data = new ArrayList<>();
+            for (int i = skipRows;i < rows;i++) {
+                HSSFRow row = sheet.getRow(i);
+                Map<String, Object> map = new HashMap<>();
+                int cols = columns.length;
+                for (int j = 0;j < cols;j++) {
+                    String column = columns[j];
+                    if (column != null) {
+                        map.put(columns[j], getCellValue(evaluator, row.getCell(j)));
+                    }
+                }
+                data.add(map);
+            }
+            list = mapper.convertValue(data, mapper.getTypeFactory().constructParametrizedType(ArrayList.class, List.class, cls));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return list;
+    }
 }
-<style>
-.blue{
-	background-color: #87CEFF
-}
+<style>
+.blue{
+	background-color: #87CEFF
+}
 </style>
 <div class="page-head">
     <div class="page-title">
@@ -27,56 +27,46 @@
 					<button type="button" class="btn btn-circle blue" id="upload"><i class="fa fa-file-excel-o"></i>
 						导入Excel
 					</button>
-					<button type="button" class="btn btn-circle blue" id="export"><i class="fa fa-file-excel-o"></i>
+					<!--<button type="button" class="btn btn-circle blue" id="export"><i class="fa fa-file-excel-o"></i>
 						导出Excel
-					</button>
+					</button>-->
                 </div>
             </div>
             <div class="portlet-body">
                 <div class="table-container" style="margin-top: 0px">
-                    <table
-                            class="table table-striped table-bordered table-hover table-checkable"
-                            id="datatable_dlb">
+                    <table class="table table-striped table-bordered table-hover table-checkable" id="datatable_dlb">
                         <thead>
+                        <tr role="row" class="heading">
+                            <th width="5%">#</th>
+                            <th width="20%">日期</th>
+                            <th width="20%">内部编码</th>
+                            <th width="20%">车牌</th>
+                            <th width="20%">充电量</th>
+                            <th width="15%">备注</th>
+                        </tr>
                         <tr role="row" class="filter">
-                       		<td>公司:</td>
+                            <td></td>
                             <td>
-                         		<select class="form-control" id="gsbm" ></select>
-                            </td>
-                            <td>分公司:</td>
-							<td>
-                         		<select class="form-control" id="fgsbm" ></select>
-                            </td>
-                            <td>日期:</td>
-                            <td width="86px">
-                                <input type="text" style="width: 80px" name="rq" id="rq"/>
+                                <input type="text" style="width: 100px" name="rq" id="rq"/>
                             </td>
-                            <td>内部编码:</td>
-                            <td>
+                            <!--<td>
                                 <select class="form-control" name="nbbm" id="nbbm" style="width: 120px;"></select>
-                            </td>
-                           
-                            <td width="20%">
+                            </td>-->
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td>
                                 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">
                                     <i class="fa fa-search"></i> 搜索
                                 </button>
                                 <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px">
                                     <i class="fa fa-times"></i> 重置
                                 </button>
-<!--                                 <button class="btn btn-danger btn-sm red" id="del" style="margin-right:0px"> -->
-<!--                                     <i class="fa fa-times"></i> 删除 -->
-<!--                                 </button> -->
+                                <!--                                 <button class="btn btn-danger btn-sm red" id="del" style="margin-right:0px"> -->
+                                <!--                                     <i class="fa fa-times"></i> 删除 -->
+                                <!--                                 </button> -->
                             </td>
                         </tr>
-                        <tr role="row" class="heading">
-                            <th>#</th>
-                            <th>日期</th>
-                            <th colspan="2">内部编码</th>
-                            <th colspan="2">充电量</th>
-                            <th colspan="2">充电站</th>
-                            <th colspan="2">备注</th>
-<!-- 							<td>操作</td> -->
-                        </tr>
                         </thead>
                         <tbody></tbody>
                     </table>
@@ -105,7 +95,16 @@
             format: 'YYYY-MM-DD',
             locale: 'zh-cn'
         });
-
+        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;
+        $("#rq").val(year + "-" + month + "-" + day);
         var page = 0, initPagination;
         var icheckOptions = {
             radioClass: 'iradio_square-blue icheck',
@@ -118,14 +117,14 @@
         });
         //提交
-        $('tr.filter .filter-submit').on('click', function () {
-			var gsbm = $('#gsbm').val();
-			var fgsbm = $('#fgsbm').val();
+        $('tr.filter .filter-submit').on('click', function () {
+		/*	var gsbm = $('#gsbm').val();
+			var fgsbm = $('#fgsbm').val();*/
             if ($("#rq").val() == "" || $("#rq").val() ==null){
             	  layer.msg('请选择日期.');
-            }else if(gsbm=="" || gsbm==null || fgsbm=="" ||fgsbm==null){
+            }/*else if(gsbm=="" || gsbm==null || fgsbm=="" ||fgsbm==null){
             	 layer.msg('请选择公司和分公司.');
-            }else {
+            }*/else {
                 var params = getParams();
@@ -348,13 +347,13 @@
         });
 		function getParams(){
-        	var gsbm=$("#gsbm").val();
-     		var fgsbm=$("#fgsbm").val();
+        	/*var gsbm=$("#gsbm").val();
+     		var fgsbm=$("#fgsbm").val();*/
             var cells = $('tr.filter')[0].cells
                     , params = {}
                     , name;
-     		params["gsbm"] = gsbm;
-     		params["fgsbm"] = fgsbm;
+     		/*params["gsbm"] = gsbm;
+     		params["fgsbm"] = fgsbm;*/
             $.each(cells, function (i, cell) {
                 var items = $('input,select', cell);
                 for (var j = 0, item; item = items[j++];) {
@@ -379,11 +378,10 @@
 			{{i + 1}}
         </td>
         <td>{{obj.rq}}</td>
-        <td colspan="2">{{obj.nbbm}}</td>
-       
-        <td colspan="2">{{obj.jdl}}</td>
-		<td colspan="2">{{obj.jdz}}</td>
-		<td>{{obj.remarks}}</td>
+        <td>{{obj.nbbm}}</td>
+        <td>{{obj.plate}}</td>
+        <td>{{obj.jdl}}</td>
+        <td>{{obj.remarks}}</td>
 		<!-- <td>
 			<button class="btn btn-info btn-sm">
 				<i class="fa fa-search"></i> 修改
@@ -31,7 +31,7 @@
 				</form>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn default" id="downLoad">下载模板</button>
+				<!--<button type="button" class="btn default" id="downLoad">下载模板</button>-->
 				<button type="button" class="btn default" data-dismiss="modal">取消</button>
 				<button type="button" class="btn btn-primary" id="submit">确认导入</button>
 			</div>
@@ -89,9 +89,9 @@
 			})
 		});
-		$('#downLoad').on('click', function(){
-			window.open("/downloadFile/downloadModel?fileName=import_Jdl");
-		});
+		/*$('#downLoad').on('click', function(){
+			window.open("/downloadFile/downloadModel?fileName=车辆充电");
+		});*/
 		function getCurrSelNode(){
 			return $.jstree.reference("#modules_tree").get_selected(true);
+<style>
+.blue{
+	background-color: #87CEFF
+}
+</style>
+<div class="page-head">
+    <div class="page-title">
+        <h1>车辆加氢量</h1>
+    </div>
+</div>
+<ul class="page-breadcrumb breadcrumb">
+    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">用氢管理</span> <i class="fa fa-circle"></i></li>
+    <li><span class="active">车辆加氢管理</span></li>
+</ul>
+
+<div class="row" id="ll_oil_list">
+    <div class="col-md-12">
+        <!-- Begin: life time stats -->
+        <div class="portlet light portlet-fit portlet-datatable bordered">
+            <div class="portlet-title">
+                <div class="caption">
+                    <i class="fa fa-fire-extinguisher"></i> <span
+                        class="caption-subject font-dark sbold uppercase">车辆加氢量</span>
+                </div>
+                <div class="actions">
+					<button type="button" class="btn btn-circle blue" id="upload"><i class="fa fa-file-excel-o"></i>
+						导入Excel
+					</button>
+					<!--<button type="button" class="btn btn-circle blue" id="export"><i class="fa fa-file-excel-o"></i>
+						导出Excel
+					</button>-->
+                </div>
+            </div>
+            <div class="portlet-body">
+                <div class="table-container" style="margin-top: 0px">
+                    <table class="table table-striped table-bordered table-hover table-checkable" id="datatable_qlb">
+                        <thead>
+                        <tr role="row" class="heading">
+                            <th width="5%">#</th>
+                            <th width="15%">日期</th>
+                            <th width="15%">内部编码</th>
+                            <th width="15%">车牌</th>
+                            <th width="15%">加氢量</th>
+                            <th width="20%">加氢站</th>
+                            <th width="15%">备注</th>
+                        </tr>
+                        <tr role="row" class="filter">
+                            <td></td>
+                            <td>
+                                <input type="text" style="width: 100px" name="rq" id="rq"/>
+                            </td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <!--<td colspan="2">内部编码:</td>
+                            <td colspan="2">
+                                <select class="form-control" name="nbbm" id="nbbm" style="width: 120px;"></select>
+                            </td>-->
+
+                            <td width="24%">
+                                <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">
+                                    <i class="fa fa-search"></i> 搜索
+                                </button>
+                                <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px">
+                                    <i class="fa fa-times"></i> 重置
+                                </button>
+                                <!--                                 <button class="btn btn-danger btn-sm red" id="del" style="margin-right:0px"> -->
+                                <!--                                     <i class="fa fa-times"></i> 删除 -->
+                                <!--                                 </button> -->
+                            </td>
+                        </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
+                    <div style="text-align: right;">
+                        <ul id="pagination" class="pagination"></ul>
+                    </div>
+                </div>
+            </div>
+			<div class="portlet-body">
+				<div id="modules_tree"></div>
+			</div>
+        </div>
+    </div>
+</div>
+
+
+<script src="/assets/js/ajaxfileupload/ajaxfileupload.js"></script>
+<script>
+    $(function () {
+
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+    	
+        $("#rq").datetimepicker({
+            format: 'YYYY-MM-DD',
+            locale: 'zh-cn'
+        });
+        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;
+        $("#rq").val(year + "-" + month + "-" + day);
+
+        var page = 0, initPagination;
+        var icheckOptions = {
+            radioClass: 'iradio_square-blue icheck',
+            increaseArea: '20%'
+        }
+
+        //重置
+        $('tr.filter .filter-cancel').on('click', function () {
+            $('tr.filter input, select').val('').change();
+        });
+
+        //提交
+        $('tr.filter .filter-submit').on('click', function () {
+
+			if ($("#rq").val() == "" || $("#rq").val() ==null){
+				layer.msg('请选择日期.');
+			}else {
+                var params = getParams();
+                page = 0;
+                jsDoQuery(params, true);
+            }
+        });
+
+        
+    	$.get('/user/companyData', function(result){
+    		obj = result;
+    		var options="";
+// 			= '<option value="">请选择</option>';
+    		for(var i = 0; i < obj.length; i++){
+    			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+//     			setFgsqx(obj[i].companyCode);
+    		}
+    		$('#gsbm').html(options);
+    		updateCompany();
+    	});
+    	
+    	$("#gsbm").on("change",updateCompany);
+    	function updateCompany(){
+    		var company = $('#gsbm').val();
+    		var options ="";
+//     		= '<option value="">请选择</option>';
+    		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>';
+    				}
+    			}
+    		}
+    		$('#fgsbm').html(options);
+    	}
+        /*
+         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+         */
+        function jsDoQuery(p, pagination) {
+            var params = {};
+            if (p)
+                params = p;
+            params['order'] = 'nbbm';
+            params['page'] = page;
+            params['rq'] = $("#rq").val();
+            
+            var j = layer.load(2);
+            $get('/jql/query', params, function (data) {
+                $.each(data.dataList, function (i, obj) {
+                    obj.rq = moment(obj.rq).format("YYYY-MM-DD");
+                });
+                var bodyHtm = template('jql_list', {list:data.dataList});
+
+                $('#datatable_qlb tbody').html(bodyHtm)
+                        .find('.icheck').iCheck(icheckOptions)
+                        .on('ifChanged', iCheckChange);
+                if (pagination && data.dataList.length > 0) {
+                    //重新分页
+                    initPagination = true;
+                    showPagination(data);
+                	$('#pagination').show();
+                } else if(data.dataList.length == 0){
+                	$('#pagination').hide();
+                }
+                
+                layer.close(j);
+
+                startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
+            });
+        }
+
+        //改变状态
+        function startOptJzylLink(es) {
+            es.editable({
+                type: 'text',
+                placement: 'right',
+                width: 100,
+                display: false,
+                validate: function (value) {
+                    if (!value)
+                        return '值不能为空！';
+                    if (isNaN(value))
+                        return '只能为数字！';
+                    if (value < 0)
+                        return '值不能小于0！';
+                },
+                inputclass: 'form-control input-medium input-edtable-sm'
+            }).on('save', function (e, params) {
+				$(this).text(params.newValue);
+			});
+        }
+
+        function iCheckChange() {
+            var tr = $(this).parents('tr');
+            if (this.checked)
+                tr.addClass('row-active');
+            else
+                tr.removeClass('row-active');
+
+            /* if($('#datatable_resource input.icheck:checked').length == 1)
+             $('#removeButton').removeAttr('disabled');
+             else
+             $('#removeButton').attr('disabled', 'disabled');  */
+        }
+
+        function showPagination(data) {
+            //分页
+            $('#pagination').jqPaginator({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    if (initPagination) {
+                        initPagination = false;
+                        return;
+                    }
+                    
+                    var params = getParams();
+                    
+                    page = num - 1;
+                    jsDoQuery(params, true);
+                }
+            });
+        }
+
+
+        //删除
+        $('#del').on('click', function () {
+            if ($(this).attr('disabled'))
+                return;
+
+            var id = $('input.icheck:checked').data('id');
+            removeConfirm('确定要删除选中的数据？', '/resource/' + id, function () {
+                $('tr.filter .filter-submit').click();
+            });
+        });
+
+        //搜索线路
+       	$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			initPinYinSelect2('#xlbm',data,'');
+			
+		});
+
+        $('#nbbm').select2({
+            placeholder: '搜索车辆...',
+            ajax: {
+                url: '/realSchedule/sreachVehic',
+                dataType: 'json',
+                delay: 150,
+                data: function (params) {
+                    return {nbbm: params.term};
+                },
+                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>';
+                }
+            }
+        })
+
+        //导入
+        $("#upload").on("click", function(){
+        	$.get('upload.html', function(m){$(pjaxContainer).append(m);});
+        });
+
+		//导出
+        $("#export").on("click", function () {
+			if ($("#rq").val() != "") {
+				var params = getParams();
+                
+				params["type"] = "export";
+				$get('/jql/query', params, function (result) {
+					window.open("/downloadFile/download?fileName=车辆加氢量" + moment($("#rq").val()).format("YYYYMMDD"));
+				});
+            } else {
+                layer.msg('请选择日期.');
+            }
+        });
+		
+		function getParams(){
+			var cells = $('tr.filter')[0].cells
+                    , params = {}
+                    , name;
+			$.each(cells, function (i, cell) {
+                var items = $('input,select', cell);
+                for (var j = 0, item; item = items[j++];) {
+                    name = $(item).attr('name');
+                    if (name) {
+                        params[name] = $(item).val();
+                    }
+                }
+            });
+			return params;
+		};
+
+    });
+
+</script>
+
+<script id="jql_list" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td style="vertical-align: middle;">
+            <!-- <input type="radio" name="id" class="group-checkable icheck" data-id="{{obj.id}}"> -->
+			{{i + 1}}
+        </td>
+        <td>{{obj.rq}}</td>
+        <td>{{obj.nbbm}}</td>
+        <td>{{obj.plate}}</td>
+        <td>{{obj.jql}}</td>
+		<td>{{obj.jqz}}</td>
+		<td>{{obj.remarks}}</td>
+		<!-- <td>
+			<button class="btn btn-info btn-sm">
+				<i class="fa fa-search"></i> 修改
+			</button>
+			<button class="btn btn-danger btn-sm">
+				<i class="fa fa-trash-o"></i> 删除
+			</button>
+		</td> -->
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan=9><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
 \ No newline at end of file
+<div class="modal fade" id="uploadFile" tabindex="-1" role="basic"
+	aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true"></button>
+				<h4 class="modal-title">导入Excel</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" role="form" id="excelFile" method="post"
+						action="" enctype="multipart/form-data">
+					<input type="hidden" name="groupType" value="3">
+					<div class="alert alert-danger display-hide">
+						<button class="close" data-close="alert"></button>
+						您的输入有误，请检查下面的输入项
+					</div>
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label">选择文件</label>
+							<div class="col-md-9">
+								<input type="file" name="file" id="file"
+									accept="application/vnd.ms-excel"/>
+								<input type="hidden" name="gsbm_" id="gsbm_">
+								<input type="hidden" name="gsName" id="gsName">
+								<input type="hidden" name="fgsbm_" id="fgsbm_">
+								<input type="hidden" name="fgsName" id="fgsName">
+							</div>
+						</div>
+					</div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" id="downLoad">下载模板</button>
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary" id="submit">确认导入</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script id="res_tbody_temp" type="text/html">
+
+</script>
+<script data-exclude=1>
+	$(function() {
+		var form = $('#excelFile');
+		var error = $('.alert-danger', form);
+		
+		$('#gsbm_').val($("#gsbm").val());
+		$('#gsName').val($("#gsbm").find("option:selected").text());
+// 		$('#fgsbm_').val($("#fgsbm").val());
+// 		$('#fgsName').val($("#fgsbm").find("option:selected").text());
+		$('#fgsbm_').val('-1');
+		$('#fgsName').val('全部车队');
+		
+		//modal 显示事件
+		$('#uploadFile').on('show.bs.modal', function(){
+		})
+		.modal('show');
+		
+		$('#submit').on('click', function() {
+            var j = layer.load(2);
+			var param = {};
+			param.uploadDir = 'upload';
+			param["gsbm_"] = $('#gsbm_').val();
+			param["gsName"] = $('#gsName').val();
+			param["fgsbm_"] = $('#fgsbm_').val();
+			param["fgsName"] = $('#fgsName').val();
+			$.ajaxFileUpload({
+				url : '/jql/uploadFile',
+				secureuri : false,
+				fileElementId : 'file',
+				dataType : 'json',
+				data : param,
+				success : function(data) {
+	                layer.close(j);
+					alert(data.result);
+// 					alert("文件导入成功");
+					$('#uploadFile').modal('hide');
+					$('tr.filter .filter-submit').click();
+				},
+				error : function(data, status, e) {
+	                layer.close(j);
+					alert("文件导入失败");
+				}
+			})
+		});
+		
+		$('#downLoad').on('click', function(){
+			window.open("/downloadFile/downloadModel?fileName=车辆加氢");
+		});
+		
+		function getCurrSelNode(){
+			return $.jstree.reference("#modules_tree").get_selected(true);
+		}
+	});
+</script>
 \ No newline at end of file
+<div class="page-head">
+	<div class="page-title">
+		<h1>进出站氢量量信息编辑</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">用氢管理</span> <i class="fa fa-circle"></i></li>
+	<li><a href="list.html" data-pjax>进出场氢量</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">进出站氢量信息编辑</span></li>
+</ul>
+
+<div class="portlet light bordered">
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i> <span
+				class="caption-subject font-red-sunglo bold uppercase">表单</span>
+		</div>
+	</div>
+	<div class="portlet-body form">
+		<form class="form-horizontal" id="qlb_add_form" >
+		
+		<div class="alert alert-danger display-hide">
+			<button class="close" data-close="alert"></button>
+			您的输入有误，请检查下面的输入项
+		</div>
+			<input type="hidden" value="0" name="yhlx" />
+			<div class="form-body">
+				<div class="form-group">
+					<label class="col-md-3 control-label">公司</label>
+					<div class="col-md-4">
+							<select class="form-control" name="ssgsdm" id="ssgsdm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">分公司</label>
+					<div class="col-md-4">
+							<select class="form-control" name="fgsdm" id="fgsdm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">线路</label>
+					<div class="col-md-4">
+							<select class="form-control" name="xlbm" id="xlbm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">内部编码</label>
+					<div class="col-md-4">
+							<select  class="form-control" name="nbbm" id="nbbm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">日期</label>
+					<div class="col-md-4">
+							<input type="text" class="form-control" name="rq" id="date">
+							<label>跨天营运</label>
+							<select id="sfkt" name="sfkt">
+								<option value="0">否</option>
+								<option value="1">是</option>
+							</select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">开始营运时间</label>
+					<div class="col-md-4">
+							<input type="time" class="form-control" name="jhsj" >
+							<span class="help-block"> 如：12:12</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">驾驶员</label>
+					<div class="col-md-4">
+							<select  class="form-control" name="jsy" id="jsy"> </select>
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">出场里程</label>
+					<div class="col-md-4">
+							<input type="text" value="0" class="form-control" name="czlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">出场氢量</label>
+					<div class="col-md-4">
+							<input type="text" value="100"  class="form-control" name="czcl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">充氢量</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="jql" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">进场氢量</label>
+					<div class="col-md-4">
+							<input type="text" value="100"  class="form-control" name="jzcl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">耗氢量</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="hn" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">尿素</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="ns" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">进场里程</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="jzlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">损耗原因</label>
+					<div class="col-md-4">
+							<select  class="form-control" name="shyy">
+								<option value='0'>请选择</option> 
+								<option value='1'>票务用</option> 
+								<option value='2'>保养用</option> 
+								<option value='3'>报废车用</option> 
+								<option value='4'>其它用</option> 
+								<option value='5'>人保部</option> 
+								<option value='6'>车队</option> 
+								<option value='7'>车间(高保)</option> 
+								<option value='8'>车间(小修)</option> 
+							</select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">损耗氢量</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="sh" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">行驶总里程</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="zlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				
+			</div>
+			<div class="form-actions">
+				<div class="row">
+					<div class="col-md-offset-3 col-md-4">
+						<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
+						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
+					</div>
+				</div>
+			</div>
+		</form>
+		<!-- END FORM-->
+	</div>
+</div>
+<script>
+(function(){
+	var fage=false;
+	var obj = [];
+	var xlList;
+	$.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>';
+			}
+			$('#ssgsdm').html(options);
+			
+			updateCompany();
+		});
+	});
+
+	$("#ssgsdm").on("change",updateCompany);
+	function updateCompany(){
+		var company = $('#ssgsdm').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>';
+				}
+			}
+		}
+		$('#fgsdm').html(options);
+		initXl();
+		selectNbbm();
+		selectJsy();
+	}
+	$("#fgsdm").on("change",initXl);
+	function initXl(){
+		var data=[];
+		if(fage){
+			$("#xlbm").select2("destroy").html('');
+		}
+		var fgs=$('#fgsdm').val();
+		var gs=$('#ssgsdm').val();
+		for(var i=0;i<xlList.length;i++){
+			if(gs!=""){
+				if(fgs!=""){
+					if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+						data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+					}
+				}else{
+					if(xlList[i]["gsbm"]==gs){
+						data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+					}
+				}
+			}
+		}
+		initPinYinSelect2('#xlbm',data,'');
+		fage=true;
+		selectNbbm();
+		selectJsy();
+	}
+	$("#date").datetimepicker({
+		format : 'YYYY-MM-DD',
+		locale : 'zh-cn'
+	});
+	
+	function selectNbbm(){
+		$('#nbbm').select2({
+			placeholder: '搜索车辆...',
+			ajax: {
+				url: '/report/carList',
+				dataType: 'json',
+				delay: 150,
+				data: function(params){
+					return{nbbm: params.term,
+	            	    gsbm:$('#ssgsdm').val(),
+	            	    fgsbm:$('#fgsdm').val(),
+	            	    xlbm:""
+	            	    };
+				},
+			    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>';
+			   }
+			}
+		})
+	}
+	
+	
+	function selectJsy(){
+		$('#jsy').select2({
+			placeholder: '搜索驾驶员...',
+			ajax: {
+				url: '/report/userList',
+				dataType: 'json',
+				delay: 150,
+				data: function(params){
+					return{jsy: params.term,gsbm:$('#ssgsdm').val()};
+				},
+			    processResults: function (data) {
+			      return {
+			        results: data
+			      };
+			    },
+				cache: true
+			},
+			templateResult: function(repo){
+				if (repo.loading) return repo.text;
+				var h = '<span>'+repo.text+'</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>';
+			   }
+			}
+		});
+	}
+		$(function(){
+			/* $get('/role/all',null,function(result){
+				$.each(result,function(i,obj){
+					$("#role").append("<option value='"+obj.id+"'>"+obj.roleName+"</option>");
+				});
+			}); */
+			
+			var form = $('#qlb_add_form');
+			var error = $('.alert-danger', form);
+			
+			//表单 validate
+			form.validate({
+				errorElement : 'span', 
+				errorClass : 'help-block help-block-error', 
+				focusInvalid : false, 
+				rules : {
+					'xlbm' : {
+						required : true,
+						maxlength: 25
+					},
+					'nbbm' : {
+						required : true,
+						maxlength: 25
+					},
+					'rq' : {
+						required : true,
+						maxlength: 25
+					},
+					'jsy' : {
+						required : true,
+						maxlength: 20
+					}
+				},
+				invalidHandler : function(event, validator) {         
+					error.show();
+					App.scrollTo(error, -200);
+				},
+
+				highlight : function(element) { 
+					$(element).closest('.form-group').addClass('has-error'); 
+				},
+
+				unhighlight : function(element) { 
+					$(element).closest('.form-group').removeClass('has-error'); 
+				},
+
+				success : function(label) {
+					label.closest('.form-group').removeClass('has-error'); 
+				},
+
+				submitHandler : function(f) {
+					var params = form.serializeJSON();
+					error.hide();
+					var nbbm=$("#nbbm").val();
+					var date=$("#date").val();
+					var jsy=$("#jsy").val();
+					var xlbm=$("#xlbm").val();
+					var gsdm=$("#ssgsdm").val();
+					var map={};
+					map["nbbm"]=nbbm;
+					map["date"]=date;
+					map["jsy"]=jsy;
+					map["xlbm"]=xlbm;
+					map["rq"]=date;
+					map["ssgsdm_like"]=gsdm;
+					//检查一下用户是否存在
+					var i = layer.load(2);
+					$get('/ylb/checkDate', map, function(fage){
+							if(fage=="2"){
+								layer.msg('只能操作三天内数据.');
+								 layer.close(i);
+							}else{
+								$get('/qlb/checkJsy', map, function(fage){
+									if(fage=="0"){
+										layer.msg('该驾驶员当天已存在.');
+										 layer.close(i);
+									}else{			            	
+										$post('/qlb/saveQlb', params, function(){
+											 layer.close(i);
+											layer.msg('添加信息成功.');
+											loadPage('list.html');
+										});
+									}
+								});
+							}
+					})
+				}
+			});
+		});
+})();
+</script>
 \ No newline at end of file
+<div class="page-head">
+    <div class="page-title">
+        <h1>进出场存氢量</h1>
+    </div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">用氢管理</span> <i class="fa fa-circle"></i></li>
+    <li><span class="active">进出场存氢量</span></li>
+</ul>
+
+<div class="row" id="dl_oil_list">
+    <div class="col-md-12">
+        <!-- Begin: life time stats -->
+        <div class="portlet light portlet-fit portlet-datatable bordered">
+            <div class="portlet-title">
+                <div class="caption">
+                    <i class="fa fa-fire-extinguisher"></i>
+                    <span class="caption-subject font-dark sbold uppercase">进出场存氢量表</span>
+                </div>
+                <div class="actions">
+                      <button type="button" class="btn btn-circle blue" id="saveButton"><i class="fa fa-minus-square"></i>
+                        	保存
+                    </button>
+                     <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
+                    <button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button>
+                    
+                    <button type="button" class="btn btn-circle blue" id="obtain"><i class="fa fa-hourglass-half"></i>
+                  	   获取加/存氢信息
+                    </button>
+                     <button type="button" class="btn btn-circle blue" id="checkQl"><i class="fa fa-gg-circle"></i>
+                     	 核对加注量（有加氢无里程）
+                    </button>
+                	<button   class="btn btn-circle blue"
+                                   id="export"> <i class="fa fa-file-excel-o"></i>
+                           	导出Excel
+                      </button>
+                </div>
+            </div>
+            <div class="portlet-body">
+                <div class="table-container" style="margin-top: 10px">
+                    <table
+                            class="table table-striped table-bordered table-hover table-checkable"
+                            id="datatable_qlb">
+                        <thead >
+                        <tr role="row" class="filter">
+                        		<td colspan="2">
+                        			<div style="float: right; " >&nbsp;公司</div>
+								</td>
+								<td colspan="3">
+									<div style="float: left;width: 150px">
+										<select class="form-control" name="ssgsdm_like"
+											id="ylbListGsdmId"></select>
+									</div>
+								</td>
+								<td colspan="2">
+									<div style="float: right; " >&nbsp;分公司</div>
+								</td>
+								<td colspan="3">
+									<div style="float: left;">
+										<select class="form-control" name="fgsdm_like"
+											id="ylbListFgsdmId" style="width: 150px"></select>
+									</div>
+								</td>
+								<td >
+									<div style="float: right; ">日期</div>
+								</td>
+								<td colspan="2">
+									<div style="float: left;">
+										<input type="text" style="width: 120px" name="rq" id="rq" />
+									</div>
+                        		</td>
+                        		<td rowspan="2" colspan="2">
+                        			<div style="float: left;">
+									&nbsp;<button
+										class="btn btn-sm green btn-outline filter-submit margin-bottom"
+										style="margin-right: 0px">
+										<i class="fa fa-search"></i> 搜索
+									</button> <!--                                 <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px"> -->
+									<!--                                     <i class="fa fa-times"></i> 重置 -->
+									<!--                                 </button> -->
+
+								</div>
+                        		</td>
+                        </tr>
+                        <tr class="filter2">
+									<td colspan="2">
+									<div style="float: right; ">&nbsp;线路</div>
+									</td>
+									<td colspan="3">
+									<div style="float: left;">
+										<select class="form-control" name="xlbm_like" id="xlbm"
+											style="width: 150px;"></select>
+									</div>
+									</td>
+									<td colspan="2">
+									<div style="float: right;">&nbsp;内部编码</div>
+									</td>
+									<td colspan="3">
+									<div style="float: left;">
+										<select class="form-control" name="nbbm_eq" id="nbbm"
+											style="width: 120px;"></select>
+									</div>
+									<div style="float: left;">
+										<button class="btn btn-sm #000 btn-outline filter-cancel"
+											style="margin-right: 0px">
+											<i class="fa fa-times"></i>
+										</button>
+									</div>
+									</td>
+									<td >
+									<div style="float: right;">
+									类型
+									</div>
+									</td>
+									<td colspan="2">
+									<div style="float: left;">
+										<select class="form-control" name="sxtj">
+												<option value="0">全部</option>
+												<option value="1">一车一单</option>
+												<option value="2">一车多单</option>
+												<option value="3">有充氢没里程</option>
+												<option value="4">有里程没充氢</option>
+										   </select>
+									</div>
+								
+									</td>
+							</tr>
+							<tr>
+								<td colspan="17">
+								<div style="float: left;">
+									总计 
+									&nbsp;&nbsp;
+									充氢量:&nbsp;<label id="sumJzl"></label>
+									&nbsp;&nbsp;
+									耗氢量:&nbsp;<label id="sumYh"></label>
+									&nbsp;&nbsp;
+									损耗氢量:&nbsp;<label id="sumSh"></label>
+								</div>	
+								</td>
+							</tr>
+                        <tr role="row" class="heading">
+                            <th width="2%">#</th>
+                            <th width="8%">日期</th>
+                            <th width="5%">公司</th>
+                            <th width="8%">线路</th>
+                            <th width="5%">自编号</th>
+                            <th width="6%">驾驶员</th>
+                            <th width="4%">充氢量</th>
+                            <th width="6%">出场存氢</th>
+                            <th width="6%">进场存氢</th>
+                            <th width="5%">耗氢</th>
+                            <th width="5%">耗损原因</th>
+                            <th width="4%">耗损氢量</th>
+                            <th width="4%">当日总里程</th>
+                            <th width="4%">数据类型</th>
+                            <th width="4%">百公里氢耗</th>
+<!--                             <th width="5%">操作</th> -->
+                        </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
+                    <div style="text-align: right;">
+                        <ul id="pagination" class="pagination"></ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script id="qlb_list_temp" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td style="vertical-align: middle;">
+            <input type="checkbox" name="id" class="group-checkable icheck" data-id="{{obj.id}}">
+        </td>
+        <td>
+            {{obj.rq}}
+        </td>
+        <td>
+            {{obj.gsname}}
+        </td>
+        <td>
+           {{if obj.linename=='' || obj.linename==null}}
+				{{obj.xlname}}
+			{{else}}
+				{{obj.linename}}
+			{{/if}}
+        </td>
+        <td>
+			<lable data-id="{{obj.id}}" class="in_carpark_nbbm">{{obj.nbbm}}</lable>
+           
+        </td>
+        <td>
+            {{if obj.jsy=='' || obj.jsy==null }}
+			<input data-id="{{obj.id}}" style=" width:100%"  type="text"  class="in_carpark_jsy" ></input>
+			<button  class="btn btn-sm blue btn-jsyUpdate" style=" width:100%"   data-id="{{obj.id}}">填写工号</button>
+		{{else}}
+			{{if obj.jname=='' || obj.jname==null}}
+				{{obj.jsy}}/{{obj.name}}
+			{{else}}
+				{{obj.jsy}}/{{obj.jname}}
+			{{/if}}
+		{{/if}}
+        </td>
+        <td>
+           
+			<lable data-id="{{obj.id}}" class="in_carpark_jql"> {{obj.jql}}</lable>
+        </td>
+        <td>
+            
+			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_czcl" 
+            type="text" value=" {{obj.czcl}}" style=" width:40px;float:left" 
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
+			<lable style="float:left">%<lable>
+        </td>
+        <td>
+			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzcl" 
+            type="text" value=" {{obj.jzcl}}" style=" width:40px;float:left"  
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
+			<lable style="float:left">%<lable>
+        </td>
+        <td>
+<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_hn" readOnly="true" 
+            type="text" value=" {{obj.hn}}" style=" width:45px;float:left"  
+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>
+			<select data-id="{{obj.id}}" class="in_carpark_shyy" style=" width:80px">
+				<option value='0' {{if obj.shyy==0}}  selected = 'selected' {{/if}}>请选择</option> 
+				<option value='1' {{if obj.shyy==1}}  selected = 'selected' {{/if}}>票务用</option> 
+				<option value='2' {{if obj.shyy==2}}  selected = 'selected' {{/if}}>保养用</option> 
+				<option value='3' {{if obj.shyy==3}}  selected = 'selected' {{/if}}>报废车用</option> 
+				<option value='4' {{if obj.shyy==4}}  selected = 'selected' {{/if}}>其它用</option> 
+				<option value='5' {{if obj.shyy==5}}  selected = 'selected' {{/if}}>人保部</option> 
+				<option value='6' {{if obj.shyy==6}}  selected = 'selected' {{/if}}>车队</option> 
+				<option value='7' {{if obj.shyy==7}}  selected = 'selected' {{/if}}>车间(高保)</option> 
+				<option value='8' {{if obj.shyy==8}}  selected = 'selected' {{/if}}>车间(小修)</option> 
+			</select>
+        </td>
+        <td>
+		<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl"
+			value={{obj.sh}} style=" width:40px" type="text" 
+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>
+            {{obj.zlc}}
+        </td>
+        <td>
+			<select data-id="{{obj.id}}" class="in_carpark_nhlx">
+				<option value='0' {{if obj.nhlx==0}}  selected = 'selected' {{/if}}>手录</option> 
+				<option value='1' {{if obj.nhlx==1}}  selected = 'selected' {{/if}}>拆分</option> 
+			</select>
+        </td>
+        <td>
+            {{obj.bglhn}}
+        </td>
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan=15><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
+
+<script>
+    $(function () {
+    	var fage=false;
+    	
+        $("#rq").datetimepicker({
+            format: 'YYYY-MM-DD',
+            locale: 'zh-cn'
+        });
+        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;
+    	$("#rq").val(year + "-" + month + "-" + day);
+
+        $("#checkQl").on('click', function () {
+            if ($("#rq").val() != "") {
+            	var ylbGsdm=$("#ylbListGsdmId").val();
+         		var ylbFgsdm=$("#ylbListFgsdmId").val();
+				if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
+					layer.msg('请选择公司和分公司.');
+				} else {
+	            	var params=getParamsList();
+	            	var par={};
+	            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+	            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+	            	$get('/ylb/checkDate',par,function(status){
+	            		if(status=='2'){
+	               		 layer.msg('只能操作三天内数据.');
+	               		}else{
+			                var i = layer.load(2);
+			                $get('/qlb/checkQl', params, function () {
+			                	layer.close(i);
+			                    jsDoQuery(params, true);
+			                });
+	               		}
+	            	});
+				}
+            } else {
+                layer.msg('请选择日期.');
+            }
+        })
+
+        //进场等于出场
+        $("#outAndIn").on('click', function () {
+            console.log("进场氢量等于出场氢量");
+            if ($("#rq").val() != "") {
+            	var params=getParamsList();
+            	var par={};
+            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+            	$get('/ylb/checkDate',par,function(status){
+            		if(status=='2'){
+               		 layer.msg('只能操作三天内数据.');
+               		}else{
+		                var i = layer.load(2);
+		                $get('/ylb/outAndIn', params, function () {
+		                	layer.close(i);
+		                    jsDoQuery(params, true);
+		                });
+               		}
+            	})
+            } else {
+                layer.msg('请选择日期.');
+            }
+        });
+       
+        
+        //保存
+        $("#saveButton").on('click',function(){
+        	var params_=getParamsList();
+        	var par={};
+        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+        	$get('/ylb/checkDate',par,function(status){
+        		if(status=='2'){
+           		 layer.msg('只能操作三天内数据.');
+           		}else{
+		        	var ylArray = [];
+		        	$('input.icheck').each(function(){
+		        		var map = {};
+		        		var id=$(this).data('id');
+		        		var nbbm =$('.in_carpark_nbbm[data-id='+id+']', '#dl_oil_list').html();
+		        		var jql =$('.in_carpark_jql[data-id='+id+']', '#dl_oil_list').html();
+		        		if(jql=="" || jql ==null){
+		        			jql=0;
+		        		}
+		        		var czcl=$('.in_carpark_czcl[data-id='+id+']', '#dl_oil_list').val();
+		        		if(czcl=="" || czcl==null){
+		        			czcl=0;
+		        		}
+		        		var jzcl=$('.in_carpark_jzcl[data-id='+id+']', '#dl_oil_list').val();
+		        		if(jzcl=="" || jzcl==null){
+		        			jzcl=0;
+		        		}
+		        		
+		        		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').val();
+		        		if(sh=="" || sh==null){
+		        			sh=0;
+		        		}
+		        		
+		                var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#dl_oil_list').val();
+		                var hn = $('.in_carpark_hn[data-id='+id+']', '#dl_oil_list').val();
+		                if(hn=="" || hn==null){
+		                	hn=0;
+		                }
+		                var nhlx = $('.in_carpark_nhlx[data-id='+id+']', '#dl_oil_list').val();
+		                
+		                map['id']=id;
+		                map['jql']=jql;
+		                map['czcl']=czcl;
+		                map['jzcl']=jzcl;
+		                map['sh']=sh;
+		                map['shyy']=shyy;
+		                map['nhlx']=nhlx;
+		                map['nbbm']=nbbm;
+		                map['hn']=hn;
+		                map['rq']=$("#rq").val();
+		                ylArray.push(map);
+		        	})
+		        	var params = {};
+		        	params['qlbList']=JSON.stringify(ylArray);
+		        	 var i = layer.load(2);
+		        	  $post('/qlb/saveQlbList', params, function () {
+		             	layer.close(i);
+		             	var params1 =getParamsList();
+		                 jsDoQuery(params1, true);
+		             });  
+           		}
+        	})
+        })
+        //获取加存信息
+        $("#obtain").on('click', function () {
+            if ($("#rq").val() != "") {
+            	var ylbGsdm=$("#ylbListGsdmId").val();
+         		var ylbFgsdm=$("#ylbListFgsdmId").val();
+// 				if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
+// 					layer.msg('请选择公司和分公司.');
+				if(ylbGsdm=="" || ylbGsdm==null){
+					layer.msg('请选择公司.');
+				} else {
+	            	var params=getParamsList();
+	            	var par={};
+	            	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+	            	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+	            	$get('/ylb/checkDate',par,function(status){
+	            		if(status=='2'){
+	               		 layer.msg('只能操作三天内数据.');
+	               		}else{
+			                var i = layer.load(2);
+			                params["fgsdm_like"] = '';
+			                $get('/qlb/obtain', params, function () {
+			                	layer.close(i);
+			                	params["fgsdm_like"] = ylbFgsdm;
+			                    jsDoQuery(params, true);
+			                });
+	               		}
+	            	});
+				}
+            } else {
+                layer.msg('请选择日期.');
+            }
+
+        })
+
+        var page = 0, initPagination;
+        var icheckOptions = {
+            radioClass: 'icheckbox_flat-blue',
+            increaseArea: '20%'
+        }
+
+        //重置
+        $('tr.filter2 .filter-cancel').on('click', function () {
+            $('tr.filter2 , #nbbm').val('').change();
+        });
+
+        //提交
+        $('tr.filter .filter-submit').on('click', function () {
+        	var ylbGsdm=$("#ylbListGsdmId").val();
+     		var ylbFgsdm=$("#ylbListFgsdmId").val();
+            if ($("#rq").val() == "" || $("#rq").val() ==null){
+            	layer.msg('请选择日期.');
+            }else if(ylbGsdm=="" || ylbGsdm==null){
+            	layer.msg('请选择公司和分公司.');
+            }else {
+            	var params = getParamsList();
+				
+				page = 0;
+				jsDoQuery(params, true);
+            } 
+        });
+
+        function getParamsList(){
+        	  var cells = $('tr.filter')[0].cells
+              , cells1 = $('tr.filter2')[0].cells,params = {}
+              , name;
+        	 $.each(cells, function (i, cell) {
+                 var items = $('input,select', cell);
+                 for (var j = 0, item; item = items[j++];) {
+                     name = $(item).attr('name');
+                     if (name) {
+                         params[name] = $(item).val();
+                     }
+                 }
+             });
+             $.each(cells1, function (i, cell) {
+                 var items = $('input,select', cell);
+                 for (var j = 0, item; item = items[j++];) {
+                     name = $(item).attr('name');
+                     if (name) {
+                         params[name] = $(item).val();
+                     }
+                 }
+             });
+        	
+             return params;
+        }
+        
+		
+    	var xlList;
+    	var obj=[];
+		$.get('/report/lineList',function(result){
+			xlList=result;
+	    	$.get('/user/companyData', function(result){
+	    		obj = result;
+	    		var options="";
+	// 			= '<option value="">请选择</option>';
+	    		for(var i = 0; i < obj.length; i++){
+	    			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+	//     			setFgsqx(obj[i].companyCode);
+	    		}
+	    		$('#ylbListGsdmId').html(options);
+	    		updateCompany();
+	    	});
+		})
+    	$("#ylbListGsdmId").on("change",updateCompany);
+    	function updateCompany(){
+    		var company = $('#ylbListGsdmId').val();
+    		var options = '<option value="">全部分公司</option>';
+//     		= '<option value="">请选择</option>';
+    		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>';
+    				}
+    			}
+    		}
+    		$('#ylbListFgsdmId').html(options);
+    		initXl();
+    		initCl();
+    	}
+        /*
+         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+         */
+        function jsDoQuery(p, pagination) {
+            var params = {};
+            if (p)
+                params = p;
+            //更新时间排序
+            params['order'] = 'nbbm';
+            params['page'] = page;
+            params['rq'] = $("#rq").val();
+            params['type'] = '2';
+
+    		
+            var l = layer.load(2);
+            $get('/qlb/qlbList', params, function (data) {
+            
+                $.each(data, function (i, obj) {
+                    obj.rq = moment(obj.rq).format("YYYY-MM-DD");
+                });
+                var bodyHtm = template('qlb_list_temp', {list:data});
+                $('#datatable_qlb tbody').html(bodyHtm);
+                $('.btn-jsyUpdate').on('click', jsyUpdate);
+                layer.close(l);
+            	$get('/qlb/sumQlb',params,function(returns){
+            		$("#sumJzl").html(returns.jzl);
+            		$("#sumYh").html(returns.yh);
+            		$("#sumSh").html(returns.sh);
+        		});
+            	
+            });
+        }
+        
+        function jsyUpdate(){
+        	var params=getParamsList();
+			var id = $(this).data('id');
+        	var par={};
+        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+        	$get('/ylb/checkDate',par,function(status){
+        		if(status=='2'){
+           		 layer.msg('只能操作三天内数据.');
+           		}else{
+		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
+		    		console.log(id+"修改驾驶员:"+jsy);
+		    		$get('/qlb/updateJsy',{id:id,jsy:jsy}, function(result){
+						layer.msg('修改成功.');
+		                page = 0;
+		                jsDoQuery(params, true);
+					});
+           		}
+        	})
+		}
+      //页面计算防止精度丢失
+		var accAdd = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (mul(a, e) + mul(b, e)) / e;
+	    };
+
+	    var numSubtr = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (a * e - b * e) / e;
+	    };
+	    
+	    function mul(a, b) {
+	        var c = 0,
+	            d = a.toString(),
+	            e = b.toString();
+	        try {
+	            c += d.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        try {
+	            c += e.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+	    }
+
+        //改变状态
+        function startOptJzylLink(es) {
+            es.editable({
+                type: 'text',
+                placement: 'right',
+                width: 100,
+                display: false,
+                validate: function (value) {
+                    if (!value)
+                        return '值不能为空！';
+                    if (isNaN(value))
+                        return '只能为数字！';
+                    if (value < 0)
+                        return '值不能小于0！';
+                },
+                inputclass: 'form-control input-medium input-edtable-sm'
+            })
+                    .on('save', function (e, params) {
+                        $(this).text(params.newValue);
+                    });
+        }
+
+        //改变状态
+        function startOptShylLink(es) {
+            es.editable({
+                type: 'text',
+                placement: 'right',
+                width: 100,
+                display: false,
+                validate: function (value) {
+                    if (!value)
+                        return '值不能为空！';
+                    if (isNaN(value))
+                        return '只能为数字！';
+                    if (value < 0)
+                        return '值不能小于0！';
+                },
+                inputclass: 'form-control input-medium input-edtable-sm'
+            })
+                    .on('save', function (e, params) {
+                        $(this).text(params.newValue);
+                    });
+        }
+        function iCheckChange() {
+            var tr = $(this).parents('tr');
+            if (this.checked)
+                tr.addClass('row-active');
+            else
+                tr.removeClass('row-active');
+
+            /* if($('#datatable_resource input.icheck:checked').length == 1)
+             $('#removeButton').removeAttr('disabled');
+             else
+             $('#removeButton').attr('disabled', 'disabled');  */
+        }
+
+        function showPagination(data) {
+            //分页
+            $('#pagination').jqPaginator({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    if (initPagination) {
+                        initPagination = false;
+                        return;
+                    }
+
+                    var params=getParamsList();
+                    page = num - 1;
+                    jsDoQuery(params, true);
+                }
+            });
+        }
+
+
+      //删除
+        $('#removeButton').on('click', function () {
+        	var params_=getParamsList();
+        	var par={};
+        	par["rq"] = moment($("#rq").val()).subtract(2, 'days').format("YYYY-MM-DD");
+        	par["ssgsdm_like"] = $("#ylbListGsdmId").val();
+        	$get('/ylb/checkDate',par,function(status){
+        		if(status=='2'){
+           		 layer.msg('只能操作三天内数据.');
+           		}else{
+		        	var idArray = [];
+		        	var x=0;
+		        	$('input.icheck:checked').each(function(){
+		        		x++;
+		        		var map ={};
+		        		var id=$(this).data('id');
+		        		map['id']=id;
+		        	    idArray.push(map);
+		        	    
+		        	})
+			     	var params = {};
+			     	params['ids']=JSON.stringify(idArray);
+			       	 if (x==0) {
+			       		 layer.msg("请选择要删除的数据");
+			       	 }else{
+			            if(confirm('确定要删除选中的数据？')) 
+			            { 
+			            	 var i = layer.load(2);
+			            	 $post('/qlb/deleteIds', params, function (result) {
+			            		 layer.close(i);
+			            		 var params=getParamsList();
+				            	  jsDoQuery(params, true);
+			                 });
+			            } 
+			       	 }
+           		}
+        	})
+        });
+		
+		
+		$("#ylbListFgsdmId").on("change",initXl);
+		function initXl(){
+			var data=[];
+			data.push({id: " ", text: "全部线路"});
+			if(fage){
+				$("#xlbm").select2("destroy").html('');
+			}
+			var fgs=$('#ylbListFgsdmId').val();
+			var gs=$('#ylbListGsdmId').val();
+			for(var i=0;i<xlList.length;i++){
+				if(gs!=""){
+					if(fgs!=""){
+						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}else{
+						if(xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}
+				}
+			}
+			initPinYinSelect2('#xlbm',data,'');
+			fage=true;
+		}
+        	$("#xlbm").on("change",initCl);
+        	function initCl(){
+        	$('#nbbm').select2({
+                placeholder: '搜索车辆...',
+                ajax: {
+                    url: '/report/carList',
+                    dataType: 'json',
+                    delay: 150,
+                    data: function (params) {
+                        return {nbbm: params.term,
+                        	    gsbm:$('#ylbListGsdmId').val(),
+                        	    fgsbm:$('#ylbListFgsdmId').val(),
+                        	    xlbm:$('#xlbm').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>';
+                    }
+                }
+            });
+        	}
+//         }
+        
+
+//导出
+
+        $("#export").on("click", function () {
+            if ($("#rq").val() != "") {
+				 var params=getParamsList();
+		   		 params['type']='2';
+                $post('/qlb/listExport', params, function (result) {
+                    window.open("/downloadFile/download?fileName="+$("#rq").val()+"进出场存氢量" );
+                });
+            } else {
+                layer.msg('请选择日期.');
+            }
+        });
+
+    });
+</script>
 \ No newline at end of file
+<style>
+.blue{
+	background-color: #87CEFF
+}
+</style>
+<div class="page-head">
+    <div class="page-title">
+        <h1>车辆加油量</h1>
+    </div>
+</div>
+<ul class="page-breadcrumb breadcrumb">
+    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">油量信息查询</span> <i class="fa fa-circle"></i></li>
+    <li><span class="active">车辆加油量</span></li>
+</ul>
+
+<div class="row" id="ll_oil_list">
+    <div class="col-md-12">
+        <!-- Begin: life time stats -->
+        <div class="portlet light portlet-fit portlet-datatable bordered">
+            <div class="portlet-title">
+                <div class="caption">
+                    <i class="fa fa-fire-extinguisher"></i> <span
+                        class="caption-subject font-dark sbold uppercase">车辆加油量</span>
+                </div>
+                <div class="actions">
+					<button type="button" class="btn btn-circle blue" id="upload"><i class="fa fa-file-excel-o"></i>
+						导入Excel
+					</button>
+					<!--<button type="button" class="btn btn-circle blue" id="export"><i class="fa fa-file-excel-o"></i>
+						导出Excel
+					</button>-->
+                </div>
+            </div>
+            <div class="portlet-body">
+                <div class="table-container" style="margin-top: 0px">
+                    <table
+                            class="table table-striped table-bordered table-hover table-checkable"
+                            id="datatable_dlb">
+                        <thead>
+
+                        <tr role="row" class="heading">
+                            <th width="5%">#</th>
+                            <th width="15%">日期</th>
+                            <th width="15%">内部编码</th>
+                            <th width="15%">加油量</th>
+                            <th width="15%">加油站</th>
+                            <th width="15%">油号</th>
+                            <th width="20%">备注</th>
+                        </tr>
+                        <tr role="row" class="filter">
+                            <td></td>
+                            <td>
+                                <input type="text" style="width: 100px" name="rq" id="rq"/>
+                            </td>
+                            <!--<td>
+                                <select class="form-control" name="nbbm" id="nbbm" style="width: 120px;"></select>
+                            </td>-->
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td>
+                                <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">
+                                    <i class="fa fa-search"></i> 搜索
+                                </button>
+                                <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px">
+                                    <i class="fa fa-times"></i> 重置
+                                </button>
+                                <!--                                 <button class="btn btn-danger btn-sm red" id="del" style="margin-right:0px"> -->
+                                <!--                                     <i class="fa fa-times"></i> 删除 -->
+                                <!--                                 </button> -->
+                            </td>
+                        </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
+                    <div style="text-align: right;">
+                        <ul id="pagination" class="pagination"></ul>
+                    </div>
+                </div>
+            </div>
+			<div class="portlet-body">
+				<div id="modules_tree"></div>
+			</div>
+        </div>
+    </div>
+</div>
+
+
+<script src="/assets/js/ajaxfileupload/ajaxfileupload.js"></script>
+<script>
+    $(function () {
+
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+
+        $("#rq").datetimepicker({
+            format: 'YYYY-MM-DD',
+            locale: 'zh-cn'
+        });
+        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;
+        $("#rq").val(year + "-" + month + "-" + day);
+        var page = 0, initPagination;
+        var icheckOptions = {
+            radioClass: 'iradio_square-blue icheck',
+            increaseArea: '20%'
+        }
+
+        //重置
+        $('tr.filter .filter-cancel').on('click', function () {
+            $('tr.filter input, select').val('').change();
+        });
+
+        //提交
+        $('tr.filter .filter-submit').on('click', function () {
+            if ($("#rq").val() == "" || $("#rq").val() ==null){
+            	  layer.msg('请选择日期.');
+            }else {
+
+                var params = getParams();
+
+                page = 0;
+                jsDoQuery(params, true);
+            }
+        });
+
+
+    	$.get('/user/companyData', function(result){
+    		obj = result;
+    		var options="";
+// 			= '<option value="">请选择</option>';
+    		for(var i = 0; i < obj.length; i++){
+    			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+//     			setFgsqx(obj[i].companyCode);
+    		}
+    		$('#gsbm').html(options);
+    		updateCompany();
+    	});
+
+    	$("#gsbm").on("change",updateCompany);
+    	function updateCompany(){
+    		var company = $('#gsbm').val();
+    		var options ="";
+//     		= '<option value="">请选择</option>';
+    		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>';
+    				}
+    			}
+    		}
+    		$('#fgsbm').html(options);
+    	}
+        /*
+         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+         */
+        function jsDoQuery(p, pagination) {
+            var params = {};
+            if (p)
+                params = p;
+            params['order'] = 'nbbm';
+            params['page'] = page;
+            params['rq'] = $("#rq").val();
+
+            var j = layer.load(2);
+            $get('/ylxxb/query', params, function (data) {
+                $.each(data.dataList, function (i, obj) {
+                    obj.rq = moment(obj.rq).format("YYYY-MM-DD");
+                });
+                var bodyHtm = template('jyl_list', {list:data.dataList});
+
+                $('#datatable_dlb tbody').html(bodyHtm)
+                        .find('.icheck').iCheck(icheckOptions)
+                        .on('ifChanged', iCheckChange);
+                if (pagination && data.dataList.length > 0) {
+                    //重新分页
+                    initPagination = true;
+                    showPagination(data);
+                	$('#pagination').show();
+                } else if(data.dataList.length == 0){
+                	$('#pagination').hide();
+                }
+
+                layer.close(j);
+
+                startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
+            });
+        }
+
+        //改变状态
+        function startOptJzylLink(es) {
+            es.editable({
+                type: 'text',
+                placement: 'right',
+                width: 100,
+                display: false,
+                validate: function (value) {
+                    if (!value)
+                        return '值不能为空！';
+                    if (isNaN(value))
+                        return '只能为数字！';
+                    if (value < 0)
+                        return '值不能小于0！';
+                },
+                inputclass: 'form-control input-medium input-edtable-sm'
+            }).on('save', function (e, params) {
+				$(this).text(params.newValue);
+			});
+        }
+
+        function iCheckChange() {
+            var tr = $(this).parents('tr');
+            if (this.checked)
+                tr.addClass('row-active');
+            else
+                tr.removeClass('row-active');
+
+            /* if($('#datatable_resource input.icheck:checked').length == 1)
+             $('#removeButton').removeAttr('disabled');
+             else
+             $('#removeButton').attr('disabled', 'disabled');  */
+        }
+
+        function showPagination(data) {
+            //分页
+            $('#pagination').jqPaginator({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    if (initPagination) {
+                        initPagination = false;
+                        return;
+                    }
+                    
+                    var params = getParams();
+                    
+                    page = num - 1;
+                    jsDoQuery(params, true);
+                }
+            });
+        }
+
+
+        //删除
+        $('#del').on('click', function () {
+            if ($(this).attr('disabled'))
+                return;
+
+            var id = $('input.icheck:checked').data('id');
+            removeConfirm('确定要删除选中的数据？', '/resource/' + id, function () {
+                $('tr.filter .filter-submit').click();
+            });
+        });
+
+        //搜索线路
+       	$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			initPinYinSelect2('#xlbm',data,'');
+			
+		});
+
+        $('#nbbm').select2({
+            placeholder: '搜索车辆...',
+            ajax: {
+                url: '/realSchedule/sreachVehic',
+                dataType: 'json',
+                delay: 150,
+                data: function (params) {
+                    return {nbbm: params.term};
+                },
+                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>';
+                }
+            }
+        })
+
+        //导入
+        $("#upload").on("click", function(){
+        	$.get('upload.html', function(m){$(pjaxContainer).append(m);});
+        });
+
+		//导出
+        $("#export").on("click", function () {
+            if ($("#rq").val() != "") {
+            	var gsbm=$("#gsbm").val();
+         		var fgsbm=$("#fgsbm").val();
+            	if(gsbm=="" || gsbm==null || fgsbm=="" ||fgsbm==null){
+					layer.msg('请选择公司和分公司.');
+					return;
+				}
+				var params = getParams();
+                
+				params["type"] = "export";
+				$get('/jdl/query', params, function (result) {
+					window.open("/downloadFile/download?fileName=车辆充电量" + moment($("#rq").val()).format("YYYYMMDD"));
+				});
+            } else {
+                layer.msg('请选择日期.');
+            }
+        });
+		
+		function getParams(){
+            var cells = $('tr.filter')[0].cells
+                    , params = {}
+                    , name;
+            $.each(cells, function (i, cell) {
+                var items = $('input,select', cell);
+                for (var j = 0, item; item = items[j++];) {
+                    name = $(item).attr('name');
+                    if (name) {
+                        params[name] = $(item).val();
+                    }
+                }
+            });
+			return params;
+		};
+
+    });
+
+</script>
+
+<script id="jyl_list" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td style="vertical-align: middle;">
+            <!-- <input type="radio" name="id" class="group-checkable icheck" data-id="{{obj.id}}"> -->
+			{{i + 1}}
+        </td>
+        <td>{{obj.rq}}</td>
+        <td>{{obj.nbbm}}</td>
+        <td>{{obj.jzl}}</td>
+		<td>{{obj.stationid}}</td>
+        <td>{{obj.yh}}</td>
+        <td>{{obj.bz}}</td>
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan=9><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
 \ No newline at end of file
+<div class="modal fade" id="uploadFile" tabindex="-1" role="basic"
+	aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true"></button>
+				<h4 class="modal-title">导入Excel</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" role="form" id="excelFile" method="post"
+						action="" enctype="multipart/form-data">
+					<input type="hidden" name="groupType" value="3">
+					<div class="alert alert-danger display-hide">
+						<button class="close" data-close="alert"></button>
+						您的输入有误，请检查下面的输入项
+					</div>
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label">选择文件</label>
+							<div class="col-md-9">
+								<input type="file" name="file" id="file"
+									accept="application/vnd.ms-excel"/>
+								<input type=hidden name="gsbm_" id="gsbm_">
+								<input type="hidden" name="gsName" id="gsName">
+<!-- 								<input type="hidden" name="fgsbm_" id="fgsbm_"> -->
+<!-- 								<input type="hidden" name="fgsName" id="fgsName"> -->
+							</div>
+						</div>
+					</div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" id="downLoad">下载模板</button>
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary" id="submit">确认导入</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script id="res_tbody_temp" type="text/html">
+
+</script>
+<script data-exclude=1>
+	$(function() {
+		var form = $('#excelFile');
+		var error = $('.alert-danger', form);
+		
+		$('#gsbm_').val($("select[name=gsdm_like]").val());
+		$('#gsName').val($("select[name=gsdm_like]").find("option:selected").text());
+// 		$('#fgsbm_').val($("#fgsbm").val());
+// 		$('#fgsName').val($("#fgsbm").find("option:selected").text());
+		
+		//modal 显示事件
+		$('#uploadFile').on('show.bs.modal', function(){
+		})
+		.modal('show');
+		
+		//提交
+// 		$('#submit').on('click', function() {
+// 			form.submit();
+// 		});
+		
+		$('#submit').on('click', function() {
+            var j = layer.load(2);
+			var param = {};
+			param.uploadDir = 'upload';
+			param["gsbm_"] = $('#gsbm_').val();
+			param["gsName"] = $('#gsName').val();
+// 			param["fgsbm_"] = $('#fgsbm_').val();
+// 			param["fgsName"] = $('#fgsName').val();
+			$.ajaxFileUpload({
+				url : '/ylxxb/uploadFile',
+				secureuri : false,
+				fileElementId : 'file',
+				dataType : 'json',
+				data : param,
+				success : function(data) {
+	                layer.close(j);
+					alert(data.result);
+// 					alert("文件导入成功");
+					$('#uploadFile').modal('hide');
+					$('tr.filter .filter-submit').click();
+				},
+				error : function(data, status, e) {
+	                layer.close(j);
+					alert("文件导入失败");
+				}
+			})
+		});
+		
+		$('#downLoad').on('click', function(){
+			window.open("/downloadFile/downloadModel?fileName=车辆加油");
+		});
+		
+		function getCurrSelNode(){
+			return $.jstree.reference("#modules_tree").get_selected(true);
+		}
+	});
+</script>
 \ No newline at end of file
+<style>
+.blue{
+	background-color: #87CEFF
+}
+.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>
+<ul class="page-breadcrumb breadcrumb">
+    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">报表管理</span> <i class="fa fa-circle"></i></li>
+    <li><span class="active">路线生产月报同比</span></li>
+</ul>
+
+<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;">
+                        <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: 15px;">
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
+                        <input class="form-control" type="text" id="dateS" style="width: 180px;"/>
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="dateE" style="width: 180px;"/>
+                       <!-- <input class="btn btn-default" type="button" id="czcl" value="X"/>-->
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="筛选"/>
+                    </div>
+                    <div class="form-group" style="float:right;">
+                        <button type="button" class="btn btn-circle blue" id="export"><i class="fa fa-file-excel-o"></i>
+                            导出Excel
+                        </button>
+                    </div>
+                </form>
+            </div>
+            <div class="portlet-body">
+                <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+                    <table class="table table-striped table-bordered table-hover table-checkable" id="datatable_xlybtb">
+                        <thead>
+                        <tr>
+                            <th colspan="40">线路生产月报同比</th>
+                        </tr>
+                        <tr>
+                            <td rowspan="2">线路</td>
+                            <td rowspan="2">线路长度</td>
+                            <td colspan="5">线路营运人次（次）</td>
+                            <td colspan="6">线路营业收入（元）</td>
+                            <td colspan="7">线路行驶公里（公里）</td>
+                            <td colspan="5">班次</td>
+                            <td colspan="3">空驶公里</td>
+                        </tr>
+                        <tr>
+                            <td >计划</td>
+                            <td>实际</td>
+                            <td rowspan="2">去年同期</td>
+                            <td rowspan="2">同比%(+,-)</td>
+                            <td rowspan="2">计划完成%</td>
+                            <td rowspan="2">计划</td>
+                            <td rowspan="2">实际</td>
+                            <td rowspan="2">去年同期</td>
+                            <td rowspan="2">同比%(+,-)</td>
+                            <td rowspan="2">元/百公里</td>
+                            <td rowspan="2">计划完成%</td>
+                            <td rowspan="2">计划</td>
+                            <td rowspan="2">柴油</td>
+                            <td rowspan="2">纯电</td>
+                            <td rowspan="2">氢燃料</td>
+                            <td rowspan="2">去年同期</td>
+                            <td rowspan="2">同比%(+,-)</td>
+                            <td rowspan="2">计划完成%</td>
+                            <td rowspan="2">计划</td>
+                            <td rowspan="2">实际</td>
+                            <td rowspan="2">去年同期</td>
+                            <td rowspan="2">同比%(+,-)</td>
+                            <td rowspan="2">计划完成%</td>
+                            <td rowspan="2">实际</td>
+                            <td rowspan="2">去年同期</td>
+                            <td rowspan="2">同比%(+,-)</td>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        </tbody>
+                    </table>
+                    <div style="text-align: right;">
+                    <ul id="pagination" class="pagination"></ul>
+                </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="/assets/js/ajaxfileupload/ajaxfileupload.js"></script>
+<script>
+    $(function () {
+        //日期插件
+        $("#dateS").datetimepicker({
+            format : 'YYYY-MM',
+            locale : 'zh-cn'
+        });
+        $("#dateE").datetimepicker({
+            format : 'YYYY-MM',
+            locale : 'zh-cn'
+        });
+        //线路下拉列表
+        $.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"]});
+                            }
+                        }
+                    }
+                }
+                initPinYinSelect2('#line',data,'');
+            });
+        });
+        //重置
+/*        $('#czcl').on('click', function () {
+            $('#code').val('').change();
+        });*/
+
+        $("#query").on("click",function(){
+
+            var params =getParams();
+            page = 0;
+            jsDoQuery(params, true);
+        });
+
+
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+
+        var icheckOptions = {
+            radioClass: 'iradio_square-blue icheck',
+            increaseArea: '20%'
+        }
+
+        /*
+         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+         */
+        function jsDoQuery(params, pagination) {
+            params['page'] = page;
+            
+            var j = layer.load(2);
+            $get('/xlybtb/query', params, function (data) {
+                $.each(data.dataList, function (i, obj) {
+                    obj.date = moment(obj.date).format("YYYY-MM-DD");
+                });
+                var bodyHtm = template('xlybtb_list', {list:data.dataList});
+                $('#datatable_xlybtb tbody').html(bodyHtm)
+                        .find('.icheck').iCheck(icheckOptions)
+                        .on('ifChanged', iCheckChange);
+                if (pagination && data.dataList.length > 0) {
+                    //重新分页
+                    initPagination = true;
+                    showPagination(data);
+                	$('#pagination').show();
+                } else if(data.dataList.length == 0){
+                	$('#pagination').hide();
+                }
+                
+                layer.close(j);
+
+            });
+        }
+
+        function getParams(){
+            var dateS = $("#dateS").val();
+            var dateE = $("#dateE").val();
+            if(dateS==""||dateS==null||dateE==""||dateE==null){
+                layer.msg('请选择日期.');
+                return;
+            }
+            dateS+="-01"
+            dateE+="-31"
+            var params = {'dateS':dateS,'dateE':dateE};
+            return params;
+        };
+
+        //分页插件
+        var page = 0, initPagination;
+        function showPagination(data) {
+            console.log(data.totalPages);
+            //分页
+            $('#pagination').jqPaginator({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    if (initPagination) {
+                        initPagination = false;
+                        return;
+                    }
+
+                    var params = getParams();
+
+                    page = num - 1;
+                    jsDoQuery(params, true);
+                }
+            });
+        }
+
+        function iCheckChange() {
+            var tr = $(this).parents('tr');
+            if (this.checked)
+                tr.addClass('row-active');
+            else
+                tr.removeClass('row-active');
+        }
+
+
+        //导入
+        $("#upload").on("click", function(){
+            $.get('upload.html', function(m){$(pjaxContainer).append(m);});
+        });
+
+		//导出
+        $("#export").on("click", function () {
+            var params = getParams();
+            params["type"] = "export";
+            $get('/xlybtb/query', params, function (result) {
+                console.log(result);
+                if(result.code=='00'){
+                    window.open("/downloadFile/download?fileName=路线生产月报同比表" /*+ moment($("#rq").val()).format("YYYYMMDD")*/);
+                }else {
+                    alert(result.msg);
+                }
+
+            });
+        });
+		
+
+
+    });
+
+</script>
+
+<script id="xlybtb_list" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td>{{obj.xl}}</td>
+        <td>{{obj.xlcd}}</td>
+
+        <td>{{obj.rcjh}}</td>
+        <td>{{obj.rcsj}}</td>
+        <td>{{obj.rctq}}</td>
+        <td>{{obj.rctb}}</td>
+        <td>{{obj.rcjhwc}}</td>
+
+        <td>{{obj.ysjh}}</td>
+        <td>{{obj.yssj}}</td>
+        <td>{{obj.ystq}}</td>
+        <td>{{obj.ystb}}</td>
+        <td>{{obj.ysybgl}}</td>
+        <td>{{obj.ysjhwc}}</td>
+
+        <td>{{obj.lcjh}}</td>
+        <td>{{obj.lccy}}</td>
+        <td>{{obj.lccd}}</td>
+        <td>{{obj.lcqrl}}</td>
+        <td>{{obj.lctq}}</td>
+        <td>{{obj.lctb}}</td>
+        <td>{{obj.lcjhwc}}</td>
+
+        <td>{{obj.bcjh}}</td>
+        <td>{{obj.bcsj}}</td>
+        <td>{{obj.bctq}}</td>
+        <td>{{obj.bctb}}</td>
+        <td>{{obj.bcjhwc}}</td>
+
+        <td>{{obj.kssj}}</td>
+        <td>{{obj.kstq}}</td>
+        <td>{{obj.kstb}}</td>
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan=9><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
 \ No newline at end of file
+<style>
+.blue{
+	background-color: #87CEFF
+}
+</style>
+<div class="page-head">
+    <div class="page-title">
+        <h1>路线生产月报台账</h1>
+    </div>
+</div>
+<ul class="page-breadcrumb breadcrumb">
+    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">报表管理</span> <i class="fa fa-circle"></i></li>
+    <li><span class="active">路线生产月报台账</span></li>
+</ul>
+
+<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;">
+                        <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: 15px;">
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
+                        <input class="form-control" type="text" id="dateS" style="width: 180px;"/>
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="dateE" style="width: 180px;"/>
+                        <!--<input class="btn btn-default" type="button" id="czcl" value="X"/>-->
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="筛选"/>
+                    </div>
+                    <div class="form-group" style="float:right;">
+                        <button type="button" class="btn btn-circle blue" id="upload"><i class="fa fa-file-excel-o"></i>
+                            导入Excel
+                        </button>
+                        <button type="button" class="btn btn-circle blue" id="export"><i class="fa fa-file-excel-o"></i>
+                            生成台账
+                        </button>
+                    </div>
+                </form>
+            </div>
+            <div class="portlet-body">
+                <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+                    <table class="table table-striped table-bordered table-hover table-checkable" id="datatable_xlybtz">
+                        <thead>
+                        <tr>
+                            <th>序号</th>
+                            <th>日期</th>
+                            <th>车队</th>
+                            <th>线路名</th>
+                            <th>人次</th>
+                            <th>金额</th>
+                            <th>支付方式</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        </tbody>
+                    </table>
+                    <div style="text-align: right;">
+                    <ul id="pagination" class="pagination"></ul>
+                </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="/assets/js/ajaxfileupload/ajaxfileupload.js"></script>
+<script>
+    $(function () {
+        //日期插件
+        $("#dateS").datetimepicker({
+            format : 'YYYY-MM',
+            locale : 'zh-cn'
+        });
+        $("#dateE").datetimepicker({
+            format : 'YYYY-MM',
+            locale : 'zh-cn'
+        });
+        //线路下拉列表
+        $.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"]});
+                            }
+                        }
+                    }
+                }
+                initPinYinSelect2('#line',data,'');
+            });
+        });
+        //重置
+        $('#czcl').on('click', function () {
+            $('#code').val('').change();
+        });
+
+        $("#query").on("click",function(){
+
+            var params =getParams();
+            page = 0;
+            jsDoQuery(params, true);
+        });
+
+
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+
+        var icheckOptions = {
+            radioClass: 'iradio_square-blue icheck',
+            increaseArea: '20%'
+        }
+
+        /*
+         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+         */
+        function jsDoQuery(params, pagination) {
+            params['page'] = page;
+            
+            var j = layer.load(2);
+            $get('/xlybtz/query', params, function (data) {
+                $.each(data.dataList, function (i, obj) {
+                    obj.date = moment(obj.date).format("YYYY-MM-DD");
+                });
+                var bodyHtm = template('xlybtz_list', {list:data.dataList});
+                $('#datatable_xlybtz tbody').html(bodyHtm)
+                        .find('.icheck').iCheck(icheckOptions)
+                        .on('ifChanged', iCheckChange);
+                if (pagination && data.dataList.length > 0) {
+                    //重新分页
+                    initPagination = true;
+                    showPagination(data);
+                	$('#pagination').show();
+                } else if(data.dataList.length == 0){
+                	$('#pagination').hide();
+                }
+                
+                layer.close(j);
+
+                /*startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));*/
+            });
+        }
+
+        function getParams(){
+            var dateS = $("#dateS").val();
+            var dateE = $("#dateE").val();
+            if(dateS==""||dateS==null||dateE==""||dateE==null){
+                layer.msg('请选择日期.');
+                return;
+            }
+            dateS+="-01"
+            dateE+="-31"
+            var params = {'dateS':dateS,'dateE':dateE};
+            return params;
+        };
+
+        //分页插件
+        var page = 0, initPagination;
+        function showPagination(data) {
+            console.log(data.totalPages);
+            //分页
+            $('#pagination').jqPaginator({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    if (initPagination) {
+                        initPagination = false;
+                        return;
+                    }
+
+                    var params = getParams();
+
+                    page = num - 1;
+                    jsDoQuery(params, true);
+                }
+            });
+        }
+
+        function iCheckChange() {
+            var tr = $(this).parents('tr');
+            if (this.checked)
+                tr.addClass('row-active');
+            else
+                tr.removeClass('row-active');
+        }
+
+     /*   $("#export").on("click",function(){
+            var type = "export";
+            $get('/realSchedule/account', {line:line,date:date,code:code,xlName:xlName,type:type}, function(result){
+                window.open("/downloadFile/download?fileName="
+                    +moment(date).format("YYYYMMDD")
+                    +"-"+xlName+"-驾驶员请求台账");
+            });
+        });*/
+
+        //导入
+        $("#upload").on("click", function(){
+            $.get('upload.html', function(m){$(pjaxContainer).append(m);});
+        });
+
+		//导出
+        $("#export").on("click", function () {
+            var params = getParams();
+            params["type"] = "export";
+            $get('/xlybtz/query', params, function (result) {
+                console.log(result);
+                if(result.code=='00'){
+                    window.open("/downloadFile/download?fileName=路线生产月报台账" /*+ moment($("#rq").val()).format("YYYYMMDD")*/);
+                }else {
+                    alert(result.msg);
+                }
+
+            });
+        });
+		
+
+
+    });
+
+</script>
+
+<script id="xlybtz_list" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td style="vertical-align: middle;">
+            {{i + 1}}
+        </td>
+        <td>{{obj.date}}</td>
+        <td>{{obj.convoy}}</td>
+        <td>{{obj.lineName}}</td>
+        <td>{{obj.count}}</td>
+        <td>{{obj.amount}}</td>
+        <td>{{obj.payType}}</td>
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan=9><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
 \ No newline at end of file
+<div class="modal fade" id="uploadFile" tabindex="-1" role="basic"
+	aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true"></button>
+				<h4 class="modal-title">导入Excel</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" role="form" id="excelFile" method="post"
+						action="" enctype="multipart/form-data">
+					<input type="hidden" name="groupType" value="3">
+					<div class="alert alert-danger display-hide">
+						<button class="close" data-close="alert"></button>
+						您的输入有误，请检查下面的输入项
+					</div>
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label">选择日期</label>
+							<div class="col-md-3">
+								<input class="form-control" type="text" id="date" style="width: 180px;"/>
+							</div>
+						</div>
+						<div class="form-group">
+							<label class="col-md-3 control-label">选择类型</label>
+							<div class="col-md-3">
+								<select class="form-control" name="reportType" id="reportType" >
+									<option value="1">票务</option>
+									<option value="2">二维码</option>
+									<option value="3">申城通</option>
+									<option value="4">实体卡</option>
+									<option value="5">保通卡</option>
+								</select>
+							</div>
+						</div>
+						<div class="form-group">
+							<label class="col-md-3 control-label">选择文件</label>
+							<div class="col-md-9">
+								<input type="file" name="file" id="file" accept="application/vnd.ms-excel"/>
+							</div>
+						</div>
+					</div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<!--<button type="button" class="btn default" id="downLoad">下载模板</button>-->
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary" id="submit">确认导入</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script id="res_tbody_temp" type="text/html">
+
+</script>
+<script data-exclude=1>
+	$(function() {
+		//日期插件
+		var d = new Date();
+		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',
+			maxDate : dateTime
+		});
+		$("#date").val(dateTime);
+		//modal 显示事件
+		$('#uploadFile').on('show.bs.modal', function(){}).modal('show');
+		$('#submit').on('click', function() {
+			layer.confirm('若已导入将覆盖原数据!', {
+				btn : [ '确认提交', '取消' ]
+			},function () {
+				layer.close(layer.index);
+				var j = layer.load(2);
+				var reportType=$('#reportType').val();
+				var date = $("#date").val();
+				if(date==""||date==null){
+					layer.msg('请选择日期.');
+					return;
+				}
+				var param = {'reportType':reportType,'date':date};
+				param.uploadDir = 'upload';
+				$.ajaxFileUpload({
+					url : '/xlybtz/uploadFile',
+					secureuri : false,
+					fileElementId : 'file',
+					dataType : 'json',
+					data : param,
+					success : function(data) {
+						layer.close(j);
+						alert(data.result);
+						$('#uploadFile').modal('hide');
+						$('tr.filter .filter-submit').click();
+					},
+					error : function(data, status, e) {
+						console.log(data);
+						layer.close(j);
+						alert("文件导入失败");
+					}
+				})
+			});
+		});
+		
+		$('#downLoad').on('click', function(){
+			window.open("/downloadFile/downloadModel?fileName=票务数据导入模板");
+		});
+	});
+</script>
 \ No newline at end of file
@@ -283,6 +283,20 @@
                     </div>
                 </div>
+                <div class="form-group">
+                    <label class="col-md-2 control-label">是否混合电车：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.busInfoForDetail.sfmix" disabled="true" dicgroup="truefalseType" name="sfmix"></sa-Radiogroup>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">是否氢能源车：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.busInfoForDetail.hydrogen" disabled="true" dicgroup="truefalseType" name="hydrogen"></sa-Radiogroup>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label class="col-md-2 control-label">备注：</label>
@@ -456,6 +456,13 @@
                 </div>
                 <div class="form-group">
+                    <label class="col-md-2 control-label">是否氢能源车：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.busInfoForSave.hydrogen" dicgroup="truefalseType" name="hydrogen"></sa-Radiogroup>
+                    </div>
+                </div>
+
+                <div class="form-group">
                     <label class="col-md-2 control-label">备注：</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"
@@ -448,6 +448,13 @@
                 </div>
                 <div class="form-group">
+                    <label class="col-md-2 control-label">是否氢能源车：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.busInfoForSave.hydrogen" dicgroup="truefalseType" name="hydrogen"></sa-Radiogroup>
+                    </div>
+                </div>
+
+                <div class="form-group">
                     <label class="col-md-2 control-label">备注：</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"