新报表：车辆公里统计

廖磊
1 parent 7481b893
Showing 4 changed files with 465 additions and 87 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/service/report/ReportService.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/report/countMileage/countBus/countBusMileage.html
@@ -267,4 +267,11 @@ public class ReportController {
 		return service.countByList(map);
 	}
+	@RequestMapping(value="/countBusMileage")
+	public List<Map<String,Object>> countBusMileage(@RequestParam Map<String, Object> map){
+		
+		return service.countByBusList(map);
+	}
+	
+	
 }
@@ -44,4 +44,6 @@ public interface ReportService {
 	 List<Map<String, String>> userList(Map<String, Object> map);
 	 List<Map<String, Object>> countByList(Map<String, Object> map);
+	 
+	 List<Map<String, Object>> countByBusList(Map<String, Object> map);
  }
@@ -17,11 +17,13 @@ import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang.StringUtils;
+import org.dbunit.dataset.DataSetException;
 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.scheduling.commonj.ScheduledTimerListener;
 import org.springframework.stereotype.Service;
 import com.bsth.data.BasicData;
@@ -30,6 +32,7 @@ import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
 import com.bsth.entity.mcy_forms.Operationservice;
+import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -1534,6 +1537,10 @@ public class ReportServiceImpl implements ReportService{
 		    			map.put("xlName", list.get(0).getXlName());
 				        map.put("gs", list.get(0).getGsName());
 				        map.put("fgs", list.get(0).getFgsName());
+				        map.put("jGh", list.get(0).getjGh());
+				        map.put("sGh", list.get(0).getsGh()==null?"":list.get(0).getsGh());
+				        map.put("nbbm",list.get(0).getClZbh());
+				        map.put("line", list.get(0).getXlBm());
 		    		}
 			        double jhyygl=culateService.culateJhgl(list);//计划营运公里
@@ -1596,5 +1603,363 @@ public class ReportServiceImpl implements ReportService{
 		    	}
 		        return map;
 		    }
+		@Override
+		public List<Map<String, Object>> countByBusList(Map<String, Object> map) {
+			// TODO Auto-generated method stub
+			SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+			List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+			List<Map<String, Object>> lMaps = new ArrayList<Map<String, Object>>();
+			String gsdm="";
+			if(map.get("gsdm")!=null){
+				gsdm=map.get("gsdm").toString();
+			}
+			String fgsdm="";
+			if(map.get("fgsdm")!=null){
+				fgsdm=map.get("fgsdm").toString();
+			}
+			String line="";
+			if(map.get("line")!=null){
+				line=map.get("line").toString();
+			}
+			String date="";
+			if(map.get("date")!=null){
+				date=map.get("date").toString();
+			}
+			String date2="";
+			if(map.get("date2")!=null){
+				date2=map.get("date2").toString();
+			}
+			String xlName="";
+			if(map.get("xlName")!=null){
+				xlName=map.get("xlName").toString();
+			}
+			String zt="";
+			if(map.get("zt")!=null){
+				zt=map.get("zt").toString();
+			}
+			String type="";
+			if(map.get("type")!=null){
+				type=map.get("type").toString();
+			}
+			//所有班次信息
+			 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+	        line =line.trim();
+	        if(line.equals("")){
+	            //查询所有线路
+	            list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2,gsdm,fgsdm);
+	        }else{
+	            //查询单条线路
+	            list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
+	        }
+	        String ylbSql=" select * from bsth_c_ylb where rq BETWEEN '"+date+"' and '"+date2+"'";
+		       if(line.equals("")){
+		    	   ylbSql +="and ssgsdm='"+gsdm+"' "
+							+ " and fgsdm='"+fgsdm+"'";
+				}else{
+					ylbSql += " and xlbm = '"+line+"'";
+				}
+		       List<Ylb> ylbList=ylbList(ylbSql);
+		       
+		       String dlbSql=" select * from bsth_c_dlb where rq BETWEEN '"+date+"' and '"+date2+"'";
+		       if(line.equals("")){
+		    	   dlbSql +="and ssgsdm='"+gsdm+"' "
+							+ " and fgsdm='"+fgsdm+"'";
+				}else{
+					dlbSql += " and xlbm = '"+line+"'";
+				}
+		       List<Dlb> dlbList=dlbList(dlbSql);
+	        
+	        String sql="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
+	        		+ " from bsth_c_s_sp_info_real r where"
+			        + " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
+			if(line.equals("")){
+				sql +="and r.gs_bm='"+gsdm+"' "
+						+ " and r.fgs_bm='"+fgsdm+"'";
+			}else{
+				sql += " and r.xl_bm = '"+line+"'";
+			}
+			sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str,r.j_gh,r.s_gh";  
+		     
+		    List<Map<String, Object>> listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
+				@Override
+				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Map<String, Object> map=new HashMap<String,Object>();
+					map.put("line",arg0.getString("xl_bm"));
+					map.put("date", arg0.getString("schedule_date_str"));
+					map.put("nbbm", arg0.getString("cl_zbh"));
+					map.put("jGh", arg0.getString("j_gh"));
+					map.put("sGh", arg0.getString("s_gh"));
+					return map;
+				}
+			});
+		    
+			 for (int i = 0; i < listGroupBy.size(); i++) {
+				Map<String, Object> m=listGroupBy.get(i);
+				String xl_bm=m.get("line")==null?"":m.get("line").toString();
+				String dateStr=m.get("date")==null?"":m.get("date").toString();
+				String nbbm =m.get("nbbm")==null?"":m.get("nbbm").toString();
+				String jGh= m.get("jGh")==null?"":m.get("jGh").toString();
+				String sGh= m.get("sGh")==null?"":m.get("sGh").toString();
+				List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+				for (int j = 0; j < list.size(); j++) {
+					ScheduleRealInfo s=list.get(j);
+					if(zt.equals("zbh")){
+						if(xl_bm.equals(s.getXlBm()) && nbbm.equals(s.getClZbh())){
+							lists.add(s);
+						}
+					}else{
+						if(xl_bm.equals(s.getXlBm()) && nbbm.equals(s.getClZbh()) 
+								&& dateStr.equals(s.getScheduleDateStr())
+								&& jGh.equals(s.getjGh()) && sGh.equals(s.getsGh())){
+							lists.add(s);
+						}
+					}
+				}
+				
+				if(zt.equals("zbh")){
+					Map<String, Object> newMap=staticTj(lists, "");
+					double yhl=0.0;
+					double jzl=0.0;
+					double hyl=0.0;
+					double dhl=0.0;
+					double cdl=0.0;
+					for (int j = 0; j < ylbList.size(); j++) {
+						Ylb y=ylbList.get(j);
+						if(nbbm.equals(y.getNbbm()) && xl_bm.equals(y.getXlbm())){
+							yhl=Arith.add(yhl, y.getYh());
+							jzl=Arith.add(jzl, y.getJzl());
+							hyl=Arith.add(hyl, y.getYh());
+						}
+						
+					}
+					for (int j = 0; j < dlbList.size(); j++) {
+						Dlb d=dlbList.get(j);
+						if(nbbm.equals(d.getNbbm())&&xl_bm.equals(d.getXlbm())){
+							dhl=Arith.add(dhl, d.getHd());
+							cdl=Arith.add(cdl, d.getCdl());
+						}
+					}
+					if(date.equals(date2)){
+						newMap.put("rq",date);
+					}else{
+						newMap.put("rq",date+"至"+date2);
+					}
+					newMap.put("yhl", yhl);
+					newMap.put("jzl", jzl);
+					newMap.put("hyl", hyl);
+					newMap.put("dhl", dhl);
+					newMap.put("cdl", cdl);
+					lMap.add(newMap);
+				}else{
+					Map<String, Object> newMap=staticTj(lists, "");
+					double lc=Double.parseDouble(newMap.get("zlc").toString());
+					double yhl=0.0;
+					double jzl=0.0;
+					double hyl=0.0;
+					double dhl=0.0;
+					double cdl=0.0;
+					double zlc=0.0;
+					for (int j = 0; j < ylbList.size(); j++) {
+						Ylb y=ylbList.get(j);
+						if(nbbm.equals(y.getNbbm()) && xl_bm.equals(y.getXlbm())
+								&&dateStr.equals(sdf.format(y.getRq()))
+								&&jGh.equals(y.getName())){
+							yhl=Arith.add(yhl, y.getYh());
+							jzl=Arith.add(jzl, y.getJzl());
+							hyl=Arith.add(hyl, y.getYh());
+							zlc=Arith.add(zlc, y.getZlc());
+						}
+						
+					}
+				
+					for (int j = 0; j < dlbList.size(); j++) {
+						Dlb d=dlbList.get(j);
+						if(nbbm.equals(d.getNbbm())&&xl_bm.equals(d.getXlbm())
+								&&dateStr.equals(sdf.format(d.getRq()))
+								&&jGh.equals(d.getName())){
+							dhl=Arith.add(dhl, d.getHd());
+							cdl=Arith.add(cdl, d.getCdl());
+							zlc=Arith.add(zlc, d.getZlc());
+						}
+					}
+					double div=0.0;
+					if(lc>0){
+						div=Arith.div(zlc, lc,2);
+					}
+					newMap.put("yhl", yhl*div);
+					newMap.put("jzl", jzl*div);
+					newMap.put("hyl", hyl*div);
+					newMap.put("dhl", dhl*div);
+					newMap.put("cdl", cdl*div);
+					lMaps.add(newMap);
+				}
+				
+			}
+			 
+			 if(!zt.equals("zbh")){
+				 String sqls="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh"
+			        		+ " from bsth_c_s_sp_info_real r where"
+					        + " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
+					if(line.equals("")){
+						sqls +="and r.gs_bm='"+gsdm+"' "
+								+ " and r.fgs_bm='"+fgsdm+"'";
+					}else{
+						sqls += " and r.xl_bm = '"+line+"'";
+					}
+					sqls += " group  by  r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh";  
+					
+					 List<Map<String, Object>> listGroupBys=jdbcTemplate.query(sqls, new RowMapper<Map<String, Object>>() {
+							@Override
+							public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
+								Map<String, Object> map=new HashMap<String,Object>();
+								map.put("line",arg0.getString("xl_bm"));
+								map.put("nbbm", arg0.getString("cl_zbh"));
+								map.put("jGh", arg0.getString("j_gh"));
+								map.put("sGh", arg0.getString("s_gh"));
+								return map;
+							}
+						});
+					 lMap=lists(listGroupBys, lMaps, gsdm, fgsdm, date, date2);
+					 
+			 }
+	        
+			return lMap;
+		}
+		 public final List<Ylb> ylbList(String sql){
+			 List<Ylb> ylbList= jdbcTemplate.query(sql, new RowMapper<Ylb>() {
+					@Override
+					public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
+						Ylb y = new Ylb();
+						y.setXlbm(arg0.getString("xlbm"));
+						y.setNbbm(arg0.getString("nbbm"));
+						y.setJzl(arg0.getDouble("jzl"));
+						y.setYh(arg0.getDouble("yh"));
+						y.setSh(arg0.getDouble("sh"));
+						return y;
+					}
+				});
+			 return ylbList;
+		 }
+		 
+		 public final List<Dlb> dlbList(String sql){
+			 List<Dlb> dlbList= jdbcTemplate.query(sql, new RowMapper<Dlb>() {
+					@Override
+					public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
+						Dlb y = new Dlb();
+						y.setXlbm(arg0.getString("xlbm"));
+						y.setNbbm(arg0.getString("nbbm"));
+						y.setCdl(arg0.getDouble("cdl"));
+						y.setHd(arg0.getDouble("hd"));
+						y.setSh(arg0.getDouble("sh"));
+						return y;
+					}
+				});
+			 return dlbList;
+		 }
+		 
+		 public final List<Map<String, Object>> lists(List<Map<String, Object>> listGb,
+				                                      List<Map<String, Object>> listLc,
+				                                      String gsdm,String fgsdm,
+				                                      String date,String date2){
+			 List<Map<String, Object>> lMap=new ArrayList<Map<String,Object>>();
+			 for (int i = 0; i < listGb.size(); i++) {
+				 Map<String, Object> m=listGb.get(i);
+				 String xl_bm=m.get("line")==null?"":m.get("line").toString();
+				 String nbbm =m.get("nbbm")==null?"":m.get("nbbm").toString();
+				 String jGh= m.get("jGh")==null?"":m.get("jGh").toString();
+				 String sGh= m.get("sGh")==null?"":m.get("sGh").toString();
+				 double jhzlc = 0.0,jhlc= 0.0,jcclc= 0.0,zlc= 0.0,jhnlc= 0.0,jhwlc= 0.0,
+				 jhnjcclc= 0.0,jhwjcclc= 0.0,zrwjcclc= 0.0,lbss= 0.0,ssgl_lz= 0.0,
+				 ssgl_dm= 0.0,ssgl_gz= 0.0,ssgl_jf= 0.0,ssgl_zs= 0.0,ssgl_qr= 0.0,ssgl_qc= 0.0,
+				 ssgl_kx= 0.0,ssgl_qh= 0.0,ssgl_yw= 0.0,ssgl_other= 0.0,ljyy=0.0,ljjcc=0.0,
+					kfks=0.0,yhl=0.0,jzl=0.0,hyl=0.0,dhl=0.0,cdl=0.0;
+				 
+				 for (int j = 0; j < listLc.size(); j++) {
+					 Map<String, Object> map=listLc.get(j);
+			         if(xl_bm.equals(map.get("line").toString())
+			    		   && nbbm.equals(map.get("nbbm").toString())
+			    		   && sGh.equals(map.get("sGh")==null?"":map.get("sGh").toString())
+			    		   && jGh.equals(map.get("jGh").toString())){
+			        	 jhzlc=Arith.add(jhzlc, map.get("jhzlc"));
+			        	 jhlc =Arith.add(jhlc, map.get("jhlc"));
+			        	 jcclc=Arith.add(jcclc, map.get("jcclc"));
+			        	 zlc=Arith.add(zlc, map.get("zlc"));
+			        	 jhnlc=Arith.add(jhnlc, map.get("jhnlc"));
+			        	 jhwlc=Arith.add(jhwlc, map.get("jhwlc"));
+			        	 jhnjcclc=Arith.add(jhnjcclc, map.get("jhnjcclc"));
+			        	 jhwjcclc=Arith.add(jhwjcclc, map.get("jhwjcclc"));
+			        	 zrwjcclc=Arith.add(zrwjcclc, map.get("zrwjcclc"));
+			        	 lbss=Arith.add(lbss, map.get("lbss"));
+			        	 ssgl_lz=Arith.add(ssgl_lz, map.get("ssgl_lz"));
+			        	 ssgl_dm=Arith.add(ssgl_dm, map.get("ssgl_dm"));
+			        	 ssgl_gz=Arith.add(ssgl_gz, map.get("ssgl_gz"));
+			        	 ssgl_jf=Arith.add(ssgl_jf, map.get("ssgl_jf"));
+			        	 ssgl_zs=Arith.add(ssgl_zs, map.get("ssgl_zs"));
+			        	 ssgl_qr=Arith.add(ssgl_qr, map.get("ssgl_qr"));
+			        	 ssgl_qc=Arith.add(ssgl_qc, map.get("ssgl_qc"));
+			        	 ssgl_kx=Arith.add(ssgl_kx, map.get("ssgl_kx"));
+			        	 ssgl_qh=Arith.add(ssgl_qh, map.get("ssgl_qh"));
+			        	 ssgl_yw=Arith.add(ssgl_yw, map.get("ssgl_yw"));
+			        	 ssgl_other=Arith.add(ssgl_other, map.get("ssgl_other"));
+			        	 kfks=Arith.add(kfks, map.get("kfks"));
+			        	 ljyy=Arith.add(ljyy, map.get("ljyy"));
+			        	 ljjcc=Arith.add(ljjcc, map.get("ljjcc"));
+			        	 yhl=Arith.add(yhl, map.get("yhl"));
+			        	 jzl=Arith.add(jzl, map.get("jzl"));
+			        	 hyl=Arith.add(hyl, map.get("hyl"));
+			        	 dhl=Arith.add(dhl, map.get("dhl"));
+			        	 cdl=Arith.add(cdl, map.get("cdl"));
+			        	
+			        	 
+			         }
+				 }
+				 
+				 Map<String, Object> newMap=new HashMap<String,Object>();
+				 if(date.equals(date2)){
+					 newMap.put("rq", date);
+				 }else{
+					 newMap.put("rq", date+"至"+date2);
+				 }
+				 newMap.put("fgs", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+				 newMap.put("xlName", BasicData.lineCode2NameMap.get(xl_bm));
+				 newMap.put("jGh", jGh);
+				 newMap.put("jName", jGh);
+				 newMap.put("sGh",sGh);
+				 newMap.put("sName", sGh);
+				 newMap.put("nbbm", nbbm);
+				 newMap.put("jhzlc", jhzlc);
+	        	 newMap.put("jhlc", jhlc);
+	        	 newMap.put("jcclc", jcclc);
+	        	 newMap.put("zlc", zlc);
+	        	 newMap.put("jhnlc", jhnlc);
+	        	 newMap.put("jhwlc", jhwlc);
+	        	 newMap.put("jhnjcclc", jhnjcclc);
+	        	 newMap.put("jhwjcclc", jhwjcclc);
+	        	 newMap.put("zrwjcclc", zrwjcclc);
+	        	 newMap.put("lbss", lbss);
+	        	 newMap.put("ssgl_lz", ssgl_lz);
+	        	 newMap.put("ssgl_dm",ssgl_dm);
+	        	 newMap.put("ssgl_gz", ssgl_gz);
+	        	 newMap.put("ssgl_jf", ssgl_jf);
+	        	 newMap.put("ssgl_zs", ssgl_zs);
+	        	 newMap.put("ssgl_qr", ssgl_qr);
+	        	 newMap.put("ssgl_qc", ssgl_qc);
+	        	 newMap.put("ssgl_kx", ssgl_kx);
+	        	 newMap.put("ssgl_qh", ssgl_qh);
+	        	 newMap.put("ssgl_yw", ssgl_yw);
+	        	 newMap.put("ssgl_other", ssgl_other);
+	        	 newMap.put("kfks", kfks);
+	        	 newMap.put("ljyy", ljyy);
+	        	 newMap.put("ljjcc", ljjcc);
+	        	 newMap.put("yhl", yhl);
+				 newMap.put("jzl", jzl);
+				 newMap.put("hyl", hyl);
+				 newMap.put("dhl", dhl);
+				 newMap.put("cdl", cdl);
+				 lMap.add(newMap);
+			}
+			 return lMap;
+		 }
+		 
 }
@@ -45,12 +45,13 @@
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 					</div>
-					<div style="margin-top: 2px"></div>
-					<div style="display: inline-block;">
+					<div style="display: inline-block;margin-left: 29px;">
                         <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;">
+					<div style="margin-top: 2px"></div>
+					
+                    <div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">开始时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 180px;"/>
                     </div>
@@ -58,6 +59,13 @@
                         <span class="item-label" style="width: 80px;">结束时间: </span>
                         <input class="form-control" type="text" id="date2" style="width: 180px;"/>
                     </div>
+                     <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">显示分类: </span>
+                        <select class="form-control"  style="width: 120px;" id="zt">
+                        	<option value="zbh">车辆</option>
+                        	<option value="js">驾/售</option>
+                        </select>
+                    </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
@@ -67,43 +75,8 @@
 			<div class="portlet-body">
 				<div class="table-container"  id="countLine" style="margin-top: 10px;overflow:auto;min-width: 906px">
 					<table class="table table-bordered table-hover table-checkable" id="forms">
-						<thead>
-							<tr>
-								<th colspan="26">路单数据统计表</th>
-							</tr>
-							<tr>
-								<td>序号</td>
-								<td>日期</td>
-								<td>所属公司</td>
-								<td>线路</td>
-								<td>车号</td>
-								<td>司机职号</td>
-								<td>司机姓名</td>
-								<td>售票员职号</td>
-								<td>售票员姓名</td>
-								<td>行驶里程(包括空放)</td>
-								<td>计划内营运里程</td>
-								<td>临时性多样化调度营运里程</td>
-								<td>计划内进出场空驶里程</td>
-								<td>计划外进出场空驶里程</td>
-								<td>空放空驶</td>
-								<td>故障进出场空驶里程</td>
-								<td>肇事进出场空驶里程</td>
-								<td>纠纷进出场空驶里程</td>
-								<td>临加营运公里</td>
-								<td>临加进出场空驶</td>
-								<td>电耗量</td>
-								<td>加电量</td>
-								<td>耗油量</td>
-								<td>加注量</td>
-								<td>非营业用油</td>
-								<td>计划总公里</td>
-							</tr>
-							
-						</thead>
-						<tbody class="statisticsDaily">
-							
-						</tbody>
+						
+						
 					</table>
 				</div>
 			</div>
@@ -209,7 +182,10 @@
 		var date2 ="";
 		var gsdm="";
 		var fgsdm="";
+		var zt="";
+		$("#countLine").height($(window).height()-280);
 		$("#query").on("click",function(){
+			$("#countLine").height($(window).height()-280);
 			if($("#date").val() == null || $("#date").val().trim().length == 0){
 				layer.msg("请选择时间范围！");
 				return;
@@ -224,6 +200,7 @@
 			date2 =$("#date2").val();
 			gsdm =$("#gsdm").val();
 			fgsdm=$("#fgsdm").val();
+			zt=$("#zt").val();
 			if(line=="请选择"){
 				line="";
 			}
@@ -237,22 +214,25 @@
 				 params['date'] = date;
 				 params['date2'] = date2;
 				 params['xlName'] = xlName;
+				 params['zt']=zt;
 				 params['type'] = "query";
-				$get('/report/countLineMileage',params,function(result){
+				 var tbodyHtml = template('countBusDaily',{list:""});
+				 $get('/report/countBusMileage',params,function(result){
+					 console.log(result);
 					// 把数据填充到模版中
-					var tbodyHtml = template('statisticsDaily',{list:result});
+					var tbodyHtml = template('countBusDaily',{list:result,zt:zt});
 					// 把渲染好的模版html文本追加到表格中
-					$('#forms .statisticsDaily').html(tbodyHtml);
+					$('#forms').html(tbodyHtml);
 					if(result.length == 0)
 						$("#export").attr('disabled',"true");
 					else
 						$("#export").removeAttr("disabled");
-				});
+				}); 
 			}
 		});
-		$("#countLine").height($(window).height()-280);
+		
 		$("#export").on("click",function(){
 			 var params = {};
 			 params['gsdm'] = gsdm;
@@ -269,55 +249,79 @@
 	});
 </script>
-<script type="text/html" id="statisticsDaily">
+<script type="text/html" id="countBusDaily">
+	<thead>
+		<tr>
+			<th colspan="26">路单数据统计表</th>
+		</tr>
+		<tr>
+		    <td>序号</td>
+			<td>日期</td>
+			<td>所属公司</td>
+			<td>线路</td>
+			<td>车号</td>
+			{{if zt=='js'}}
+                <td>司机职号</td>
+			    <td>司机姓名</td>
+			    <td>售票员职号</td>
+			    <td>售票员姓名</td>
+            {{/if}}
+			<td>行驶里程(包括空放)</td>
+			<td>计划内营运里程</td>
+			<td><label>临时性</label><label>多样化</label><label>调度营</label><label>运里程</label></td>
+			<td><label>计划内</label><label>进出场</label><label>空驶</label></td>
+			<td><label>计划外</label><label>进出场</label><label>空驶</label></td>
+			<td>空放空驶</td>
+			<td><label>故障</label><label>进出场</label><label>空驶</label></td>
+			<td><label>肇事</label><label>进出场</label><label>空驶</label></td>
+			<td><label>纠纷</label><label>进出场</label><label>空驶</label></td>
+			<td>临加营运公里</td>
+			<td>临加进出场空驶</td>
+			<td>电耗量</td>
+			<td>加电量</td>
+			<td>耗油量</td>
+			<td>加注量</td>
+			<td>非营业用油</td>
+			<td>计划总公里</td>
+		</tr>						
+	</thead>
+    <tbody >					
 	{{each list as obj i}}
 		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.rq}}</td>
+			<td>{{obj.fgs}}</td>
 			<td>{{obj.xlName}}</td>
-			<td>{{obj.jhzlc}}</td>
-			<td>{{obj.jhlc}}</td>
-			<td>{{obj.jcclc}}</td>
-			<td>{{obj.sjzgl}}</td>
-			<td>{{obj.sjgl}}</td>
-			<td>{{obj.sjksgl}}</td>
-			<td>{{obj.ssgl}}</td>
-			<td>{{obj.ssbc}}</td>
-			<td>{{obj.ssgl_lz}}</td>
-			<td>{{obj.ssgl_dm}}</td>
-			<td>{{obj.ssgl_gz}}</td>
-			<td>{{obj.ssgl_jf}}</td>
-			<td>{{obj.ssgl_zs}}</td>
-			<td>{{obj.ssgl_qr}}</td>
-			<td>{{obj.ssgl_qc}}</td>
-			<td>{{obj.ssgl_kx}}</td>
-			<td>{{obj.ssgl_qh}}</td>
-			<td>{{obj.ssgl_yw}}</td>
-			<td>{{obj.ssgl_other}}</td>
-			<td>{{obj.ljgl}}</td>
-			<td>{{obj.jhbc}}</td>
-			<td>{{obj.jhbc_m}}</td>
-			<td>{{obj.jhbc_a}}</td>
-			<td>{{obj.sjbc}}</td>
-			<td>{{obj.sjbc_m}}</td>
-			<td>{{obj.sjbc_a}}</td>
-			<td>{{obj.ljbc}}</td>
-			<td>{{obj.ljbc_m}}</td>
-			<td>{{obj.ljbc_a}}</td>
-			<td>{{obj.fzbc}}</td>
-			<td>{{obj.fzbc_m}}</td>
-			<td>{{obj.fzbc_a}}</td>
-			<td>{{obj.dtbc}}</td>
-			<td>{{obj.dtbc_m}}</td>
-			<td>{{obj.dtbc_a}}</td>
-			<td>{{obj.djg}}</td>
-			<td>{{obj.djg_m}}</td>
-			<td>{{obj.djg_a}}</td>
-			<td>{{obj.djg_time}}</td>
-			<td>&nbsp;</td>	
+			<td>{{obj.nbbm}}</td>
+			{{if zt=='js'}}
+			<td>{{obj.jGh}}</td>
+			<td>{{obj.jName}}</td>
+			<td>{{obj.sGh}}</td>
+			<td>{{obj.sName}}</td>
+			{{/if}}
+			<td>{{obj.zlc}}</td>
+            <td>{{obj.jhnlc}}</td>
+			<td>{{obj.jhwlc}}</td>
+			<td>{{obj.jhnjcclc}}</td>
+			<td>{{obj.jhwjcclc}}</td>
+			<td>{{obj.kfks}}</td>
+			<td>{{obj.zrwjcclc}}</td>
+			<td>0</td>
+			<td>0</td>
+			<td>{{obj.ljyy}}</td>
+			<td>{{obj.ljjcc}}</td>
+			<td>{{obj.yhl}}</td>
+			<td>{{obj.jzl}}</td>
+			<td>{{obj.hyl}}</td>
+			<td>{{obj.dhl}}</td>
+			<td>{{obj.cdl}}</td>
+			<td>{{obj.jhzlc}}</td>	
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="26"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
+</tbody>
 </script>
 \ No newline at end of file