新报表修改早晚高峰配车修改

廖磊
1 parent b1585754
Showing 10 changed files with 353 additions and 68 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/mould/countByBus1.xls
src/main/resources/static/pages/forms/mould/countByBus2.xls
src/main/resources/static/pages/forms/mould/countByLine.xls
src/main/resources/static/pages/forms/statement/correctStatis.html
src/main/resources/static/pages/mforms/changetochanges/changetochange.html
src/main/resources/static/pages/report/countMileage/countBus/countBusMileage.html
src/main/resources/static/pages/report/countMileage/countLine/countLineMileage.html
@@ -1020,19 +1020,19 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
-		sql = "select name from bsth_c_line where sfyy = 0";
+		sql = "select line_code from bsth_c_line where sfyy = 0";
 		List<String> strList = new ArrayList<>();
 		strList = jdbcTemplate.query(sql,
 				new RowMapper<String>(){
 			@Override
 			public String mapRow(ResultSet rs, int rowNum) throws SQLException {
-				return rs.getString("name");
+				return rs.getString("line_code");
 			}
 		});
 		lineSet.addAll(strList);
 		for(Line line1 : lineList){
-			if(lineSet.contains(line1.getName())){
+			if(lineSet.contains(line1.getLineCode())){
 				continue;
 			}
 			if(line.trim().length() == 0 || line1.getLineCode().equals(line)){
@@ -738,6 +738,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		// TODO Auto-generated method stub
 		double ljjcc=0.0;
 		double ljyy=0.0;
+		double ljkfks=0.0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo t=lists.get(i);
 			if(t.isSflj()){
@@ -760,6 +761,24 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					}*/
 				}
+				if(t.getBcType().equals("ldks")){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						if(!t.isDestroy()){
+							ljkfks =Arith.add(ljkfks, t.getJhlc());
+						}
+						
+					}
+					/*else{
+						//临加进出场子任务 待统计
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						double zrwlc=0.0;
+						boolean fage=false;
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                }
+					}*/
+				}
 				if(!isInOut(t)){
 					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
 					if(childTaskPlans.isEmpty()){
@@ -774,6 +793,14 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		                    	 if(childTaskPlan.getMileageType().equals("service")){
 		                    		 ljyy =Arith.add(ljyy,childTaskPlan.getMileage());
 		                    	 }
+		                    	 if(childTaskPlan.getMileageType().equals("empty")){
+		                    		 if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
+		                    			 ljjcc =Arith.add(ljjcc, childTaskPlan.getMileage());
+		                    		 }
+		                    		 if(childTaskPlan.getType2().equals("1")){
+		                    			 ljkfks =Arith.add(ljkfks, childTaskPlan.getMileage());
+		                    		 }
+		                    	 }
 		                    }
 		                }
 					}
@@ -784,6 +811,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		Map<String, Double> map=new HashMap<String,Double>();
 		map.put("ljjcc", ljjcc);
 		map.put("ljyy", ljyy);
+		map.put("ljkfks", ljkfks);
 		return map;
 	}
@@ -858,20 +886,32 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		double zrwjcclc=0.0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo t=lists.get(i);
-			if(!isInOut(t)){
-				Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
-				if(!childTaskPlans.isEmpty()){
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-	                while (it.hasNext()) {
-	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
-		                    if (childTaskPlan.isDestroy()) {
-		                    	if(childTaskPlan.getReason().equals(item)){
-			                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
-		                    	}
-		                    } 
-	                    }
-	                }
+			if(!t.isSflj()){
+				if(!isInOut(t)){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(!childTaskPlans.isEmpty()){
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if(item.equals("空放")){
+		                    	if(childTaskPlan.getType2().equals("1")){
+				                    if (!childTaskPlan.isDestroy()) {
+				                    	if(childTaskPlan.getReason().equals(item)){
+					                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+				                    	}
+				                    } 
+			                    }
+		                    }else{
+			                    if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
+				                    if (!childTaskPlan.isDestroy()) {
+				                    	if(childTaskPlan.getReason().equals(item)){
+					                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+				                    	}
+				                    } 
+			                    }
+		                    }
+		                }
+					}
 				}
 			}
 		}
@@ -37,6 +37,10 @@ import java.util.*;
 @Service
 public class ReportServiceImpl implements ReportService{
+	private static long zgf1 = 6 * 60 + 31,
+			zgf2 = 8 * 60 + 30,
+			wgf1 = 16 * 60 + 1, 
+			wgf2 = 18 * 60;
 	private Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -466,38 +470,35 @@ public class ReportServiceImpl implements ReportService{
 		System.out.println(609360/60);
 		System.out.println(609360%60);
 	}
-	@Override
+/*	@Override
 	public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
 		// TODO Auto-generated method stub
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
-		String sqlZd=" select t.*,x.station_name as qdz_name from ("
-				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'zqc' as lx  "
-				+ " from bsth_c_s_ttinfo_detail  where "
-				+ " bc_type='normal' and ttinfo ='"+ttinfo+"'  "
-				+ " and fcsj>'06:31' and fcsj<'08:00'  group by  qdz,lp) t1"
-				+ " group by qdz "
+		String sqlZd="select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqc' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"' "
+				+ " and bc_type ='normal'"
+				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
 				+ " union "
-				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'wqc' as lx  "
-				+ " from bsth_c_s_ttinfo_detail  where "
-				+ " bc_type='normal' and ttinfo ='"+ttinfo+"'   "
-				+ " and fcsj>'16:01' and fcsj<'18:00' group by qdz,lp) t2"
-				+ " group by qdz "
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqc' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='normal' "
+				+ " and fcsj >'16:01' and fcsj<'18:00' group by cl_zbh,qdz_name "
+				+ " ) a group by a.qdz_name "
 				+ " union "
-				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'zqj' as lx  "
-				+ " from bsth_c_s_ttinfo_detail  where "
-				+ " bc_type='region' and ttinfo ='"+ttinfo+"'  "
-				+ " and fcsj>'06:31' and fcsj<'08:00'  group by  qdz,lp) t3"
-				+ " group by qdz "
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqj' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='region' "
+				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
 				+ " union "
-				+ " select qdz,count(lp) as cls,lx from ( select qdz,lp,  'wqj' as lx  "
-				+ " from bsth_c_s_ttinfo_detail  where "
-				+ " bc_type='region' and ttinfo ='"+ttinfo+"'   "
-				+ " and fcsj>'16:01' and fcsj<'18:00' group by qdz,lp) t4"
-				+ " group by qdz ) t left join bsth_c_station  x on t.qdz=x.id";
-		
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqj' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name";
 		List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
 				 new RowMapper<Map<String, Object>>(){
 			 @Override
@@ -556,6 +557,208 @@ public class ReportServiceImpl implements ReportService{
 		}
 		return list;
+	}*/
+	@Override
+	public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
+		List<Map<String, Object>> list_s=new ArrayList<Map<String,Object>>();
+
+
+		/*String sqlZd="select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqc' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"' "
+				+ " and bc_type ='normal'"
+				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
+				+ " union "
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqc' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='normal' "
+				+ " and fcsj >'16:01' and fcsj<'18:00' group by cl_zbh,qdz_name "
+				+ " ) a group by a.qdz_name "
+				+ " union "
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'zqj' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='region' "
+				+ " and ((fcsj >'06:31' and fcsj<'08:30')  or ( fcsj>'6:31' and fcsj<'8:30'))"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name"
+				+ " union "
+				+ " select a.qdz_name,COUNT(a.cl_zbh)  as cls,'wqj' AS lx from ("
+				+ " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
+				+ " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
+				+ " group by cl_zbh,qdz_name) a group by a.qdz_name";*/
+		
+		        String sqlCl="SELECT cl_zbh,qdz_name,bc_type,fcsj,bcsj FROM"
+		        		+ "  bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
+		        		+ " AND bc_type = 'normal' order by qdz_name";
+		        
+        List<Map<String, Object>> listj= jdbcTemplate.query(sqlCl,
+				 new RowMapper<Map<String, Object>>(){
+			 @Override
+			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Map<String, Object> m=new HashMap<String,Object>();
+				 m.put("cl_zbh", rs.getString("cl_zbh"));
+				 m.put("qdz_name", rs.getString("qdz_name"));
+				 m.put("bcType", rs.getString("bc_type"));
+				 m.put("fcsj", rs.getString("fcsj"));
+				 m.put("bcsj", rs.getString("bcsj"));
+				 return m;
+			 }
+		});
+        
+        String sqlZd="select qdz_name ,bc_type from  bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
+        		+ " AND (bc_type = 'normal' or bc_type='region') group by qdz_name ,bc_type "
+        		+ " order by qdz_name";
+		List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
+				 new RowMapper<Map<String, Object>>(){
+			 @Override
+			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Map<String, Object> m=new HashMap<String,Object>();
+				 m.put("zdm", rs.getString("qdz_name"));
+				 m.put("bcType", rs.getString("bc_type"));
+				 return m;
+			 }
+		});
+		
+		for (int i = 0; i < lists.size(); i++) {
+			Map<String, Object> z=new HashMap<String,Object>();
+			Map<String, Object> w=new HashMap<String,Object>();
+			Map<String, Object> p=lists.get(i);
+			int zbcs=0;
+			int wbcs=0;
+			if(p.get("bcType").toString().equals("normal")){
+				for (int j = 0; j < listj.size(); j++) {
+					if(listj.get(j).get("qdz_name").toString().equals(p.get("zdm").toString()) && 
+							listj.get(j).get("bcType").toString().equals("normal")){
+						String time=listj.get(j).get("fcsj").toString();
+						long bcsj= Long.parseLong(listj.get(j).get("bcsj").toString());
+						String clZbh=listj.get(j).get("cl_zbh").toString();
+						String[] fcsjStr = time.split(":");
+						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+						long ddsj=fcsj+bcsj;
+						if((fcsj>=zgf1 && fcsj<=zgf2) || (ddsj>=zgf1&&ddsj<=zgf2) 
+								|| (fcsj<zgf1&&ddsj>zgf2)){
+							if(p.get("z"+clZbh)==null){
+								zbcs++;
+								p.put("z"+clZbh, clZbh);
+							}
+						}
+						
+						if((fcsj>=wgf1 && fcsj<=wgf2) || (ddsj>=wgf1&&ddsj<=wgf2) 
+								|| (fcsj<wgf1&&ddsj>wgf2)){
+							if(p.get("w"+clZbh)==null){
+								wbcs++;
+								p.put("w"+clZbh, clZbh);
+							}
+						}
+					}
+					
+				}
+				if(zbcs>0){
+					 z.put("zdm", p.get("zdm"));
+					 z.put("cls", zbcs);
+					 z.put("lx", "zqc");
+					 list_s.add(z);
+				}
+				if(wbcs>0){
+					w.put("zdm", p.get("zdm"));
+					 w.put("cls", zbcs);
+					 w.put("lx", "wqc");
+					 list_s.add(w);
+				}
+				
+			}
+			
+			if(p.get("bcType").equals("region")){
+				for (int j = 0; j < listj.size(); j++) {
+					if(listj.get(j).get("qdz_name").toString().equals(p.get("zdm").toString()) && 
+							listj.get(j).get("bcType").toString().equals("region")){
+						String time=listj.get(j).get("fcsj").toString();
+						long bcsj= Long.parseLong(listj.get(j).get("bcsj").toString());
+						String clZbh=listj.get(j).get("cl_zbh").toString();
+						String[] fcsjStr = time.split(":");
+						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+						long ddsj=fcsj+bcsj;
+						if((fcsj>=zgf1 && fcsj<=zgf2) || (ddsj>=zgf1&&ddsj<=zgf2) 
+								|| (fcsj<zgf1&&ddsj>zgf2)){
+							if(p.get("z"+clZbh)==null){
+								zbcs++;
+								p.put("z"+clZbh, clZbh);
+							}
+						}
+						
+						if((fcsj>=wgf1 && fcsj<=wgf2) || (ddsj>=wgf1&&ddsj<=wgf2) 
+								|| (fcsj<wgf1&&ddsj>wgf2)){
+							if(p.get("w"+clZbh)==null){
+								wbcs++;
+								p.put("w"+clZbh, clZbh);
+							}
+						}
+					}
+					
+				}
+				if(zbcs>0){
+					 z.put("zdm", p.get("zdm"));
+					 z.put("cls", zbcs);
+					 z.put("lx", "zqj");
+					 list_s.add(z);
+				}
+				if(wbcs>0){
+					 w.put("zdm", p.get("zdm"));
+					 w.put("cls", zbcs);
+					 w.put("lx", "wqj");
+					 list_s.add(w);
+				}
+			}
+			
+		}
+		int a=0;
+		int b=0;
+		int c=0;
+		int d=0;
+		for(int i=0;i<list_s.size();i++){
+			boolean fage=true;
+			Map<String, Object> newMap= new HashMap<String, Object>();
+			list.add(newMap);
+			Map<String, Object> maps=list_s.get(i);
+			if(maps.get("lx").equals("zqc")){
+				list.get(a).put("zqcZm", maps.get("zdm"));
+				list.get(a).put("zqcCls", maps.get("cls"));
+				a++;
+				fage=false;
+			}else if(maps.get("lx").equals("wqc")){
+				list.get(b).put("wqcZm", maps.get("zdm"));
+				list.get(b).put("wqcCls", maps.get("cls"));
+				b++;
+				fage=false;
+			}else if(maps.get("lx").equals("zqj")){
+				list.get(c).put("zqjZm", maps.get("zdm"));
+				list.get(c).put("zqjCls", maps.get("cls"));
+				c++;
+				fage=false;
+			}else if(maps.get("lx").equals("wqj")){
+				list.get(d).put("wqjZm", maps.get("zdm"));
+				list.get(d).put("wqjCls", maps.get("cls"));
+				d++;
+				fage=false;
+			}
+			if(fage){
+				break;
+			}
+		}
+		boolean status=true;
+		while (status) {
+			for (int i = 0; i < list.size(); i++) {
+				if(list.get(i).isEmpty()){
+					list.remove(i);
+					status=true;
+				}else{
+					status=false;
+				}
+			}
+			
+		}
+		return list;
 	}
 	@Override
@@ -1501,11 +1704,18 @@ public class ReportServiceImpl implements ReportService{
 		            Map<String, Object> m = new HashMap<String, Object>();
 		            m.put("date", date);
 		            m.put("date1", date2);
+		            String by=map.get("by").toString();
+		            String xls="";
+		            if(by.equals("sj")){
+		            	xls="countByLine.xls";
+		            }else{
+		            	xls="countByLines.xls";
+		            }
 		            ReportUtils ee = new ReportUtils();
 		            try {
 		                listI.add(lMap.iterator());
 		                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-		                ee.excelReplace(listI, new Object[]{m}, path + "mould/countByLine.xls",
+		                ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
 		                        path + "export/线路公里统计表.xls");
 		            } catch (Exception e) {
 		                // TODO: handle exception
@@ -1572,9 +1782,12 @@ public class ReportServiceImpl implements ReportService{
 					Map<String, Double> culateLjMile=culateService.culateLjMile(lists);
 					double ljyy=culateLjMile.get("ljyy");
 					double ljjcc=culateLjMile.get("ljjcc");
+					double ljkfks=culateLjMile.get("ljkfks");
 					map.put("ljyy", ljyy);
 					map.put("ljjcc", ljjcc);
-					double ljlc=Arith.add(ljyy, ljjcc);
+					map.put("ljkfks", ljkfks);
+					
+					double ljlc=Arith.add(Arith.add(ljyy, ljjcc),ljkfks);
 					double lbss=culateService.culateSsMile(list);//烂班少驶
 					map.put("lbss", lbss);
@@ -1594,18 +1807,18 @@ public class ReportServiceImpl implements ReportService{
 			        double zrwjcclc=culateService.culateZrwJccLc(list, "故障");
 			        double zrwjcclc1=culateService.culateZrwJccLc(list, "肇事");
 			        double zrwjcclc2=culateService.culateZrwJccLc(list, "纠纷");
+			        double zrwjcclcqt=culateService.culateZrwJccLc(list, "其他");
+			        map.put("jhwjcclc_z", Arith.add(jhwjcclc,zrwjcclcqt)); 
 			        map.put("zrwjcclc", zrwjcclc);
 			        map.put("zrwjcclc1", zrwjcclc1);
 			        map.put("zrwjcclc2", zrwjcclc2);
-			        double zrwjcc=Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2);
-			        double kfks=culateService.culateKfksLc(lists);
+			        map.put("zrwjcclcqt", zrwjcclcqt);
+			        double zrwjcc=Arith.add(Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2),zrwjcclcqt);
+			        double kfks=Arith.add(culateService.culateKfksLc(lists),culateService.culateZrwJccLc(list, "空放"));
 			        map.put("kfks", kfks);
 			        double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc), 
 			        		Arith.add(zjcclc, zyylc)),kfks);
-			        
-			        
 			        map.put("zlc", zlc);
-			      
 		    	}
 		        return map;
 		    }
@@ -1830,10 +2043,22 @@ public class ReportServiceImpl implements ReportService{
 		            m.put("date", date);
 		            m.put("date1", date2);
 		            String xls="";
+		            String by=map.get("by").toString();
+		            
+		           
 		            if(zt.equals("zbh")){
-		            	xls="countByBus1.xls";
+		            	 if(by.equals("sj")){
+		            		 xls="countByBus1.xls";
+			             }else{
+			            	 xls="countByBus1s.xls";
+			             }
 		            }else{
-		            	xls="countByBus2.xls";
+		            	
+		            	 if(by.equals("sj")){
+		            		 xls="countByBus2.xls";
+			             }else{
+			            	 xls="countByBus2s.xls";
+			             }
 		            }
 		            ReportUtils ee = new ReportUtils();
 		            try {
@@ -1896,7 +2121,8 @@ public class ReportServiceImpl implements ReportService{
 				 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,
+				 jhnjcclc= 0.0,jhwjcclc= 0.0,jhwjcclc_z=0.0,zrwjcclc= 0.0,zrwjcclc1= 0.0,zrwjcclc2= 0.0,
+						 zrwjcclcqt=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;
@@ -1915,7 +2141,11 @@ public class ReportServiceImpl implements ReportService{
 			        	 jhwlc=Arith.add(jhwlc, map.get("jhwlc"));
 			        	 jhnjcclc=Arith.add(jhnjcclc, map.get("jhnjcclc"));
 			        	 jhwjcclc=Arith.add(jhwjcclc, map.get("jhwjcclc"));
+			        	 jhwjcclc_z=Arith.add(jhwjcclc_z,  map.get("jhwjcclc_z"));
 			        	 zrwjcclc=Arith.add(zrwjcclc, map.get("zrwjcclc"));
+			        	 zrwjcclc1=Arith.add(zrwjcclc1, map.get("zrwjcclc1"));
+			        	 zrwjcclc2=Arith.add(zrwjcclc2, map.get("zrwjcclc2"));
+			        	 zrwjcclcqt=Arith.add(zrwjcclcqt, map.get("zrwjcclcqt"));
 			        	 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"));
@@ -1962,7 +2192,11 @@ public class ReportServiceImpl implements ReportService{
 	        	 newMap.put("jhwlc", jhwlc);
 	        	 newMap.put("jhnjcclc", jhnjcclc);
 	        	 newMap.put("jhwjcclc", jhwjcclc);
+	        	 newMap.put("jhwjcclc_z", jhwjcclc_z);
 	        	 newMap.put("zrwjcclc", zrwjcclc);
+	        	 newMap.put("zrwjcclc1", zrwjcclc1);
+	        	 newMap.put("zrwjcclc2", zrwjcclc2);
+	        	 newMap.put("zrwjcclcqt", zrwjcclcqt);
 	        	 newMap.put("lbss", lbss);
 	        	 newMap.put("ssgl_lz", ssgl_lz);
 	        	 newMap.put("ssgl_dm",ssgl_dm);
@@ -48,17 +48,17 @@
 						<span class="item-label" style="width: 80px;">结束时间: </span>
 						<input class="form-control" type="text" id="endDate" style="width: 140px;"/>
 					</div>
-					<div style="display: inline-block; margin-left: 10px;">
+					<div style="display: inline-block; margin-left: 10px;display: none;">
 						<select class="form-control" name="sfqr" id="sfqr" style="width: 75px;">
 							<option value="0">全日</option>
 							<option value="1">时段</option>
 						</select>
 					</div>
-					<div style="display: inline-block;margin-left: 12px;">
+					<div style="display: inline-block;margin-left: 12px;display: none;" >
 						<span class="item-label" style="width: 80px;"> </span>
 						<input class="form-control" type="text" id="times1" style="width: 60px;"/>
 					</div>
-					<div style="display: inline-block;">
+					<div style="display: inline-block;display: none;">
 						<span class="item-label" style="width: 80px;"> - </span>
 						<input class="form-control" type="text" id="times2" style="width: 60px;"/>
 					</div>
@@ -427,7 +427,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="15"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </tbody>
@@ -100,7 +100,7 @@
 								<td rowspan="3" style="padding-top: 50px;">分公司</td>
 								<td rowspan="3" style="padding-top: 50px;">线路</td>
 								<td rowspan="3" style="padding-top: 50px;">路牌</td>
-								<td rowspan="3" style="padding-top: 50px;">发生时间</td>
+								<td rowspan="3" style="padding-top: 50px;">发车时间</td>
 								<td rowspan="3" style="padding-top: 50px;">修改时间</td>
 								<td colspan="2">配车</td>
 								<td colspan="4">人员</td>
@@ -28,7 +28,7 @@
 <div class="page-head">
 	<div class="page-title">
-		<h1>路单数据统计表</h1>
+		<h1>路单数据统计表(审计)</h1>
 	</div>
 </div>
@@ -230,8 +230,9 @@
 				 params['zt']=zt;
 				 params['type'] = "query";
 				 var tbodyHtml = template('countBusDaily',{list:""});
+				 var i = layer.load(2);
 				 $get('/report/countBusMileage',params,function(result){
-					 console.log(result);
+					 layer.close(i);
 					// 把数据填充到模版中
 					var tbodyHtml = template('countBusDaily',{list:result,zt:zt});
 					// 把渲染好的模版html文本追加到表格中
@@ -256,6 +257,7 @@
 			 params['xlName'] = xlName;
 			 params['zt']=zt;
 			 params['type'] = "export";
+			 params['by']='sj';
 			$get('/report/countBusMileage',params,function(result){
 				window.open("/downloadFile/download?fileName=路单数据统计表");
 			});
@@ -266,7 +268,7 @@
 <script type="text/html" id="countBusDaily">
 	<thead>
 		<tr>
-			<th colspan="26">路单数据统计表</th>
+			<th colspan="31">路单数据统计表</th>
 		</tr>
 		<tr>
 		    <td>序号</td>
@@ -291,6 +293,7 @@
 			<td><label>纠纷</label><label>进出场</label><label>空驶</label></td>
 			<td>临加营运公里</td>
 			<td>临加进出场空驶</td>
+			<td>临加空放空驶</td>
 			<td>电耗量</td>
 			<td>加电量</td>
 			<td>耗油量</td>
@@ -317,18 +320,19 @@
             <td>{{obj.jhnlc}}</td>
 			<td>{{obj.jhwlc}}</td>
 			<td>{{obj.jhnjcclc}}</td>
-			<td>{{obj.jhwjcclc}}</td>
+			<td>{{obj.jhwjcclc_z}}</td>
 			<td>{{obj.kfks}}</td>
 			<td>{{obj.zrwjcclc}}</td>
 			<td>{{obj.zrwjcclc1}}</td>
 			<td>{{obj.zrwjcclc2}}</td>
 			<td>{{obj.ljyy}}</td>
 			<td>{{obj.ljjcc}}</td>
-			<td>{{obj.yhl}}</td>
-			<td>{{obj.jzl}}</td>
-			<td>{{obj.hyl}}</td>
+			<td>{{obj.ljkfks}}</td>
 			<td>{{obj.dhl}}</td>
 			<td>{{obj.cdl}}</td>
+			<td>{{obj.yhl}}</td>
+			<td>{{obj.hyl}}</td>
+			<td>{{obj.jzl}}</td>
 			<td>{{obj.jhzlc}}</td>	
 		</tr>
 	{{/each}}
@@ -28,7 +28,7 @@
 <div class="page-head">
 	<div class="page-title">
-		<h1>线路公里统计表</h1>
+		<h1>线路公里统计表(审计)</h1>
 	</div>
 </div>
@@ -69,7 +69,7 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="28"><label id="datetodate"></label>线路公里统计表</th>
+								<th colspan="30"><label id="datetodate"></label>线路公里统计表</th>
 							</tr>
 							<tr>
 								<td rowspan="2"><span>公司</span></td>
@@ -80,10 +80,10 @@
 								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
 								<td rowspan="2"><label>实际</label><label>总公里</label></td>
 								<td colspan="2"><label>实际营</label><label>运公里</label></td>
-								<td colspan="5"><label>实际空</label><label>驶公里</label></td>
+								<td colspan="6"><label>实际空</label><label>驶公里</label></td>
 								<td rowspan="2"><label>少驶营</label><label>运里程</label></td>
 								<td colspan="11">少驶原因(公里)</td>
-								<td colspan="2">临加公里</td>
+								<td colspan="3">临加公里</td>
 							</tr>
 							<tr>
 								<td><label>计划内</label><label>营运</label><label>里程</label></td>
@@ -93,6 +93,7 @@
 								<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><label>空放 </label><label>空驶</label></td>
 								<td><span>路阻</span></td>
 								<td><span>吊慢</span></td>
 								<td><span>故障</span></td>
@@ -106,6 +107,7 @@
 								<td><span>其他</span></td>
 								<td><label>临加营</label><label>运公里</label></td>
 								<td><label>临加进出</label><label>场空驶</label></td>
+								<td><label>临加</label><label>空放</label><label>空驶</label></td>
 							</tr>
 						</thead>
@@ -260,8 +262,10 @@
 				 params['date2'] = date2;
 				 params['xlName'] = xlName;
 				 params['type'] = "query";
+				 var i = layer.load(2);
 				$get('/report/countLineMileage',params,function(result){
 					$("#datetodate").html(date+"至"+date2);
+					layer.close(i);
 					// 把数据填充到模版中
 					var tbodyHtml = template('countLineList',{list:result});
 					// 把渲染好的模版html文本追加到表格中
@@ -285,6 +289,7 @@
 			 params['date2'] = date2;
 			 params['xlName'] = xlName;
 			 params['type'] = "export";
+			 params['by']='sj';
 			$get('/report/countLineMileage',params,function(result){
 				window.open("/downloadFile/download?fileName=线路公里统计表");
 			});
@@ -304,10 +309,11 @@
 				<td>{{obj.jhnlc}}</td>
 				<td>{{obj.jhwlc}}</td>
 				<td>{{obj.jhnjcclc}}</td>
-				<td>{{obj.jhwjcclc}}</td>
+				<td>{{obj.jhwjcclc_z}}</td>
 				<td>{{obj.zrwjcclc}}</td>
 				<td>{{obj.zrwjcclc1}}</td>
 				<td>{{obj.zrwjcclc2}}</td>
+				<td>{{obj.kfks}}</td>
 				<td>{{obj.lbss}}</td>
 				<td>{{obj.ssgl_lz}}</td>
 				<td>{{obj.ssgl_dm}}</td>
@@ -322,11 +328,12 @@
 				<td>{{obj.ssgl_other}}</td>
 				<td>{{obj.ljyy}}</td>
 				<td>{{obj.ljjcc}}</td>
+                <td>{{obj.ljkfks}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="28"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="30"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file