1.录单明细月年报表修改

2.线路版本修改增加版本名称

1.录单明细月年报表修改
2.线路版本修改增加版本名称
游瑞烽
1 parent c2f9e8ab
Showing 9 changed files with 211 additions and 220 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/repository/LineVersionsRepository.java
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/resources/static/pages/base/lineversions/edit.html
src/main/resources/static/pages/base/lineversions/js/lineversions-edit-from.js
src/main/resources/static/pages/forms/calc/calcDetailMonthly.html
src/main/resources/static/pages/forms/calc/calcDetailYear.html
@@ -71,6 +71,8 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     GpsDataLoaderThread gpsDataLoader;
+    @Autowired
+    RfidDataLoaderThread rfidDataLoader;
     @Autowired
     OfflineMonitorThread offlineMonitorThread;
@@ -36,9 +36,9 @@ public interface LineVersionsRepository extends BaseRepository&lt;LineVersions, Int
 	@Transactional
 	@Modifying
 	@Query(value = "UPDATE LineVersions lv set lv.line=?2, lv.lineCode=?3, lv.startDate=?4, lv.endDate=?5, "
-			+ "lv.versions=?6, lv.status=?7, lv.remark=?8 where lv.id=?1")
+			+ "lv.versions=?6, lv.status=?7, lv.remark=?8, lv.name=?9 where lv.id=?1")
 	public int update(Integer id, Line line, String lineCode, Date startDate, Date endDate, Integer versions, Integer status,
-			String remark);
+			String remark,String name);
 	/**
 	 * 查询待更新线路的线路版本
@@ -74,17 +74,17 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	//按照时间段统计，公司下线路 (驾驶员)
-	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% order by c.jGh,c.xl,c.rq")
-	List<CalcWaybill> scheduleByJsy2(String line,String date,String date2,String gsdm,String fgsdm);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) order by c.jGh,c.fgsdm,c.xl,c.rq")
+	List<CalcWaybill> scheduleByJsy2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm);
 	//按照时间段统计，公司下线路 (售票员) coalesce(c.sGh,'')
-	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and c.sGh <> null  and c.sGh <> '' order by c.sGh,c.xl,c.rq")
-	List<CalcWaybill> scheduleBySpy2(String line,String date,String date2,String gsdm,String fgsdm);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) and c.sGh <> null  and c.sGh <> '' order by c.sGh,c.fgsdm,c.xl,c.rq")
+	List<CalcWaybill> scheduleBySpy2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm);
 	//按照时间段统计，公司下线路 (车辆自编号)
-	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% order by c.cl,c.xl,c.rq")
-	List<CalcWaybill> scheduleByZbh2(String line,String date,String date2,String gsdm,String fgsdm);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) order by c.cl,c.fgsdm,c.xl,c.rq")
+	List<CalcWaybill> scheduleByZbh2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm);
 	//按照时间段统计，公司下线路 排序不同
-	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1%  and c.rqStr between ?2 and ?3  and c.gsdm like %?4% and c.fgsdm like %?5% order by c.xl,c.rq")
-	List<CalcWaybill> scheduleByDateAndLineTjPx(String line,String date,String date2,String gsdm,String fgsdm);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) order by c.fgsdm,c.xl,c.rq")
+	List<CalcWaybill> scheduleByDateAndLineTjPx(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm);
 	//按照时间段统计，单条线路 排序不同
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl = ?1  and c.rqStr between ?2 and ?3 order by c.xl,c.rq")
 	List<CalcWaybill> scheduleByDateAndLineTjPx2(String line,String date,String date2);
 package com.bsth.service.calc.impl;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.Map.Entry;
-
-import javax.transaction.Transactional;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
@@ -21,7 +11,6 @@ import com.bsth.entity.calc.CalcLineMileage;
 import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.entity.calc.CalcWaybillDetail;
-import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -42,12 +31,10 @@ import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.report.ReportService;
 import com.bsth.util.Arith;
-import com.bsth.util.BatchSaveUtils;
 import com.bsth.util.ReportUtils;
 import com.github.stuxuhai.jpinyin.PinyinException;
 import com.github.stuxuhai.jpinyin.PinyinFormat;
 import com.github.stuxuhai.jpinyin.PinyinHelper;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,6 +44,14 @@ 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.*;
+
 /**
  * Created by 17/11/16.
  */
@@ -1810,17 +1805,41 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	@Override
 	public List<List<String>> calcDetailMonthly(Map<String, Object> map) {
-		String gsdm="";
+//		String gsdm="";
+//		if(map.get("gsdm")!=null){
+//			gsdm=map.get("gsdm").toString().trim();
+//		}
+//		String fgsdm="";
+//		if(map.get("fgsdm")!=null){
+//			fgsdm=map.get("fgsdm").toString().trim();
+//		}
+		List<String> gsdm= new ArrayList<>();
+		String gsdmStr = "";
 		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString().trim();
+			gsdmStr = map.get("gsdm").toString().trim();
+			String[] gsdms = gsdmStr.split(",");
+			for (int i = 0; i < gsdms.length; i++){
+				gsdm.add(gsdms[i]);
+			}
 		}
-		String fgsdm="";
+		List<String> fgsdm= new ArrayList<>();
+		String fgsdmStr = "";
 		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString().trim();
+			fgsdmStr = map.get("fgsdm").toString().trim();
+			String[] fgsdms = fgsdmStr.split(",");
+			for (int i = 0; i < fgsdms.length; i++){
+				fgsdm.add(fgsdms[i]);
+			}
 		}
-		String line="";
+//		String line= null;
+		List<String> line= new ArrayList<>();
+		String lineStr = "";
 		if(map.get("lineCode")!=null){
-			line=map.get("lineCode").toString().trim();
+			lineStr = map.get("lineCode").toString().trim();
+			String[] lines = lineStr.split(",");
+			for (int i = 0; i < lines.length; i++){
+				line.add(lines[i]);
+			}
 		}
 		String startDate="";
 		if(map.get("startDate")!=null){
@@ -1830,10 +1849,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		if(map.get("endDate")!=null){
 			endDate=map.get("endDate").toString().trim();
 		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString().trim();
-		}
 		String type="";
 		if(map.get("type")!=null){
 			type=map.get("type").toString().trim();
@@ -1846,6 +1861,18 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		if(map.get("itemDetails")!=null){
 			itemDetails=map.get("itemDetails").toString().trim();
 		}
+//		Boolean item=false;
+		/*String item="";
+		if(map.get("item")!=null){
+			if("dh".equals(map.get("item").toString().trim()))
+				item=" where c.sfdc = 1";
+//				item=false;
+			else if ("dh".equals(map.get("item").toString().trim()))
+				item=" where c.sfdc = 0";
+//				item=true;
+			else
+				item="";
+		}*/
 		String timeType=map.get("timeType").toString().trim();
 		List<List<String>> resList = new ArrayList<>();
@@ -1871,7 +1898,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			day2 = Integer.parseInt(endDate.substring(5,7));
 			for(int i=day; i<=day2; i++){
 				Map<String, CalcWaybillDetail> daym = new HashMap<>();
-				daym.put(startDate.substring(0,7),this.initCalcWaybillDetail());
+				daym.put(startDate.substring(0,5)+(i<10?"0"+i:i),this.initCalcWaybillDetail());
 				dayList.add(daym);
 			}
 			startDate += "-01";
@@ -1917,14 +1944,14 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		// 把油量和电量数据查出来，封装成Map，计算时直接取
 		if(flag != 2 ){
 			String linesql="";
-			if(!line.equals("")){
-				linesql +=" and xlbm ='"+line+"' ";
+			if(!lineStr.equals("")){
+				linesql +=" and xlbm in("+lineStr+") ";
 			}
-			if(!gsdm.equals("")){
-				linesql +=" and ssgsdm ='"+gsdm+"' ";
+			if(!gsdmStr.equals("")){
+				linesql +=" and ssgsdm in("+gsdmStr+") ";
 			}
-			if(!fgsdm.equals("")){
-				linesql +=" and fgsdm ='"+fgsdm+"' ";
+			if(!fgsdmStr.equals("")){
+				linesql +=" and fgsdm in("+fgsdmStr+") ";
 			}
 			String ylsql="SELECT * FROM bsth_c_ylb"
 //			String ylsql="SELECT id,xlbm,nbbm,jsy,jzl,czyl,jzyl,yh,sh,fgsdm FROM bsth_c_ylb"
@@ -2021,11 +2048,11 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		// 横向数据的第几天下标
 		int dayIndex = 0;
 		int dayIndexPrev = -1;
-		CalcWaybillDetail cwNext = null;
 		// 报表纵向列数据生成
 		for (int i = 0; listNew.size() > i; i++) {
 			CalcWaybillDetail cw = listNew.get(i);
+			CalcWaybillDetail cwNext = new CalcWaybillDetail();
 			if(i<listNew.size()-1){
 				cwNext = listNew.get(i+1);
 			}
@@ -2034,53 +2061,16 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			String cwy = cw.getsGh();
 			String cl = cw.getCl();
-			String key = "",keyNext = "";
-			if(flag == 1){
-				if(cw.getjGh() != null && cw.getjName() != null)
-					key += cw.getjGh() + "/" + cw.getjName();
-				if(cwNext.getjGh() != null && cwNext.getjName() != null)
-					keyNext += cwNext.getjGh() + "/" + cwNext.getjName();
-			} else if(flag == 2){
-				if(cw.getsGh() != null && cw.getsName() != null)
-					key += cw.getsGh() + "/" + cw.getsName();
-				if(cwNext.getsGh() != null && cwNext.getsName() != null)
-					keyNext += cwNext.getsGh() + "/" + cwNext.getsName();
-			} else if(flag == 3){
-				if(cw.getCl() != null)
-					key += cw.getCl();
-				if(cwNext.getCl() != null)
-					keyNext += cwNext.getCl();
-			}
-			key = cw.getXl() + "/" + key;
-			keyNext = cwNext.getXl() + "/" + keyNext;
-			CalcWaybillDetail calc = new CalcWaybillDetail();
-			List<CalcWaybillDetail> calcList = new ArrayList<>();
-			// 是否一行数据的第一个、生成key，calc为刚添加，不去和cw相加
-			boolean ifFirst = false;
-			if(keyMapList.containsKey(key)){
-				calc = keyMap.get(key);
-				calcList = keyMapList.get(key);
-			} else {
-//				calc = this.initCalcWaybillDetail();
-				// 深度拷贝对象
-				BeanUtils.copyProperties(cw,calc);
-				keyMap.put(key, calc);
-				dayIndex = 0;
-                ifFirst = true;
-			}
-
-
 			Ylb y = new Ylb();
 			Dlb d = new Dlb();
 			// 统计类型不同统计的左边列不同
+			// 赋值油、电量
 			if(flag != 2){
 				// 取了之后删除，防止重复取，应为添加的时候已经合并了
 				y = ylbMap.get(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
 				ylbMap.remove(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
 				d = dlbMap.get(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
 				dlbMap.remove(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
-//				y = ylbMap.get(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getjName()+"_"+cw.getCl());
-//				d = dlbMap.get(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getjName()+"_"+cw.getCl());
 				if(y != null){
 					cw.setZlc(y.getZlc());
 					cw.setYh(y.getYh());
@@ -2103,11 +2093,41 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					cw.setCdl(d.getCdl());
 					cw.setBglyh((d.getZlc()==0? 0:100*d.getHd()/d.getZlc()));
 				}
+			}
-			}/* else if(flag == 3){
-				y = ylbCLMap.get(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getCl());
-				d = dlbCLMap.get(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getCl());
-			}*/
+			String key = "",keyNext = "";
+			if(flag == 1){
+				if(cw.getjGh() != null && cw.getjName() != null)
+					key += cw.getjGh() + "/" + cw.getjName();
+				if(cwNext.getjGh() != null && cwNext.getjName() != null)
+					keyNext += cwNext.getjGh() + "/" + cwNext.getjName();
+			} else if(flag == 2){
+				if(cw.getsGh() != null && cw.getsName() != null)
+					key += cw.getsGh() + "/" + cw.getsName();
+				if(cwNext.getsGh() != null && cwNext.getsName() != null)
+					keyNext += cwNext.getsGh() + "/" + cwNext.getsName();
+			} else if(flag == 3){
+				if(cw.getCl() != null)
+					key += cw.getCl();
+				if(cwNext.getCl() != null)
+					keyNext += cwNext.getCl();
+			}
+			key = cw.getFgsdm()+"/"+cw.getXl() + "/" + key;
+			keyNext = cw.getFgsdm()+"/"+cwNext.getXl() + "/" + keyNext;
+			CalcWaybillDetail calc = new CalcWaybillDetail();
+			List<CalcWaybillDetail> calcList = new ArrayList<>();
+			// 是否一行数据的第一个、生成key，calc为刚添加，不去和cw相加
+			boolean ifFirst = false;
+			if(keyMapList.containsKey(key)){
+				calc = keyMap.get(key);
+				calcList = keyMapList.get(key);
+			} else {
+				// 深度拷贝对象
+				BeanUtils.copyProperties(cw,calc);
+				keyMap.put(key, calc);
+				dayIndex = 0;
+                ifFirst = true;
+			}
 			CalcWaybillDetail dayc = null;
 			if("m".equals(timeType)){
@@ -2148,13 +2168,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			// 把下标
 			dayIndexPrev = dayIndex;
-
-//            if(cw.getjGh().equals("007951") && cw.getXlName().equals("浦东40路")){
-//                System.out.println();
-//            }
-            /*if(cw.getCl().equals("W0F-058") || cw.getCl().equals("W2F-051") || cw.getCl().equals("S2E-029") || cw.getCl().equals("W1G-058")){
-                System.out.println();
-            }*/
             // timeType 为m 月报表时，日期不一样就换列，为y 年报表是，月份不一样换列
 			if("m".equals(timeType) && cwNext != null && key.equals(keyNext) && !cw.getRqStr().equals(cwNext.getRqStr())){
 				dayIndex++;
@@ -2166,8 +2179,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
                     calcList.add(new CalcWaybillDetail());
                     dayIndex++;
                 }
+                // 换列了从头开始，上一个下标赋值为初始
 				dayIndexPrev = -1;
-//				dayIndexPrev = dayIndex = 0;
 			}
 			// 右边可变列添加数据
 			keyMapList.put(key,calcList);
@@ -2196,14 +2209,17 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		for(int i=day; i<=day2; i++){
 			list1.add((i<10?"0"+i:i)+("m".equals(timeType)?"日":"月"));
 		}
+		if("bgldh".equals(itemDetails) || "bglyh".equals(itemDetails)){
+			list1.add("平均");
+		} else
+			list1.add("合计");
 		resList.add(list1);
 		int i=1;
         DecimalFormat df = new DecimalFormat("0.00");//格式化小数
+		double allNum = 0.0;
 		while (iter.hasNext()) {
-//                List list = new ArrayList();
-
 			Map.Entry entry = (Map.Entry) iter.next();
 			// 获取key
 			String key = (String) entry.getKey();
@@ -2236,6 +2252,10 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			listStr.add(df.format(c.getLjyylc()+c.getLjfyylc()));
 			listStr.add(df.format(c.getLblc()));
 			listStr.add(c.getTs()+"");
+			c.setBglhd(c.getBglhd()/c.getTs());
+			c.setBglyh(c.getBglyh()/c.getTs());
+			// 把列合计的数添加到最后一个
+			cList.add(c);
 			// DecimalFormat df = new DecimalFormat("0.00");//格式化小数
             for (CalcWaybillDetail c1:cList) {
                 if(StringUtils.isEmpty(c1.getXl())) {
@@ -2254,7 +2274,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
                     } else if("cccy".equals(itemDetails)){
                         listStr.add(df.format(c1.getCzyl()));
                     } else if("bglyh".equals(itemDetails)){
-                        listStr.add(df.format(c1.getBglyh()));
+//                        listStr.add(df.format(c1.getBglyh()));
+                        listStr.add(df.format(c1.getZlc()==0? 0:100*c1.getYh()/c1.getZlc()));
                     } else if("dh".equals(itemDetails)){
                         listStr.add(df.format(c1.getHd()));
                     }  else if("cdl".equals(itemDetails)){
@@ -2264,7 +2285,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
                     } else if("jccd".equals(itemDetails)){
                         listStr.add(df.format(c1.getJzcd()));
                     } else if("bgldh".equals(itemDetails)){
-                        listStr.add(df.format(c1.getBglhd()));
+                        listStr.add(df.format(c1.getZlc()==0? 0:100*c1.getHd()/c1.getZlc()));
+//                        listStr.add(df.format(c1.getBglhd()));
                     } else if("zgl".equals(itemDetails)){
                         listStr.add(df.format((c1.getSjyylc()+c1.getSjfyylc()+c1.getLjfyylc()+c1.getLjyylc())));
                     } else if("jhgl".equals(itemDetails)){
@@ -2276,6 +2298,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
                     }
                 }
             }
+			allNum = allNum + Double.parseDouble(listStr.get(listStr.size()-1));
 			resList.add(listStr);
 		}
@@ -2289,6 +2312,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		listEnd.add(df.format(zjCalc.getLjfyylc()+zjCalc.getLjyylc()));
 		listEnd.add(df.format(zjCalc.getLblc()));
 		listEnd.add(zjCalc.getTs()+"");
+		double all = 0.0;
 		for (Map<String, CalcWaybillDetail> cmap:dayList) {
 			for (Map.Entry<String, CalcWaybillDetail> cw : cmap.entrySet()) {
 //				System.out.println("key = " + cw.getKey() + ", value = " + cw.getValue());
@@ -2306,7 +2330,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				} else if("cccy".equals(itemDetails)){
 					listEnd.add(df.format(c1.getCzyl()));
 				} else if("bglyh".equals(itemDetails)){
-					listEnd.add(df.format(c1.getBglyh()));
+//					listEnd.add(df.format(c1.getBglyh()));
+					listEnd.add(df.format(c1.getZlc()==0? 0:100*c1.getYh()/c1.getZlc()));
 				} else if("dh".equals(itemDetails)){
 					listEnd.add(df.format(c1.getHd()));
 				}  else if("cdl".equals(itemDetails)){
@@ -2316,7 +2341,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				} else if("jccd".equals(itemDetails)){
 					listEnd.add(df.format(c1.getJzcd()));
 				} else if("bgldh".equals(itemDetails)){
-					listEnd.add(df.format(c1.getBglhd()));
+//					listEnd.add(df.format(c1.getBglhd()));
+					listEnd.add(df.format(c1.getZlc()==0? 0:100*c1.getHd()/c1.getZlc()));
 				} else if("zgl".equals(itemDetails)){
 					listEnd.add((df.format(c1.getSjyylc()+c1.getSjfyylc()+c1.getLjfyylc()+c1.getLjyylc())));
 				} else if("jhgl".equals(itemDetails)){
@@ -2325,10 +2351,18 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+"");
 				} else if("jhbc".equals(itemDetails)){
 					listEnd.add((c1.getJhyybc()+c1.getJhfyybc())+"");
-
 				}
 			}
+			all = all + Double.parseDouble(listEnd.get(listEnd.size()-1));
+		}
+
+		// 百公里电油耗时为平均数
+		if("bgldh".equals(itemDetails) || "bglyh".equals(itemDetails)){
+			allNum = allNum/keyMap.size();
+			all = all/dayList.size();
 		}
+//		listEnd.add(df.format(allNum)+"/"+df.format(all));
+		listEnd.add(df.format(all));
 		resList.add(listEnd);
 		return resList;
@@ -89,12 +89,13 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 			String lineCode = map.get("lineCode").toString();
 			Integer versions = Integer.valueOf(map.get("versions").toString());
 			Integer status = Integer.valueOf(map.get("status").toString());
+			String name = map.get("name").toString();
 			String remark = map.get("remark").toString();
-			
+
 			Line line = lineRepository.findOne(lineid);
 			int statu = repository.update(id,line,lineCode,new java.sql.Date(startDate.getTime()),
-					new java.sql.Date(endDate.getTime()),versions,status,remark);
+					new java.sql.Date(endDate.getTime()),versions,status,remark,name);
 			LineVersions upLineVersions = repository.findBylineIdAndVersions(line.getId(),versions);
 			if(upLineVersions != null){
 				upLineVersions.setEndDate(new java.sql.Date(startDate.getTime()));
@@ -47,7 +47,16 @@
 				<input type="hidden" name="status" id="statusInput" />
 				<input type="hidden" name="Id" id="IdInput" />
                  <!-- 表单分组组件 form-group END -->
-                 
+
+				<div class="form-group">
+					<label class="control-label col-md-5">
+						<span class="required"> * </span>线路版本名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+					</label>
+					<div class="col-md-4">
+						<input name="name" class="form-control" style="width:100%" id="nameInput" placeholder="请填写更换版本原因，方便排班人员操作！" />
+					</div>
+				</div>
+
                  <!-- 表单分组组件 form-group START -->
 				<div class="form-group">
 						<label class="control-label col-md-5">
@@ -110,7 +119,7 @@
                  <div class="form-group">
 					<label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                    	<div class="col-md-4">
-                    		<textarea class="form-control" rows="3" name="remark" id="remarkTextarea" placeholder="请填写更换版本原因，方便排班人员操作！"></textarea>
+                    		<textarea class="form-control" rows="3" name="remark" id="remarkTextarea" ></textarea>
                    	</div>
                 </div>
                 <!-- 表单分组组件 form-group END -->
@@ -90,6 +90,7 @@
 						$("#endDateInput").val(moment(result.endDate).format('YYYY-MM-DD HH:mm:ss'));
 						$("#versionsInput").val(result.versions);
 						$("#statusInput").val(result.status);
+						$("#nameInput").val(result.name);
 						$("#remarkTextarea").val(result.remark);
 					}
@@ -144,6 +145,7 @@
 			'line' : {required : true,maxlength: 30},// 线路名称 必填项、最大长度.
 			'startDate' : {required : true},// 启用时间 不为空.
 			'endDate' : {required : true},// 结束时间.
+			'name' : {required : true},// 版本名称.
 			'versions' : {required : true, digits : true, maxlength: 10},// 版本号  必填项、数字、最大长度10.
 			'status' : {required : true, digits : true, maxlength: 10},// 版本状态 必填项、数字、最大长度10.
 		},
@@ -76,10 +76,10 @@
             <div style="display: inline-block;margin-left: 33px;" class="date-picker">
                 <span class="item-label" style="width: 80px;">&#12288;&#12288;时间: </span>
-                <!--<input class="form-control" type="text" id="startDate" style="width: 180px;" /> - -->
-                <!--<input class="form-control" type="text" id="endDate" style="width: 180px;" />-->
-                <input class="form-control" type="text" id="startDate" style="width: 180px;" value="2020-10-01"/> -
-                <input class="form-control" type="text" id="endDate" style="width: 180px;" value="2020-10-10"/>
+                <input class="form-control" type="text" id="startDate" style="width: 180px;" /> -
+                <input class="form-control" type="text" id="endDate" style="width: 180px;" />
+                <!--<input class="form-control" type="text" id="startDate" style="width: 180px;" value="2020-10-01"/> - -->
+                <!--<input class="form-control" type="text" id="endDate" style="width: 180px;" value="2020-10-10"/>-->
             </div>
             <div style="margin-top: 2px"></div>
@@ -130,6 +130,7 @@
 </div>
 <script >
     $(function(){
+        $('#export').attr('disabled', "true");
         // 关闭左侧栏
         if (!$('body').hasClass('page-sidebar-closed'))
             $('.menu-toggler.sidebar-toggler').click();
@@ -150,72 +151,45 @@
             day = "0" + day;
         //时间
         var dateTime=year + "-" + month + "-" + day;
-        // $("#startDate").val(dateTime);
-        // $("#endDate").val(dateTime);
+        $("#startDate").val(dateTime);
+        $("#endDate").val(dateTime);
-        // $("#endDate").datetimepicker({
-        //     format : 'YYYY-MM-DD',
-        //     locale : 'zh-cn',
-        //     maxDate : dateTime
-        // });
-        // $("#startDate").datetimepicker({
-        //     format : 'YYYY-MM-DD',
-        //     locale : 'zh-cn',
-        //     maxDate : dateTime
-        // });
+        $("#endDate").datetimepicker({
+            format : 'YYYY-MM-DD',
+            locale : 'zh-cn',
+            maxDate : dateTime
+        });
+        $("#startDate").datetimepicker({
+            format : 'YYYY-MM-DD',
+            locale : 'zh-cn',
+            maxDate : dateTime
+        });
-        var fage=false;
-        var xlList;
-        var obj = [];
+        var lineAll="";
         var datas = {}; //查询条件
-        var tempData = {};
-
-        $.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++){
-                    if(obj[i].companyCode == "26"){
-                        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);
-            });
+        /**用户分配的线路*/
+        $.get('/realControAuthority/findByCurrentUser', function (userAuthor) {
+            lineAll = userAuthor.lineCodeStr.substring(0,userAuthor.lineCodeStr.length-1);
         });
+        var tempData = {};
-        // $("#gsdm").on("change",updateCompany);
-        function updateCompany(){
-            // var company = $('#gsdm').val();
-            var options = '<option value="">所有分公司</option>';
-            for(var i = 0; i < obj.length; i++){
-                if(obj[i].companyCode == "26"){
+        $.get('/user/companyData', function(obj) {
+            var option = '';
+            var allC = "";
+            for (var i = 0; i < obj.length; i++) {
+                if (obj[i].companyCode == "26") {
                     var children = obj[i].children;
-                    for(var j = 0; j < children.length; j++){
-                        options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+                    for (var j = 0; j < children.length; j++) {
+                        allC += children[j].code+",";
+                        option += '<option value="' + children[j].code + '">' + children[j].name + '</option>';
                     }
                 }
             }
-            $('#fgsdm').html(options);
-        }
-        $("#line").on("change", function(){
-            if($("#line").val() == " "){
-                $("#gsdm").attr("disabled", false);
-                $("#fgsdm").attr("disabled", false);
-            } else {
-                var temp = tempData[$("#line").val()].split(":");
-                $("#gsdm").val(temp[0]);
-                updateCompany();
-                $("#fgsdm").val(temp[1]);
-                $("#gsdm").attr("disabled", true);
-                $("#fgsdm").attr("disabled", true);
-            }
+            var options = '<option value="'+allC.substring(0,allC.length-1)+'">所有分公司</option>'+option;
+            $('#fgsdm').html(options);
         });
         // 项目明细选项列
@@ -256,11 +230,9 @@
         $("#query").on("click",function(){
             var gsdm = "26";
             var fgsdm = $("#fgsdm").val();
-            var lineCode = $("#line").val();
             var startDate = $("#startDate").val();
             var endDate = $("#endDate").val();
             var statisticalObj = $("#statisticalObj").val();
-            lineName=$("#line option:selected").text();
             //开始和结束时间
             var startTime = Date.parse(new Date(startDate));
             var endTime = Date.parse(new Date(endDate));
@@ -268,16 +240,12 @@
             datas = {}; // 清空之前数据
             datas.gsdm = gsdm;
             datas.fgsdm = fgsdm;
-            datas.lineCode = lineCode;
-            datas.lineName = lineName;
-            datas.startDate = startDate;
+            datas.lineCode = lineAll;
             datas.timeType = "m";
-            // datas.startDate = "2020-10-01";
+            datas.startDate = startDate;
             datas.endDate = endDate;
-            // datas.endDate = "2020-10-10";
             datas.statisticalObj = $("#statisticalObj").val();
             datas.itemDetails = $("#itemDetails").val();
-
             if(startDate==null || startDate =="" ||endDate==null || endDate ==""){
                 layer.msg('请选择时间段！');
             }else if(endTime<startTime){
@@ -295,8 +263,10 @@
                                 title: '提示'
                                 , content: '没有您要查询的数据，请重新选择参数！'
                             });
+                            $("#export").attr('disabled',"true");
                             return;
-                        }
+                        }else
+                            $("#export").removeAttr("disabled");
                         var htmlHead = "", htmlBody = "";
                         var rsLength = rs.length;
                         rs.forEach(function (o, i) {
@@ -323,7 +293,6 @@
         });
         $("#export").on("click",function(){
-            datas.timeType = "m";
             var itemDetails = datas.itemDetails,
                 type = "加注量[全部]";
             if(itemDetails=="jzl0"){
@@ -130,6 +130,7 @@
 </div>
 <script >
     $(function(){
+        $('#export').attr('disabled', "true");
         // 关闭左侧栏
         if (!$('body').hasClass('page-sidebar-closed'))
             $('.menu-toggler.sidebar-toggler').click();
@@ -161,66 +162,42 @@
             maxDate : dateTime
         });
-        var fage=false;
-        var xlList;
-        var obj = [];
+
+        var lineAll="";
         var datas = {}; //查询条件
-        var tempData = {};
-        $.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++){
-                    if(obj[i].companyCode == "26"){
-                        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);
-            });
+        /**用户分配的线路*/
+        $.get('/realControAuthority/findByCurrentUser', function (userAuthor) {
+            lineAll = userAuthor.lineCodeStr.substring(0,userAuthor.lineCodeStr.length-1);
         });
+        var tempData = {};
-        // $("#gsdm").on("change",updateCompany);
-        function updateCompany(){
-            // var company = $('#gsdm').val();
-            var options = '<option value="">所有分公司</option>';
-            for(var i = 0; i < obj.length; i++){
-                if(obj[i].companyCode == "26"){
+        $.get('/user/companyData', function(obj) {
+            var option = '';
+            var allC = "";
+            for (var i = 0; i < obj.length; i++) {
+                if (obj[i].companyCode == "26") {
                     var children = obj[i].children;
-                    for(var j = 0; j < children.length; j++){
-                        options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+                    for (var j = 0; j < children.length; j++) {
+                        allC += children[j].code+",";
+                        option += '<option value="' + children[j].code + '">' + children[j].name + '</option>';
                     }
                 }
             }
-            $('#fgsdm').html(options);
-        }
-        $("#line").on("change", function(){
-            if($("#line").val() == " "){
-                $("#gsdm").attr("disabled", false);
-                $("#fgsdm").attr("disabled", false);
-            } else {
-                var temp = tempData[$("#line").val()].split(":");
-                $("#gsdm").val(temp[0]);
-                updateCompany();
-                $("#fgsdm").val(temp[1]);
-                $("#gsdm").attr("disabled", true);
-                $("#fgsdm").attr("disabled", true);
-            }
+            var options = '<option value="'+allC.substring(0,allC.length-1)+'">所有分公司</option>'+option;
+            $('#fgsdm').html(options);
         });
         // 项目明细选项列
         // 触发默认选项
         updateItem();
         $("#statisticalItem").on("change",updateItem);
+        var item ="";
         function updateItem() {
-            var item = $('#statisticalItem').val();
+            item = $('#statisticalItem').val();
             var options = '';
             if(item == "yh"){
                 options += '<option value="jzlAll">加注量[全部]</option>' +
@@ -253,11 +230,9 @@
         $("#query").on("click",function(){
             var gsdm = "26";
             var fgsdm = $("#fgsdm").val();
-            var lineCode = $("#line").val();
             var startDate = $("#startDate").val();
             var endDate = $("#endDate").val();
             var statisticalObj = $("#statisticalObj").val();
-            lineName=$("#line option:selected").text();
             //开始和结束时间
             var startTime = Date.parse(new Date(startDate));
             var endTime = Date.parse(new Date(endDate));
@@ -266,14 +241,12 @@
             datas.timeType = "y";
             datas.gsdm = gsdm;
             datas.fgsdm = fgsdm;
-            datas.lineCode = lineCode;
-            datas.lineName = lineName;
+            datas.lineCode = lineAll;
             datas.startDate = startDate;
-            // datas.startDate = "2020-10-01";
             datas.endDate = endDate;
-            // datas.endDate = "2020-10-10";
             datas.statisticalObj = $("#statisticalObj").val();
             datas.itemDetails = $("#itemDetails").val();
+            datas.item = item;
             if(startDate==null || startDate =="" ||endDate==null || endDate ==""){
                 layer.msg('请选择时间段！');
@@ -292,8 +265,10 @@
                                 title: '提示'
                                 , content: '没有您要查询的数据，请重新选择参数！'
                             });
+                            $("#export").attr('disabled',"true");
                             return;
-                        }
+                        }else
+                            $("#export").removeAttr("disabled");
                         var htmlHead = "", htmlBody = "";
                         var rsLength = rs.length;
                         rs.forEach(function (o, i) {
@@ -320,7 +295,6 @@
         });
         $("#export").on("click",function(){
-            datas.timeType = "y";
             var itemDetails = datas.itemDetails,
                 type = "加注量[全部]";
             if(itemDetails=="jzl0"){