Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

潘钊
2 parents 9daf4a0e c8001113
Showing 8 changed files with 359 additions and 180 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/base/geo_data_edit/main.html
src/main/resources/static/pages/forms/mould/oilListMonth.xls
src/main/resources/static/pages/oil/list_ph.html
src/main/resources/static/pages/report/oil/oilListMonth.html
@@ -210,7 +210,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
         return maps;
     }
 	@RequestMapping(value="/oilListMonth")
-	public List<Ylb> oilListMonth(@RequestParam Map<String, Object> map){
+	public List<Map<String, Object>> oilListMonth(@RequestParam Map<String, Object> map){
 		return yblService.oilListMonth(map);
 	}
@@ -52,7 +52,11 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " order by nbbm , rq desc,jcsx desc",nativeQuery=true)
 	List<Ylb> listByRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
-	
+	@Query(value="select * from bsth_c_ylb where rq>=?1 "
+			+ " and rq<= ?2 and ssgsdm =?3"
+			+ " and fgsdm =?4 and xlbm like %?5%  "
+			+ " order by nbbm , rq desc,jcsx desc",nativeQuery=true)
+	List<Ylb> listByMonthJcsx(String rq,String rq2,String gsbm,String fgsbm,String xlbm);
 	/**
 	 * 当天YLB信息
@@ -19,7 +19,7 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	String checkJsy(Map<String, Object> map);
-	List<Ylb> oilListMonth(Map<String, Object> map);
+	List<Map<String, Object>> oilListMonth(Map<String, Object> map);
 	List<Ylb> listYlb(Map<String, Object> map);
 	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
@@ -832,7 +832,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	@Override
-	public List<Ylb> oilListMonth(Map<String, Object> map) {
+	public List<Map<String, Object>> oilListMonth(Map<String, Object> map) {
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		
 		String type=map.get("type").toString();
 		String date=map.get("date").toString().trim();
 		String gsdm=map.get("gsdm").toString();
@@ -840,7 +843,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		String date2=date.substring(0, 8)+"01";
 		String lineStr="";
 		String line =map.get("line").toString().trim();
-		if(line !=null && !line.equals("")){
+		/*if(line !=null && !line.equals("")){
 			lineStr =" and xlbm= '"+ line +"'";
 		}else{
 			lineStr =" and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"' ";
@@ -868,23 +871,86 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			            	s.setJzyl(rs.getDouble("jzyl"));
 			                return s;  
 			            }  
-					});  
+					});  */
-		if(type != null && type.equals("export")){
-			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-					sdfSimple = new SimpleDateFormat("yyyyMMdd");
-			
-			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
-			for(Ylb ylb : list){
-				Map<String, Object> m = new HashMap<String, Object>();
-				m.put("nbbm", ylb.getNbbm()!=null?ylb.getNbbm():"");
-				m.put("rq", ylb.getRq()!=null?sdfMonth.format(ylb.getRq()):"");
-				m.put("jzyl", ylb.getJzyl()!=null?ylb.getJzyl():"");
-				mapList.add(m);
+		double qtyy=0.0;//其他用油
+		double cdyy=0.0;//车队用油
+		double byyy=0.0;//保养用油
+		double cjxx=0.0;//车间小修
+		double cjgb=0.0;//车间高保
+		double fyyyhj=0.0;//非营运用油合计
+		List<Ylb> listYlb=repository.listByMonthJcsx(date2, date, gsdm, fgsdm, line);
+		
+		Map<String, Object> ms=new HashMap<String,Object>();
+		List<Ylb> list=new ArrayList<Ylb>();
+		for (int i = 0; i < listYlb.size(); i++) {
+			Ylb t=listYlb.get(i);
+			fyyyhj =Arith.add(fyyyhj, t.getSh());
+			if(t.getShyy()==null){
+				qtyy=Arith.add(qtyy, t.getSh());
+			}else{
+				if(t.getShyy().equals("6")){
+					cdyy=Arith.add(cdyy, t.getSh());
+				}else if(t.getShyy().equals("2")){
+					byyy=Arith.add(byyy, t.getSh());
+				}else if(t.getShyy().equals("7")){
+					cjxx=Arith.add(cjxx, t.getSh());
+				}else if(t.getShyy().equals("8")){
+					cjgb=Arith.add(cjgb, t.getSh());
+				}else{
+					qtyy=Arith.add(qtyy, t.getSh());
+				}
+			}
+			if(ms.get(t.getNbbm())==null){
+				ms.put(t.getNbbm(), t.getNbbm());
+				list.add(t);
 			}
+		}
+		
+		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
+		int  size = 0;
+		Map<String, Object> m_ = new HashMap<String, Object>();
+		double ycyhj=0.0;
+		for(Ylb ylb : list){
+			ycyhj=Arith.add(ycyhj, ylb.getJzyl());
+			int x=size%3;
+			if(x==0 && size>0){
+				mapList.add(m_);
+        		m_ = new HashMap<String, Object>();
+        	}
+			size++;
+			m_.put("xh"+x, size);
+			m_.put("nbbm"+x, ylb.getNbbm()!=null?ylb.getNbbm():"");
+			m_.put("rq"+x, ylb.getRq()!=null?sdfMonth.format(ylb.getRq()):"");
+			m_.put("jzyl"+x, ylb.getJzyl()!=null?ylb.getJzyl():"");
+		}
+		 if(m_.get("nbbm0")!=null){
+	        	if(m_.get("nbbm1")==null){
+	        		m_.put("xh1", "");
+	        		m_.put("nbbm1" , "");
+	        		m_.put("rq1" , "");
+	        		m_.put("jzyl1" , "");
+	        	}
+	        	if(m_.get("nbbm2")==null){
+	        		m_.put("xh2", "");
+	        		m_.put("nbbm2" , "");
+	        		m_.put("rq2" , "");
+	        		m_.put("jzyl2" , "");
+	        	}
+	        	mapList.add(m_);
+	        }
+
+		if(type != null && type.equals("export")){
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("ycyhj", ycyhj);
+			m.put("qtyy", qtyy);
+			m.put("cdyy", cdyy);
+			m.put("byyy", byyy);
+			m.put("cjxx", cjxx);
+			m.put("cjgb", cjgb);
+			m.put("fyyyhj", fyyyhj);
 			ReportUtils ee = new ReportUtils();
 			try {
 				listI.add(mapList.iterator());
@@ -895,9 +961,15 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				// TODO: handle exception
 				e.printStackTrace();
 			}
+		}else{
+			 m_=new HashMap<String,Object>();
+			 m_.put("xh0", "99");
+			 m_.put("nbbm0", "存油合计:"+ycyhj +" 非营运用油： 其他用油:"+qtyy +",车队:"+cdyy+",保养用油:"+byyy
+					 +",车间(小修):"+cjxx+",车间(高保):"+cjgb+",非营运用油合计:"+fyyyhj);
+			 mapList.add(m_);
 		}
-		return list;
+		return mapList;
 	}
 	@Override
@@ -1478,7 +1550,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				}
 			}
-			
+			String nbbmStr="";
 			List<Ylb> list=new ArrayList<Ylb>();
 			/*
 			 * 第一步 修改车辆里程 和加注量
@@ -1592,6 +1664,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setLp(maps.get("lpName")==null?"":maps.get("lpName").toString());
 					if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 						 if(type.equals("add")){
+							 if(nbbmStr.indexOf(t.getNbbm())<0){
+								 nbbmStr +=t.getNbbm()+",";
+							 }
 							 t.setCreatetime(new Date());
 						 }else{
 							 t.setUpdatetime(new Date());
@@ -1603,10 +1678,92 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				for (int i = 0; i < ylbList_del.size(); i++) {
 					Ylb y=ylbList_del.get(i);
+					if(nbbmStr.indexOf(y.getNbbm())<0){
+						 nbbmStr +=y.getNbbm()+",";
+					 }
 					repository.delete(y.getId());
 				}
+				
+				//重新计算删除了的或者新增了的车的车的油耗信息（考虑车辆可能跨线路，从分公司赛选计算）
+				double czyl=0.0;
+				List<Ylb> iterator2=this.listOrderBy(date,gsdm,fgsdm,line,"","nbbm,jcsx");
+				String[] nbbms=nbbmStr.split(",");
+				for (int i = 0; i < nbbms.length; i++) {
+					String clzbm=nbbms[i];
+					// 得到一天总的加油和里程（根据车，时间）
+					List<Object[]> sumList = repository.sumLcYl(clzbm, sdf.parse(date),"",gsdm,fgsdm);
+					// 保存总的加油量
+					Double jzl = 0.0;
+					// 保存总的里程
+					Double zlc = 0.0;
+					for (int j = 0; j < sumList.size(); j++) {
+						jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
+						zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
+					}
+					// 保留两位小数
+					DecimalFormat df = new DecimalFormat("#.00");
+					Double zyl = 0.0;
+					Double nextJzyl = 0.0;
+					for (int j = 0; j < iterator2.size(); j++) {
+						Ylb t = iterator2.get(j);
+						if(t.getNbbm().equals(clzbm)){
+							if (t.getJcsx() == 1) {
+								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
+								czyl = t.getCzyl();
+								zyl =jzl;
+								Double yh=0.0;
+								if(zlc>0 ){
+									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
+								//把进场油量的小数和整数分别取出
+								if(zlc>0 && t.getZlc()>0){
+									long l=Math.round(nextJzyl);
+									double ylxs=l*100/100;
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+							} else {
+								t.setCzyl(nextJzyl);
+								Double yh=0.0;
+								if(zlc>0){
+									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
+								if(zlc>0 && t.getZlc()>0){
+									long l=0l;
+									double ylxs=0.0;
+									if(j==iterator2.size()-1){
+										ylxs=czyl;
+									}else{
+										if(iterator2.get(j+1).getNbbm().equals(t.getNbbm())){
+											l=Math.round(nextJzyl);
+											ylxs=l*100/100;
+										}else{
+											ylxs=czyl;
+										}
+										
+									}
+									yh=Arith.add(yh, Arith.sub(nextJzyl,ylxs));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+							}
+							repository.save(t);
+						}
+					}
+				}
+				
 				//重新统计油车数据结束
-
 				//重新获取电耗数据开始
-<!DOCTYPE html>
-<html lang="zh-cn">
-
-<head>
-    <meta charset="UTF-8">
-    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
-    <!-- flatpickr -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
-    <!-- tooltip css-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"  />
-    <link rel="stylesheet" href="/real_control_v2/css/pace.css"  />
-    <style>
-        /* ^_^ baidu map hide logo */
-        .anchorBL, .anchorBL, .amap-logo, .amap-copyright {
-            display: none;
-        }
-
-        html,body{
-            height: 100%;
-        }
-        .ct_page{
-            padding: 0;
-            height: 100%;
-        }
-
-        div#map_wrap{
-            height: 100%;
-        }
-
-        .main_left_panel{
-            position: absolute;
-            z-index: 999;
-            height: calc(100% - 20px);
-            width: 300px;
-            background: #fffffff5;
-            top: 7px;
-            left: 5px;
-            box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
-        }
-        .main_lt_search_panel{
-            position: absolute;
-            z-index: 99;
-            top: 10px;
-            left: 330px;
-            background: #fffffff5;
-            box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
-        }
-        .main_rt_tools_panel{
-            position: absolute;
-            z-index: 99;
-            top: 7px;
-            right: 7px;
-            background: #ffffff;
-            box-shadow: -5px 4px 15px rgba(90, 90, 90, 0.48);
-            padding: 0 12px;
-            text-align: center;
-            border-radius: 7px;
-            height: 28px;
-        }
-
-        .main_rt_tools_panel>._icon{
-            margin: 0 9px;
-        }
-        .search_input{
-            width: 250px;
-            height: 42px;
-        }
-
-        .search_input::placeholder{
-            color: grey;
-            font-size: 12px;
-        }
-    </style>
-</head>
-
-<body>
-<div class="ct_page" >
-    <div id="map_wrap">
-    </div>
-    <div class="main_left_panel">
-        <div class="_line_info">
-
-        </div>
-    </div>
-    <div class="main_lt_search_panel">
-        <div class="uk-inline">
-            <span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>
-            <input class="uk-input search_input" placeholder="搜索地图位置" type="text">
-        </div>
-    </div>
-    <div class="main_rt_tools_panel">
-        <a uk-icon="icon: info;ratio: .9" class="_icon"></a>
-        <a uk-icon="icon: expand;ratio: .9" class="_icon"></a>
-    </div>
-</div>
-<!-- 百度 -->
-<script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
-<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
-<!-- EventProxy  -->
-<script src="/assets/js/eventproxy.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
-<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
-<!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
-<!-- flatpickr -->
-<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
-<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
-<!-- qtip -->
-<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" ></script>
-<script>
-    top.document.title = "绘制线路";
-    // 关闭左侧栏
-    if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();}
-
-    //初始化地图
-    if(!window.BMap){
-        alert('地图没有加载成功，请确认是否能正常连接外网！！');
-    }
-    var gb_map_consts = {
-        mapContainer: '#map_wrap',
-        center_point: {
-            lng: 121.544336,
-            lat: 31.221315
-        }
-    };
-
-    map = new BMap.Map($(gb_map_consts.mapContainer)[0]);
-    //map.setMapStyle({style:'dark'});
-    //中心点和缩放级别
-    map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 13);
-    map.enableScrollWheelZoom();
-</script>
-</body>
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <!-- flatpickr -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
+    <!-- tooltip css-->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"  />
+    <link rel="stylesheet" href="/real_control_v2/css/pace.css"  />
+    <style>
+        /* ^_^ baidu map hide logo */
+        .anchorBL, .anchorBL, .amap-logo, .amap-copyright {
+            display: none;
+        }
+
+        html,body{
+            height: 100%;
+        }
+        .ct_page{
+            padding: 0;
+            height: 100%;
+        }
+
+        div#map_wrap{
+            height: 100%;
+        }
+
+        .main_left_panel{
+            position: absolute;
+            z-index: 999;
+            height: calc(100% - 20px);
+            width: 300px;
+            background: #fffffff5;
+            top: 7px;
+            left: 5px;
+            box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+        }
+        .main_lt_search_panel{
+            position: absolute;
+            z-index: 99;
+            top: 10px;
+            left: 330px;
+            background: #fffffff5;
+            box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+        }
+        .main_rt_tools_panel{
+            position: absolute;
+            z-index: 99;
+            top: 7px;
+            right: 7px;
+            background: #ffffff;
+            box-shadow: -5px 4px 15px rgba(90, 90, 90, 0.48);
+            padding: 0 12px;
+            text-align: center;
+            border-radius: 7px;
+            height: 28px;
+        }
+
+        .main_rt_tools_panel>._icon{
+            margin: 0 9px;
+        }
+        .search_input{
+            width: 250px;
+            height: 42px;
+        }
+
+        .search_input::placeholder{
+            color: grey;
+            font-size: 12px;
+        }
+    </style>
+</head>
+
+<body>
+<div class="ct_page" >
+    <div id="map_wrap">
+    </div>
+    <div class="main_left_panel">
+        <div class="_line_info">
+
+        </div>
+    </div>
+    <div class="main_lt_search_panel">
+        <div class="uk-inline">
+            <span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>
+            <input class="uk-input search_input" placeholder="搜索地图位置" type="text">
+        </div>
+    </div>
+    <div class="main_rt_tools_panel">
+        <a uk-icon="icon: info;ratio: .9" class="_icon"></a>
+        <a uk-icon="icon: expand;ratio: .9" class="_icon"></a>
+    </div>
+</div>
+<!-- 百度 -->
+<script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
+<!-- qtip -->
+<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" ></script>
+<script>
+    top.document.title = "绘制线路";
+    // 关闭左侧栏
+    if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();}
+
+    //初始化地图
+    if(!window.BMap){
+        alert('地图没有加载成功，请确认是否能正常连接外网！！');
+    }
+    var gb_map_consts = {
+        mapContainer: '#map_wrap',
+        center_point: {
+            lng: 121.544336,
+            lat: 31.221315
+        }
+    };
+
+    map = new BMap.Map($(gb_map_consts.mapContainer)[0]);
+    //map.setMapStyle({style:'dark'});
+    //中心点和缩放级别
+    map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 13);
+    map.enableScrollWheelZoom();
+</script>
+</body>
 </html>
 \ No newline at end of file
@@ -58,6 +58,11 @@
 					<li><a href="javascript:;" data-action="3" class="tool-action"
 						id="export"> <i class="fa fa-file-excel-o"></i> 导出Excel
 					</a></li>
+					
+<!-- 					<li class="divider"></li> -->
+<!-- 					<li><a href="javascript:;" data-action="3" class="tool-action" -->
+<!-- 						id="cxtj"> <i class="fa fa-file-excel-o"></i> 导出Excel -->
+<!-- 					</a></li> -->
 				</ul>
 			</div>
 		</div>
@@ -214,6 +219,9 @@
 			<button type="button" class="btn btn-circle  saveButton" >
 				<i class="fa fa-check-circle"></i> 保存
 			</button>
+			<button type="button" class="btn btn-circle  saveButton" >
+				<i class="fa fa-check-circle"></i> 保存
+			</button>
 		</div>
 		</div>
@@ -963,6 +971,17 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         	}
 //         }
+    
+//         	 $("#cxtj").on("click", function () {
+//                  if ($("#rq").val() != "") {
+// //      				 var params=getParamsList();
+//                      $post('/ylb/updateHistory', {date:'2017-10-01',line:'10845',gsdm:'55',fgsdm:'3'}, function (result) {
+//                          window.open("/downloadFile/download?fileName="+$("#rq").val()+"进出场存油量" );
+//                      });
+//                  } else {
+//                      layer.msg('请选择日期.');
+//                  }
+//              });
 //导出
@@ -69,15 +69,6 @@
 								<td>日期</td>
 								<td>存油</td>
-								<td>序号</td>
-								<td>车号</td>
-								<td>日期</td>
-								<td>存油</td>
-								
-								<td>序号</td>
-								<td>车号</td>
-								<td>日期</td>
-								<td>存油</td>
 							</tr>
 						</thead>
@@ -139,10 +130,8 @@
 		var xlList;
 		$.get('/report/lineList',function(result){
 			xlList=result;
-			
 			$.get('/user/companyData', function(result){
 				obj = result;
-				console.log(obj);
 				var options = '';
 				for(var i = 0; i < obj.length; i++){
 					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
@@ -226,9 +215,6 @@
 			var gsdm = $("#gsdm").val();
 			var fgsdm = $("#fgsdm").val();
 			$get('/ylb/oilListMonth',{line:line,date:date,gsdm:gsdm,fgsdm,fgsdm,type:'query'},function(result){
-// 				$.each(result, function(i, obj) {
-// 	                obj.rq = moment(obj.rq).format("DD");
-// 	            });
 				var oilListMonth = template('oilListMonth',{list:result});
 				$('#forms tbody').html(oilListMonth);
 			});
@@ -252,16 +238,29 @@
 </script>
 <script type="text/html" id="oilListMonth">
 	{{each list as obj i}}
-		{{if i%5 == 0}}
+		
 			<tr>
-		{{/if}}
-				<td>{{i+1}}</td>
-				<td>{{obj.nbbm}}</td>
-				<td>{{obj.rq}}</td>
-				<td>{{obj.jzyl}}</td>
-		{{if (i+1)%5 == 0}}
+ 				{{if obj.xh0==99}}
+					<td colspan="12">
+						{{obj.nbbm0}}
+					</td>
+				{{else}} 
+					<td>{{obj.xh0}}</td>
+					<td>{{obj.nbbm0}}</td>
+					<td>{{obj.rq0}}</td>
+					<td>{{obj.jzyl0}}</td>
+					<td>{{obj.xh1}}</td>
+					<td>{{obj.nbbm1}}</td>
+					<td>{{obj.rq1}}</td>
+					<td>{{obj.jzyl1}}</td>
+					<td>{{obj.xh2}}</td>
+					<td>{{obj.nbbm2}}</td>
+					<td>{{obj.rq2}}</td>
+					<td>{{obj.jzyl2}}</td>
+				{{/if}}
+				
 			</tr>
-		{{/if}}
+		
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>