Merge branch 'pudong' into jiading

王通
2 parents 377da8d9 e47e6605
Showing 8 changed files with 385 additions and 379 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/mould/jd_daily.xls
src/main/resources/static/pages/forms/statement/jd_daily.html
src/main/resources/static/pages/forms/statement/scheduleDaily.html
@@ -89,12 +89,12 @@ public class FormsServiceImpl implements FormsService {
 		String date=map.get("date").toString();
 		String sql="select "
-				+ " r.cl_zbh,r.j_gh,r.j_name"
+				+ " r.cl_zbh,r.j_gh"
 				+ " from bsth_c_s_sp_info_real r where "
 				+ " r.schedule_date_str = '"+date+"'"
 				+ " and r.xl_bm = '"+line+"' "
-				+ " group  by "
-	       		+ " r.cl_zbh,r.j_gh,r.j_name";
+				+ " group by "
+	       		+ " r.cl_zbh,r.j_gh";
 		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
@@ -102,7 +102,7 @@ public class FormsServiceImpl implements FormsService {
 			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Waybillday w=new Waybillday();
 				w.setJgh(arg0.getString("j_gh"));
-				w.setjName(arg0.getString("j_name"));
+//				w.setjName(arg0.getString("j_name"));
 				w.setNbbm(arg0.getString("cl_zbh"));
 				return w;
@@ -118,14 +118,19 @@ public class FormsServiceImpl implements FormsService {
 			for (int j = 0; j < realList.size(); j++) {
 				ScheduleRealInfo s=realList.get(j);
 				if(w.getNbbm().equals(s.getClZbh()) && w.getJgh().equals(s.getjGh())){
-					 Set<ChildTaskPlan> cts = s.getcTasks();
-			            if(cts != null && cts.size() > 0){
+					Set<ChildTaskPlan> cts = s.getcTasks();
+		            if(cts != null && cts.size() > 0){
+						listInfo.add(s);
+		            }else{
+			            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 							listInfo.add(s);
-			            }else{
-				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
-								listInfo.add(s);
-				            }
 			            }
+		            }
+
+					if((w.getjName() == null || w.getjName().trim().length() == 0)
+							&& s.getjName() != null && s.getjName().length() > 0){
+						w.setjName(s.getjName());
+					}
 				}
 			}
@@ -255,11 +260,11 @@ public class FormsServiceImpl implements FormsService {
 		}
 		String sql ="select ";
 		if(empnames.equals("驾驶员")){
-			sql	+= "  r.j_name,r.j_gh ";
+			sql	+= " r.j_gh ";
 		}else if(empnames.equals("售票员")){
-			sql += " r.s_gh,r.s_name";
+			sql += " r.s_gh ";
 		}else{
-			sql	+= "  r.cl_zbh";
+			sql	+= " r.cl_zbh ";
 		}
 		sql  += " from bsth_c_s_sp_info_real r where "
 				+ " r.schedule_date_str >= '" + map.get("startDate").toString() + "' "
@@ -271,9 +276,9 @@ public class FormsServiceImpl implements FormsService {
 		if(empnames.equals("驾驶员")){
 			sql	+= " GROUP BY "
-					+ "r.j_name,r.j_gh";
+					+ " r.j_gh ";
 		}else if(empnames.equals("售票员")){
-			sql+="and r.s_name is not null AND r.s_name !='' GROUP BY r.s_gh,r.s_name";
+			sql+="and r.s_gh is not null AND r.s_gh !='' GROUP BY r.s_gh";
 		}else{
 			sql	+= " GROUP BY r.cl_zbh";
 		}
@@ -284,17 +289,14 @@ public class FormsServiceImpl implements FormsService {
 			public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shiftuehiclemanth shif = new Shiftuehiclemanth();
 				if(empnames.equals("驾驶员")){
-					shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
+//					shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
 					shif.setJgh(arg0.getString("j_gh"));
 				}else if(empnames.equals("售票员")){
-					shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
+//					shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
 			        shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				}else if(empnames.equals("车辆自编号")){
 					shif.setjName(arg0.getString("cl_zbh"));
 				}
-//				shif.setJgh(arg0.getString("j_gh"));
-//		        shif.setZbh(arg0.getString("cl_zbh"));
-//		        shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				return shif;
 			}
 		});
@@ -322,7 +324,11 @@ public class FormsServiceImpl implements FormsService {
 				                list_s.add(s);
 				            }
 			            }
-						
+
+						if((d.getjName() == null || d.getjName().trim().length() == 0)
+								&& s.getjName() != null && s.getjName().length() > 0){
+							d.setjName(s.getjName() + "/" + d.getJgh());
+						}
 					}
 				}else if(empnames.equals("售票员")){
 					String sgh=s.getsGh()==null?"":s.getsGh();
@@ -336,6 +342,11 @@ public class FormsServiceImpl implements FormsService {
 				                list_s.add(s);
 				            }
 			            }
+
+						if((d.getjName() == null || d.getjName().trim().length() == 0)
+								&& s.getjName() != null && s.getjName().length() > 0){
+							d.setjName(s.getsName() + "/" + d.getSgh());
+						}
 					}
 				}else if(empnames.equals("车辆自编号")){
 					if(d.getjName().equals(s.getClZbh())){
@@ -413,19 +424,19 @@ public class FormsServiceImpl implements FormsService {
 		final String empnames=map.get("empnames").toString();
 		String gsdmManth="";
 		String fgsdmManth="";
-		if(map.get("gsdmManth")!=null){
+		if(map.get("gsdmManth") != null){
 			gsdmManth=map.get("gsdmManth").toString();
 		}
-		if(map.get("fgsdmManth")!=null){
+		if(map.get("fgsdmManth") != null){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
 		String sql ="select ";
 		if(empnames.equals("驾驶员")){
-			sql	+= "  r.j_name,r.j_gh ";
+			sql	+= " r.j_gh ";
 		}else if(empnames.equals("售票员")){
-			sql += " r.s_gh,r.s_name";
+			sql += " r.s_gh ";
 		}else{
-			sql	+= "  r.cl_zbh";
+			sql	+= " r.cl_zbh ";
 		}
 		sql  += " from bsth_c_s_sp_info_real r where "
 				+ " r.schedule_date_str >= '" + map.get("startDate").toString() + "' "
@@ -437,9 +448,9 @@ public class FormsServiceImpl implements FormsService {
 		if(empnames.equals("驾驶员")){
 			sql	+= " GROUP BY "
-					+ "r.j_name,r.j_gh";
+					+ " r.j_gh ";
 		}else if(empnames.equals("售票员")){
-			sql+="and r.s_name is not null AND r.s_name !='' GROUP BY r.s_gh,r.s_name";
+			sql+="and r.s_gh is not null AND r.s_gh !='' GROUP BY r.s_gh";
 		}else{
 			sql	+= " GROUP BY r.cl_zbh";
 		}
@@ -450,17 +461,14 @@ public class FormsServiceImpl implements FormsService {
 			public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shiftuehiclemanth shif = new Shiftuehiclemanth();
 				if(empnames.equals("驾驶员")){
-					shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
+//					shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
 					shif.setJgh(arg0.getString("j_gh"));
 				}else if(empnames.equals("售票员")){
-					shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
+//					shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
 			        shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				}else if(empnames.equals("车辆自编号")){
 					shif.setjName(arg0.getString("cl_zbh"));
 				}
-//				shif.setJgh(arg0.getString("j_gh"));
-//		        shif.setZbh(arg0.getString("cl_zbh"));
-//		        shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				return shif;
 			}
 		});
@@ -488,7 +496,11 @@ public class FormsServiceImpl implements FormsService {
 				                list_s.add(s);
 				            }
 			            }
-						
+
+						if((d.getjName() == null || d.getjName().trim().length() == 0)
+								&& s.getjName() != null && s.getjName().length() > 0){
+							d.setjName(s.getjName() + "/" + d.getJgh());
+						}
 					}
 				}else if(empnames.equals("售票员")){
 					String sgh=s.getsGh()==null?"":s.getsGh();
@@ -502,6 +514,11 @@ public class FormsServiceImpl implements FormsService {
 				                list_s.add(s);
 				            }
 			            }
+
+						if((d.getjName() == null || d.getjName().trim().length() == 0)
+								&& s.getjName() != null && s.getjName().length() > 0){
+							d.setjName(s.getsName() + "/" + d.getSgh());
+						}
 					}
 				}else if(empnames.equals("车辆自编号")){
 					if(d.getjName().equals(s.getClZbh())){
@@ -885,7 +902,7 @@ public class FormsServiceImpl implements FormsService {
 			List<Singledata> list_=new ArrayList<Singledata>();
 			if(tjtype.equals("jsy")){
 				//油统计
-				String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.j_name,r.fgs_bm"
+				String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.fgs_bm"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'";
 				if(xlbm.length() != 0){
@@ -897,7 +914,7 @@ public class FormsServiceImpl implements FormsService {
 				if(fgsdm.length() != 0){
 					sql += " and r.fgs_bm ='"+fgsdm+"'";
 				}
-			    sql += " group by r.fgs_bm,r.j_gh,r.xl_bm,r.cl_zbh,r.j_name " +
+			    sql += " group by r.fgs_bm,r.j_gh,r.xl_bm,r.cl_zbh " +
 			    		"order by r.xl_bm,r.cl_zbh";
@@ -907,7 +924,7 @@ public class FormsServiceImpl implements FormsService {
 						Singledata sin = new Singledata();
 						sin.setxL(arg0.getString("xl_bm"));
 						sin.setJsy(arg0.getString("j_gh"));
-						sin.setjName(arg0.getString("j_name"));
+//						sin.setjName(arg0.getString("j_name"));
 						sin.setClzbh(arg0.getString("cl_zbh"));
 						sin.setgS(arg0.getString("fgs_bm"));
 						return sin;
@@ -968,7 +985,7 @@ public class FormsServiceImpl implements FormsService {
 					if(fages){
 						Singledata s=new Singledata();
 						s.setJsy(jsy);
-						s.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+//						s.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
 						s.setClzbh(clzbh);
 						s.setSgh("");
 						s.setsName("");
@@ -1023,6 +1040,11 @@ public class FormsServiceImpl implements FormsService {
 						            	newList_.add(s);
 						            }
 					            }
+
+								if((sin.getjName() == null || sin.getjName().trim().length() == 0)
+										&& s.getjName() != null && s.getjName().length() > 0){
+									sin.setjName(s.getjName());
+								}
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
@@ -1034,12 +1056,15 @@ public class FormsServiceImpl implements FormsService {
 					double zyygl=Arith.add(yygl, ljgl);
 					double zksgl=Arith.add(ksgl, jcgl);
+					
+					if(sin.getjName() == null || sin.getjName().trim().length() == 0){
+						sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+					}
 					sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
 					sin.setrQ(startDate);
-//					sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
 					sin.setSgh("");
 					sin.setsName("");
 					sin.setgS(BasicData.businessFgsCodeNameMap.get(sin.getgS()+"_"+gsdm));
@@ -1180,7 +1205,7 @@ public class FormsServiceImpl implements FormsService {
 			List<Singledata> list_=new ArrayList<Singledata>();
 			if(tjtype.equals("jsy")){
 				//油统计
-				String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.j_name"
+				String sql="select r.j_gh, r.xl_bm,r.cl_zbh"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'";
 				if(!xlbm.equals("")){
@@ -1192,14 +1217,14 @@ public class FormsServiceImpl implements FormsService {
 				if(!fgsdm.equals("")){
 					sql += " and r.fgs_bm='"+fgsdm+"'";
 				}
-			       sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh,r.j_name order by r.xl_bm,r.cl_zbh";
+			       sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh order by r.xl_bm,r.cl_zbh";
 			    list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 					@Override
 					public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
 						Singledata sin = new Singledata();
 						sin.setxL(arg0.getString("xl_bm"));
 						sin.setJsy(arg0.getString("j_gh"));
-						sin.setjName(arg0.getString("j_name"));
+//						sin.setjName(arg0.getString("j_name"));
 						sin.setClzbh(arg0.getString("cl_zbh"));
 						return sin;
 					}
@@ -1310,6 +1335,11 @@ public class FormsServiceImpl implements FormsService {
 						            	newList_.add(s);
 						            }
 					            }
+
+								if((sin.getjName() == null || sin.getjName().trim().length() == 0)
+										&& s.getjName() != null && s.getjName().length() > 0){
+									sin.setjName(s.getjName());
+								}
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
@@ -1319,6 +1349,9 @@ public class FormsServiceImpl implements FormsService {
 					double ksgl=culateMileageService.culateKsgl(newList_);
 					double jcgl=culateMileageService.culateJccgl(newList_);
+					if(sin.getjName() == null || sin.getjName().trim().length() == 0){
+						sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+					}
 					double zyygl=Arith.add(yygl, ljgl);
 					double zksgl=Arith.add(ksgl, jcgl);
 					sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
@@ -1326,7 +1359,6 @@ public class FormsServiceImpl implements FormsService {
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
 					sin.setrQ(startDate);
-//					sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
 					sin.setSgh("");
 					sin.setsName("");
 					sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
@@ -1335,7 +1367,7 @@ public class FormsServiceImpl implements FormsService {
 				}
 				Collections.sort(list_,new SingledataByXlbm());
 			}else{
-				String sql="select r.s_gh,r.s_name, "
+				String sql="select r.s_gh, "
 						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'"
@@ -1349,7 +1381,7 @@ public class FormsServiceImpl implements FormsService {
 				if(!fgsdm.equals("")){
 					sql += " and r.fgs_bm='"+fgsdm+"'";
 				}
-				sql += " group  by  r.s_gh,r.s_name,"
+				sql += " group  by  r.s_gh,"
 						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
 				 list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
@@ -1361,7 +1393,7 @@ public class FormsServiceImpl implements FormsService {
 						sin.setxL(arg0.getString("xl_bm"));
 						sin.setClzbh(arg0.getString("cl_zbh"));
 						sin.setSgh(arg0.getString("s_gh"));
-						sin.setsName(arg0.getString("s_name"));
+//						sin.setsName(arg0.getString("s_name"));
 						return sin;
 					}
 				});
@@ -1387,6 +1419,11 @@ public class FormsServiceImpl implements FormsService {
 						            	newList_.add(s);
 						            }
 					            }
+
+								if((sin.getsName() == null || sin.getsName().trim().length() == 0)
+										&& s.getsName() != null && s.getsName().length() > 0){
+									sin.setsName(s.getsName());
+								}
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
@@ -1404,6 +1441,9 @@ public class FormsServiceImpl implements FormsService {
 					double zksgl=culateMileageService.culateSjfyylc_spy(newList_);
 					sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
+					if(sin.getsName() == null || sin.getsName().trim().length() == 0){
+						sin.setsName(BasicData.allPerson.get(gsdm+"-"+jsy));
+					}
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
@@ -1730,7 +1770,7 @@ public class FormsServiceImpl implements FormsService {
 		startDate = map.get("startDate").toString();
 		String sql="select r.s_gh,r.s_name, "
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm,xl_name"
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm,xl_name"
 				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
 		if(!xlbm.equals("")){
 			sql += " and r.xl_bm = '"+xlbm+"'";
@@ -1742,7 +1782,7 @@ public class FormsServiceImpl implements FormsService {
 			sql += " and r.fgs_bm='"+fgsdm+"'";
 		}
 		sql += " group  by  r.s_gh,r.s_name,"
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm,xl_name order by r.xl_bm,r.cl_zbh";
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm,xl_name order by r.xl_bm,r.cl_zbh";
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1753,7 +1793,7 @@ public class FormsServiceImpl implements FormsService {
 				sin.setxL(arg0.getString("xl_bm"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
-				sin.setjName(arg0.getString("j_name"));
+//				sin.setjName(arg0.getString("j_name"));
 				sin.setSgh(arg0.getString("s_gh"));
 				sin.setsName(arg0.getString("s_name"));
 				sin.setXlmc(arg0.getString("xl_name"));
@@ -1780,6 +1820,11 @@ public class FormsServiceImpl implements FormsService {
 				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
 						&&s.getXlBm().equals(xl)&&s.getsGh().equals(spy)){
 					newList.add(s);
+
+					if((sin.getjName() == null || sin.getjName().trim().length() == 0)
+							&& s.getjName() != null && s.getjName().length() > 0){
+						sin.setjName(s.getjName());
+					}
 				}
 			}
@@ -2442,8 +2487,6 @@ public class FormsServiceImpl implements FormsService {
 	    sql += " group by r.gs_bm, r.fgs_bm, r.xl_bm " +
 	    		"order by r.gs_bm, r.fgs_bm, r.xl_bm";
-	    System.out.println(sql);
-	       
 	    List<Operationservice> query = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
 			@Override
 			public Operationservice mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -2605,10 +2648,10 @@ public class FormsServiceImpl implements FormsService {
 	public List<Vehicleloading> vehicleloading(String line, String date) {
 		String sql="select r.s_gh,r.s_name, "
-				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm"
 				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+date+"' "
 						+ " and r.xl_bm = '"+line+"' group  by  r.s_gh,r.s_name,"
-	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
+	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm";
 		List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
 			@Override
@@ -3089,7 +3132,7 @@ public class FormsServiceImpl implements FormsService {
 				+ " on t.cl_zbh = x.nbbm and t.j_gh=x.jsy";*/
 		String sql="select r.schedule_date_str, "
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm"
 				+ " from bsth_c_s_sp_info_real r where "
 				+ "r.schedule_date_str = '"+map.get("date").toString()+"'";
 		if(!xlbm.equals("")){
@@ -3101,8 +3144,8 @@ public class FormsServiceImpl implements FormsService {
 		if(!fgsbm.equals("")){
 			sql += " and r.fgs_bm='"+fgsbm+"'";
 		}
-		sql += " group  by r.schedule_date_str,"
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
+		sql += " group by r.schedule_date_str,"
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
 		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
 			@Override
@@ -3111,7 +3154,7 @@ public class FormsServiceImpl implements FormsService {
 				daily.setRq(arg0.getString("schedule_date_str"));
 				daily.setZbh(arg0.getString("cl_zbh"));
 				daily.setJgh(arg0.getString("j_gh"));
-				daily.setjName(arg0.getString("j_name"));
+//				daily.setjName(arg0.getString("j_name"));
 				return daily;
 			}
 		});
@@ -3140,15 +3183,19 @@ public class FormsServiceImpl implements FormsService {
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
 				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
-					 Set<ChildTaskPlan> cts = s.getcTasks();
-			            if(cts != null && cts.size() > 0){
+					Set<ChildTaskPlan> cts = s.getcTasks();
+		            if(cts != null && cts.size() > 0){
+		            	sList.add(s);
+		            }else{
+			            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 			            	sList.add(s);
-			            }else{
-				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
-				            	sList.add(s);
-				            }
 			            }
-					
+		            }
+
+					if((d.getjName() == null || d.getjName().trim().length() == 0)
+							&& s.getjName() != null && s.getjName().length() > 0){
+						d.setjName(s.getjName());
+					}
 				}
 			}
@@ -47,7 +47,6 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.BusIntervalService;
 import com.bsth.service.LineService;
 import com.bsth.service.report.CulateMileageService;
-import com.bsth.service.schedule.PeopleCarPlanService;
 import com.bsth.service.sys.DictionaryService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.Arith;
@@ -69,9 +68,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
     CulateMileageService culateService;
 	@Autowired
-	private PeopleCarPlanService peopleCarPlanService;
-	
-	@Autowired
 	private ScheduleRealInfoRepository scheduleRealInfoRepository;
     @Autowired
@@ -103,33 +99,47 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
+			List<String> objList = new ArrayList<String>();
+			String sql = "select * from bsth_c_s_sp_info_real where " +
+					"schedule_date_str >= ? and schedule_date_str <= ? " +
+					"and fcsj >= ? and fcsj <= ? and gs_bm like ? and fgs_bm like ? " +
+					"and bc_type != ? and bc_type != ? and bc_type != ?";
 			if(line.length() != 0){
-				sql += " and xl_bm = '"+line+"'";
-			}
-			if(times.length() != 0){
-				String[] split = times.split("-");
-				String[] split0 = split[0].split(":");
-				String[] split1 = split[1].split(":");
-				int time0 = Integer.valueOf(split0[0])*60 + Integer.valueOf(split0[1]);
-				int time1 = Integer.valueOf(split1[0])*60 + Integer.valueOf(split1[1]);
-				if(time1 > time0){
-					sql += " and fcsj >= '"+split[0]+"' and fcsj <= '"+split[1]+"'";
-				} else {
-					sql += " and (fcsj >= '"+split[0]+"' or fcsj <= '"+split[1]+"')";
-				}
+				sql = "select * from bsth_c_s_sp_info_real where xl_bm = ? " +
+						"and schedule_date_str >= ? and schedule_date_str <= ? " +
+						"and fcsj >= ? and fcsj <= ? and gs_bm like ? and fgs_bm like ? " +
+						"and bc_type != ? and bc_type != ? and bc_type != ?";
+				objList.add(line);
 			}
-			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"'";
+			objList.add(startDate);
+			objList.add(endDate);
+			
+			String[] split = times.split("-");
+			if(split[0].length() > 0){
+				objList.add(split[0]);
+			} else {
+				objList.add("");
 			}
-			if(subCompany.length() != 0){
-				sql += " and fgs_bm = '"+subCompany+"'";
+			if(split.length > 1 && split[1].length() > 0){
+				objList.add(split[1]);
+			} else {
+				objList.add("23:59");
 			}
+			
+			objList.add("%" + company + "%");
+			objList.add("%" + subCompany + "%");
+			
 			if(normal){
-				sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+				objList.add("in");
+				objList.add("out");
+				objList.add("ldks");
+			} else {
+				objList.add("");
+				objList.add("");
+				objList.add("");
 			}
-			
-			list = jdbcTemplate.query(sql,
+
+			list = jdbcTemplate.query(sql, objList.toArray(new Object[objList.size()]),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -225,14 +235,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			});
 			if(model.length() != 0){
-//				sql = "select * from bsth_c_s_ttinfo_detail where ttinfo = '"+model+"' and bc_type != 'in' and bc_type != 'out'";
-				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'" +
-						" and bc_type != 'ldks' and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
-				if(line.length() != 0){
-					sql += " and xl_bm = '"+line+"'";
-				}
+				sql = "select id from bsth_c_s_sp_info where tt_info = ?" +
+						" and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'" +
+						" and schedule_date >= ? and schedule_date <= ? and xl_bm = ?";
-				ttList = jdbcTemplate.query(sql,
+				ttList = jdbcTemplate.query(sql, new Object[]{model, startDate, endDate, line},
 						new RowMapper<Long>(){
 					@Override
 					public Long mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -308,15 +315,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String sql = "select id,cc_id,mileage_type,destroy,destroy_reason," +
 				" mileage,type1,type2,schedule from bsth_c_s_child_task" +
-				" where 1=1";
-		if(schedule1 != null && schedule1 >= 0){
-			sql += " and schedule >= '"+schedule1+"'";
-		}
-		if(schedule2 != null && schedule2 >= 0){
-			sql += " and schedule <= '"+schedule2+"'";
-		}
+				" where schedule >= ? and schedule <= ?";
-		list = jdbcTemplate.query(sql,
+		list = jdbcTemplate.query(sql, new Object[]{schedule1, schedule2},
 				new RowMapper<ChildTaskPlan>(){
 			@Override
 			public ChildTaskPlan mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -358,9 +359,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		try {
-			String sql = "select start_station_name, end_station_name from bsth_c_line where line_code = '"+line+"'";
+			String sql = "select start_station_name, end_station_name from bsth_c_line where line_code = ?";
-			list = jdbcTemplate.query(sql,
+			list = jdbcTemplate.query(sql, new Object[]{line},
 					new RowMapper<Map<String, Object>>(){
 				@Override
 				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -393,19 +394,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 		String line = map.get("line").toString();
-		String ttId = map.get("ttId").toString();
+//		String ttId = map.get("ttId").toString();
 		try {
-			String sql = "select td.lp, lp.lp_name from bsth_c_s_ttinfo_detail td" +
-					" left join bsth_c_s_gbi lp on td.lp = lp.id" +
-					" left join bsth_c_line cl on cl.id = td.xl where 1=1";
-			if(line.length() != 0)
-				sql += " and cl.line_code = '"+line+"'";
-			if(ttId.length() != 0)
-				sql += " and td.ttinfo = '"+ttId+"'";
-			sql += " group by td.lp, lp.lp_name";
-			 list = jdbcTemplate.query(sql,
+			String sql = "select td.lp, lp.lp_name from bsth_c_line cl" +
+					" left join bsth_c_s_ttinfo_detail td on cl.id = td.xl" +
+					" left join bsth_c_s_gbi lp on td.lp = lp.id where" +
+					" cl.line_code = ? group by td.lp, lp.lp_name";
+
+			list = jdbcTemplate.query(sql, new Object[]{line},
 					new RowMapper<Map<String, Object>>(){
 				@Override
 				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -804,31 +802,36 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		try {
-			String where = "";
+			List<String> strList = new ArrayList<String>();
+			strList.add(startDate);
+			strList.add(endDate);
 			if(line.length() != 0 && statu.equals("1")){
-				where += " and xl_bm = '"+line+"'";
+				strList.add('%' + line + '%');
+			} else {
+				strList.add("%%");
 			}
 			if(lp.length() != 0 && statu.equals("1")){
-				where += " and lp_name = '"+lp+"'";
-			}
-			if(company.length() != 0){
-				where += " and gs_bm = '"+company+"'";
-			}
-			if(subCompany.length() != 0){
-				where += " and fgs_bm = '"+subCompany+"'";
+				strList.add('%' + lp + '%');
+			} else {
+				strList.add("%%");
 			}
+			strList.add('%' + company + '%');
+			strList.add('%' + subCompany + '%');
 			if(sfqr == 1){
-				where += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
+				strList.add(times1);
+				strList.add(times2);
+			} else {
+				strList.add("");
+				strList.add("23:59");
 			}
-//			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			where += " and bc_type != 'ldks'";
 			String sql = "select id, schedule_date_str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type, xl_bm, fgs_bm,"
 					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
-					+ " ,cc_service from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"'"
-					+ " and schedule_date_str <= '"+endDate+"'"+where+"";
+					+ " ,cc_service from bsth_c_s_sp_info_real where schedule_date_str >= ? and schedule_date_str <= ?"
+					+ " and xl_bm like ? and lp_name like ? and gs_bm like ? and fgs_bm like ? and zdsj >= ? and fcsj <= ?"
+					+ " and bc_type != 'ldks'";
-			list = jdbcTemplate.query(sql,
+			List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -904,27 +907,39 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					return schedule;
 				}
 			});
+			
+			for(ScheduleRealInfo s : query){
+				if(line.length() != 0 && statu.equals("1")){
+					if(!line.equals(s.getXlBm())){
+						continue;
+					}
+				}
+				if(lp.length() != 0 && statu.equals("1")){
+					if(!lp.equals(s.getLpName())){
+						continue;
+					}
+				}
+				list.add(s);
+			}
 			{
 				List<Map<String, String>> temp1 = new ArrayList<Map<String, String>>();
 				List<Map<String, String>> temp2 = new ArrayList<Map<String, String>>();
-				sql = "select id, lp, fcsj, xl_bm, tt_info from bsth_c_s_sp_info where bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-				
-				if(startDate.equals(endDate)){
-					sql += " and schedule_date = '"+startDate+"'";
-				} else {
-					sql += " and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
-				}
+				List<String> strList1 = new ArrayList<String>();
+				strList1.add(startDate);
+				strList1.add(endDate);
 				if(line.length() != 0 && statu.equals("1")){
-					sql += " and xl_bm = '"+line+"'";
-				}
-				if(company.length() != 0){
-					sql += " and gs_bm = '"+company+"'";
-				}
-				if(subCompany.length() != 0){
-					sql += " and fgs_bm = '"+subCompany+"'";
+					strList1.add("%" + line + "%");
+				} else {
+					strList1.add("%%");
 				}
-				temp1 = jdbcTemplate.query(sql,
+				strList1.add("%" + company + "%");
+				strList1.add("%" + subCompany + "%");
+				sql = "select id, lp, fcsj, xl_bm, tt_info from bsth_c_s_sp_info" +
+						" where bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'" +
+						" and schedule_date >= ? and schedule_date <= ? and xl_bm like ?" +
+						" and gs_bm like ? and fgs_bm like ?";
+				List<Map<String, String>> query1 = jdbcTemplate.query(sql, strList1.toArray(),
 						new RowMapper<Map<String, String>>(){
 					@Override
 					public Map<String, String> mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -937,13 +952,22 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						return m;
 					}
 				});
-				sql = "select * from bsth_c_s_ttinfo_detail where ists = 1"
-						+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-				
-				if(line.length() != 0 && statu.equals("1")){
-					sql += " and xl = '"+line+"'";
+				for(Map<String, String> m : query1){
+					if(line.length() != 0 && statu.equals("1")){
+						if(!line.equals(m.get("xl_bm").toString())){
+							continue;
+						}
+					}
+					temp1.add(m);
 				}
-				temp2 = jdbcTemplate.query(sql,
+				
+				sql = "select id, lp, xl, fcsj, ttinfo from bsth_c_s_ttinfo_detail where ists = 1" +
+						" and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'" +
+						" and xl like ?";
+				
+				List<Map<String, String>> query2 = jdbcTemplate.query(sql, 
+						(line.length() != 0 && statu.equals("1"))?
+								new Object[]{"%" + line + "%"}:new Object[]{"%%"},
 						new RowMapper<Map<String, String>>(){
 					@Override
 					public Map<String, String> mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -956,6 +980,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						return m;
 					}
 				});
+				for(Map<String, String> m : query2){
+					if(line.length() != 0 && statu.equals("1")){
+						if(!line.equals(m.get("xl").toString())){
+							continue;
+						}
+					}
+					temp2.add(m);
+				}
 				for(Map<String, String> m2 : temp2){
 					for(Map<String, String> m1 : temp1){
@@ -974,10 +1006,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				if(id1 == 0 || id1 > s.getId())
 					id1 = s.getId();
 			}
-			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task";
-			sql += " where id >= "+id1+" and id <= "+id2+" order by start_date";
+			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task"
+					+ " where id >= ? and id <= ? order by start_date";
-			cList = jdbcTemplate.query(sql,
+			cList = jdbcTemplate.query(sql, new Object[]{id1, id2},
 					new RowMapper<ChildTaskPlan>(){
 				@Override
 				public ChildTaskPlan mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -994,21 +1026,20 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(model.length() != 0){
 				sql = "select sp.id from "
-						+ "(select id, tt_info, xl_bm, lp, fcsj from bsth_c_s_sp_info where schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'"
-						+ " and tt_info = '" + model + "' and bc_type != 'ldks') sp"
+						+ "(select id, tt_info, xl_bm, lp, fcsj from bsth_c_s_sp_info where schedule_date >= ? and schedule_date <= ?"
+						+ " and tt_info = ? and bc_type != 'ldks') sp"
 						+ " left join bsth_c_s_ttinfo_detail tt on sp.tt_info = tt.ttinfo and sp.xl_bm = tt.xl and sp.lp = tt.lp and sp.fcsj = tt.fcsj";
-				ttList = jdbcTemplate.query(sql,
+				ttList = jdbcTemplate.query(sql, new Object[]{startDate, endDate, model},
 						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("id", rs.getString("id"));
-//						m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"0");
 						return m;
 					}
 				});
-				
+
 				for(Map<String, Object> m : ttList){
 					ttSet.add(Long.valueOf(m.get("id").toString()));
 				}
@@ -1071,15 +1102,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 					keyMap.get(key).add(schedule);
 				}
-//				for(Map<String, Object> tt : ttList){
-//					long id = Long.valueOf(tt.get("id").toString());
-//					if(id == (long)schedule.getSpId()){
-//						String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
-//						if(!keyMap.containsKey(key))
-//							keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-//						keyMap.get(key).add(schedule);
-//					}
-//				}
 			}else{
 				if(!keyMap.containsKey(key))
 					keyMap.put(key, new ArrayList<ScheduleRealInfo>());
@@ -1087,7 +1109,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			}
 		}
-		String companyName = "", subCompanyName = "";
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			Map<Long, ScheduleRealInfo> sortMap = new HashMap<Long, ScheduleRealInfo>();
@@ -1102,12 +1123,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			long jhyssj1 = 0, sjyssj1 = 0;
 			double jhlc = 0, sjlc = 0;
 			for(ScheduleRealInfo schedule : list2){
-				if(companyName.trim().length() == 0 && schedule.getGsName() != null){
-					companyName = schedule.getGsName();
-				}
-				if(subCompanyName.trim().length() == 0 && schedule.getFgsName() != null){
-					subCompanyName = schedule.getFgsName();
-				}
 				long fcsj = schedule.getFcsjT();
 				if(sortMap.containsKey(fcsj)){
 					if(sortMap.get(fcsj).getFcsjActual() != null)
@@ -1275,8 +1290,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
 			String[] split = key.split("/");
-			tempMap.put("company", companyName);
-			tempMap.put("subCompany", split[3]);
+			tempMap.put("company", BasicData.businessCodeNameMap.get(company));
+			tempMap.put("subCompany", BasicData.businessFgsCodeNameMap.get(split[3] + "_" + company));
 			tempMap.put("date", split[0]);
 			tempMap.put("line", split[1]);
 			tempMap.put("lp", split[2]);
@@ -1442,7 +1457,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			String[] split = key.split("/");
 			tempMap.put("line", split[0]);
 			tempMap.put("lp", split[1]);
-			tempMap.put("company", companyName);
+			tempMap.put("company", BasicData.businessCodeNameMap.get(company));
 			tempMap.put("subCompany", split[2]);
 			tempMap.put("date", date);
 			list4.add(tempMap);
@@ -1489,7 +1504,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				String[] split = key.split("/");
 				tempMap.put("line", split[0]);
 				tempMap.put("lp", keyMap4.get(key).size());
-				tempMap.put("company", companyName);
+				tempMap.put("company", BasicData.businessCodeNameMap.get(company));
 				tempMap.put("subCompany", split[1]);
 				tempMap.put("date", date);
 				tempMap.put("work", keyMap4.get(key));
@@ -1526,8 +1541,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			modelMap.put("sjyssj", sjyssj.equals(0)?0:sjyssj.divide(size, 2, RoundingMode.HALF_UP));
 			modelMap.put("sjyycs", sjyycs.equals(0)?0:sjyycs.divide(size, 2, RoundingMode.HALF_UP));
 			modelMap.put("sjyscs", sjyscs.equals(0)?0:sjyscs.divide(size, 2, RoundingMode.HALF_UP));
-			modelMap.put("company", companyName);
-			modelMap.put("subCompany", subCompanyName);
 			modelMap.put("dataList", dataList);
 		}
@@ -2225,9 +2238,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String company = "", subCompany = "";
 		String sfyy = map.get("sfyy").toString();
 		String line = map.get("line").toString();
-		if(map.get("company")!=null)
+		if(map.containsKey("company") && map.get("company")!=null)
 			company = map.get("company").toString();
-		if(map.get("subCompany")!=null)
+		if(map.containsKey("subCompany") && map.get("subCompany")!=null)
 			subCompany = map.get("subCompany").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
@@ -2243,32 +2256,26 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str"
-					+ " >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
-			if(line.length() != 0){
-				sql += " and xl_bm = '"+line+"'";
-			}
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str" +
+					" >= ? and schedule_date_str <= ? and xl_bm like ?" +
+					" and fcsj >= ? and fcsj <= ? and gs_bm like ? and fgs_bm like ?" +
+					" and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			List<String> strList = new ArrayList<String>();
+			strList.add(startDate);
+			strList.add(endDate);
+			strList.add('%' + line + '%');
 			if(sfqr == 1 && times.length() != 0){
 				String[] split = times.split("-");
-				String[] split0 = split[0].split(":");
-				String[] split1 = split[1].split(":");
-				int time0 = Integer.valueOf(split0[0])*60 + Integer.valueOf(split0[1]);
-				int time1 = Integer.valueOf(split1[0])*60 + Integer.valueOf(split1[1]);
-				if(time1 > time0){
-					sql += " and fcsj >= '"+split[0]+"' and fcsj <= '"+split[1]+"'";
-				} else {
-					sql += " and (fcsj >= '"+split[0]+"' or fcsj <= '"+split[1]+"')";
-				}
-			}
-			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"'";
-			}
-			if(subCompany.length() != 0){
-				sql += " and fgs_bm = '"+subCompany+"'";
+				strList.add(split[0]);
+				strList.add(split[1]);
+			} else {
+				strList.add("");
+				strList.add("23:59");
 			}
-			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			strList.add('%' + company + '%');
+			strList.add('%' + subCompany + '%');
-			list = jdbcTemplate.query(sql,
+			List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -2311,6 +2318,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					return schedule;
 				}
 			});
+			for(ScheduleRealInfo s : query){
+				if(line.length() != 0){
+					if(!line.equals(s.getXlBm())){
+						continue;
+					}
+				}
+				list.add(s);
+			}
 		}catch (Exception e) {
 			// TODO: handle exception
 			e.printStackTrace();
@@ -2408,71 +2423,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			resList.add(tempMap);
 		}
-		/*for(String key : keyMap0.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int sjbc = 0, sddf = 0, zddf = 0,
-					dxtz = 0, lbtz = 0;
-			for(Map<String, Object> m : keyMap0.get(key)){
-				sjbc += (int)m.get("sjbc");
-				sddf += (int)m.get("sddf");
-				zddf += (int)m.get("zddf");
-//				dxtz += (int)m.get("dxtz");
-				lbtz += (int)m.get("lbtz");
-			}
-			tempMap.put("date", date);
-			String[] keys = key.split("/");
-			tempMap.put("company", keys[0]);
-			tempMap.put("subCompany", keys[1]);
-			tempMap.put("lines", keyMap0.get(key).size());
-			tempMap.put("sjbc", sjbc);
-			tempMap.put("sddf", sddf);
-			tempMap.put("zddf", zddf);
-			tempMap.put("dfhj", sddf + zddf);
-//			tempMap.put("dxtz", dxtz);
-			tempMap.put("lbtz", lbtz);
-			tempMap.put("correct", sddf + zddf + dxtz + lbtz);
-			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
-			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
-			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
-			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
-//			tempMap.put("workList", keyMap0.get(key));
-			
-			String key1 = keys[0];
-			if(!keyMap1.containsKey(key1))
-				keyMap1.put(key1, new ArrayList<Map<String, Object>>());
-			keyMap1.get(key1).add(tempMap);
-		}*/
-		
-		/*for(String key : keyMap1.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int sjbc = 0, sddf = 0, zddf = 0,
-					dxtz = 0, lbtz = 0, lines = 0;
-			for(Map<String, Object> m : keyMap1.get(key)){
-				sjbc += (int)m.get("sjbc");
-				sddf += (int)m.get("sddf");
-				zddf += (int)m.get("zddf");
-//				dxtz += (int)m.get("dxtz");
-				lbtz += (int)m.get("lbtz");
-				lines += (int)m.get("lines");
-			}
-			tempMap.put("date", date);
-			tempMap.put("company", key);
-			tempMap.put("lines", lines);
-			tempMap.put("sjbc", sjbc);
-			tempMap.put("sddf", sddf);
-			tempMap.put("zddf", zddf);
-			tempMap.put("dfhj", sddf + zddf);
-//			tempMap.put("dxtz", dxtz);
-			tempMap.put("lbtz", lbtz);
-			tempMap.put("correct", sddf + zddf + dxtz + lbtz);
-			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
-			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
-			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
-			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
-//			tempMap.put("workList", keyMap1.get(key));
-			
-			resList.add(tempMap);
-		}*/
 		if(resList.size() != 0){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
@@ -2484,24 +2434,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				zddf += (int)m.get("zddf");
 //				dxtz += (int)m.get("dxtz");
 				lbtz += (int)m.get("lbtz");
-//				lines += (int)m.get("lines");
-				/*for(Map<String, Object> m0 : (List<Map<String, Object>>)m.get("workList")){
-					Map<String, Object> temp = new HashMap<String, Object>();
-					temp.put("date", "合计");
-					temp.put("lines", m0.get("lines"));
-					temp.put("sjbc", m0.get("sjbc"));
-					temp.put("sddf", m0.get("sddf"));
-					temp.put("zddf", m0.get("zddf"));
-					temp.put("dfhj", m0.get("dfhj"));
-//					temp.put("dxtz", m0.get("dxtz"));
-					temp.put("lbtz", m0.get("lbtz"));
-					temp.put("correct", m0.get("correct"));
-					temp.put("dfbl", m0.get("dfbl"));
-					temp.put("dxbl", m0.get("dxbl"));
-					temp.put("lbbl", m0.get("lbbl"));
-					temp.put("correctbl", m0.get("correctbl"));
-//					((List<Map<String, Object>>)m0.get("workList")).add(temp);
-				}*/
 				Map<String, Object> temp = new HashMap<String, Object>();
 				temp.put("date", "合计");
 				temp.put("lines", m.get("lines"));
@@ -2515,8 +2447,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				temp.put("dfbl", m.get("dfbl"));
 				temp.put("dxbl", m.get("dxbl"));
 				temp.put("lbbl", m.get("lbbl"));
-//				temp.put("correctbl", m.get("correctbl"));
-//				((List<Map<String, Object>>)m.get("workList")).add(temp);
 			}
 			tempMap.put("date", "合计");
 			tempMap.put("lines", lines);
@@ -2534,13 +2464,17 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			resList.add(tempMap);
 		}
+		String currDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		
 		//计算掉线调整
 		String sqldot = "select * from "
         		+ "logger_sch_modify where gsbm = ? and fgsbm like ? and rq BETWEEN ? and  ?  order by line_code,sch_id";
         List<SchEditInfoDto> listDot = jdbcTemplate.query(sqldot, 
-       		 new BeanPropertyRowMapper(SchEditInfoDto.class),company,"%"+subCompany+"%",map.get("startDate").toString(),map.get("endDate").toString());
+       		new BeanPropertyRowMapper(SchEditInfoDto.class),company,"%"+subCompany+"%",
+       		 		map.get("startDate")!=null?map.get("startDate"):"",
+       				map.get("endDate")!=null?map.get("endDate"):currDate);
         int dxtzz=0;
         Map<String, Object> mapSchId=new HashMap<String,Object>();
         for (int i = 0; i < resList.size(); i++) {
@@ -2665,11 +2599,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 	        String minfcsj="02:00";
 	        List<Line> lineList=lineRepository.findLineByCode(line);
 	        if(lineList.size()>0){
-	        	String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	        	String sqlMinYysj = "select start_opt from bsth_c_line_config where "
     	         		+ " id = ("
-    	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+    	         		+ "select max(id) from bsth_c_line_config where line = ?"
     	         		+ ")";
-    	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+    	        minfcsj = jdbcTemplate.queryForObject(sqlMinYysj, String.class, lineList.get(0).getId());
 	        }
 	        for(Ylb ylb : queryYlbByRqXlbm){
@@ -2885,18 +2819,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Map.put("ljbc", culateService.culateLjbc(lists, ""));
 		        int sjbc =culateService.culateLjbc(lists, "")+culateService.culateSjbc(lists, "");
 		        Map.put("sjbc", sjbc);
-//				map=new HashMap<String,Object>();
 		        SimpleDateFormat sdf2=new SimpleDateFormat("yyyy-MM-dd HH:mm");
-//		        String minfcsj="02:00";
-//		        List<Line> lineList=lineRepository.findLineByCode(newList.get(0).getXlBm());
-//		        if(lineList.size()>0){
-//		        	String sqlMinYysj="select start_opt from bsth_c_line_config where "
-//        	         		+ " id = ("
-//        	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
-//        	         		+ ")";
-//        	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
-//		        }
         		String[] minSjs = minfcsj.split(":");
         		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
@@ -3927,17 +3851,17 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String sql = "select id, cl_zbh, fcsj, fcsj_actual, j_gh, j_name, lp_name, qdz_name, " +
 				"schedule_date_str, xl_name, zdsj, zdsj_actual, fgs_bm, fgs_name, gs_name, xl_dir, xl_bm " +
 				"from bsth_c_s_sp_info_real " +
-				"where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"' " +
+				"where schedule_date_str >= ? and schedule_date_str <= ? " +
+				"and gs_bm like ? and fgs_bm like ? and xl_bm like ? " +
 				"and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and cc_service = 0";
+		List<String> strList = new ArrayList<String>();
+		strList.add(startDate);
+		strList.add(endDate);
+		strList.add('%' + company + '%');
+		strList.add('%' + subCompany + '%');
+		strList.add('%' + line + '%');
-		if(company.length() != 0)
-			sql += " and gs_bm = '"+company+"'";
-		if(subCompany.length() != 0)
-			sql += " and fgs_bm = '"+subCompany+"'";
-		if(line.length() != 0)
-			sql += " and xl_bm = '"+line+"'";
-		
-		List<ScheduleRealInfo> list = jdbcTemplate.query(sql,
+		List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
 				new RowMapper<ScheduleRealInfo>(){
 			@Override
 			public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -3960,7 +3884,17 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				schedule.setjGh(rs.getString("j_gh"));
 				schedule.setjName(rs.getString("j_name"));
 				return schedule;
-			}});
+		}});
+		
+		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+		for(ScheduleRealInfo s : query){
+			if(line.length() != 0){
+				if(!(line.equals(s.getXlBm()))){
+					continue;
+				}
+			}
+			list.add(s);
+		}
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Map<String, List<ScheduleRealInfo>>> sches = new HashMap<String, Map<String, List<ScheduleRealInfo>>>();
@@ -3982,11 +3916,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			String xl = s.getXlName() + "/" + s.getFgsBm();
 			String dateStr = s.getScheduleDateStr();
-			if(!sches.containsKey(xl)){
+			if(!(sches.containsKey(xl))){
 				sches.put(xl, new HashMap<String, List<ScheduleRealInfo>>());
 				keyMap.put(xl, new ArrayList<List<Map<String, Object>>>());
 			}
-			if(!sches.get(xl).containsKey(dateStr)){
+			if(!(sches.get(xl).containsKey(dateStr))){
 				sches.get(xl).put(dateStr, new ArrayList<ScheduleRealInfo>());
 			}
 			sches.get(xl).get(dateStr).add(s);
@@ -4088,7 +4022,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			keyMap.put(xl, lists);
 		}
-		if(!map.containsKey("flag")){
+		if(!(map.containsKey("flag"))){
 			for(String xl : keyMap.keySet()){
 				List<List<Map<String, Object>>> list1 = keyMap.get(xl);
 				if(list1.size() == 0 || list1.get(0).size() == 0)
@@ -105,20 +105,40 @@ public class JdtestServiceImpl implements JdtestService {
 	@Override
 	public List<Map<String, Object>> daily(Map<String, Object> map) {
-		String xlbm="";;
+		String xlbm="";
 		if(map.get("line")!=null){
 			xlbm=map.get("line").toString().trim();
 		}
+		String gsbm="";
+		if(map.get("gsbm")!=null){
+			gsbm=map.get("gsbm").toString().trim();
+		}
+		
+		String fgsbm="";
+		if(map.get("fgsbm")!=null){
+			fgsbm=map.get("fgsbm").toString().trim();
+		}
-		String sql="select r.cl_zbh,r.j_gh,r.lp_name "
+		String sql="select r.xl_bm, r.cl_zbh,r.j_gh,r.lp_name "
 				+ " from bsth_c_s_sp_info_real r where "
-				+ "r.schedule_date_str = '"+map.get("date").toString()+"' "
-				+ " and r.xl_bm = '"+xlbm+"' group by  r.cl_zbh,r.j_gh,r.lp_name order by r.cl_zbh";
+				+ "r.schedule_date_str = '"+map.get("date").toString()+"'";
+		if(!gsbm.equals("")){
+			sql += "and r.gs_bm ='"+gsbm+"'";
+		}	
+		if(!fgsbm.equals("")){
+			sql += "and r.fgs_bm='"+fgsbm+"'";
+		}
+		if(!xlbm.equals("")){
+			sql += " and r.xl_bm = '"+xlbm+"'";
+		}		
+		
+				sql += " group by r.xl_bm, r.cl_zbh,r.j_gh,r.lp_name order by r.xl_bm,r.cl_zbh";
 		List<Map<String, Object>> list = jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
 			@Override
 			public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Map<String, Object> m=new HashMap<>();
+				m.put("xlBm", arg0.getString("xl_bm"));
 				m.put("lp", arg0.getString("lp_name"));
 				m.put("jGh", arg0.getString("j_gh"));
 				m.put("clZbh", arg0.getString("cl_zbh"));
@@ -132,19 +152,29 @@ public class JdtestServiceImpl implements JdtestService {
 			Dictionary d=it.next();
 			dMap.put(d.getdCode(), d.getdName());
 		}
-		
-		List<Ylb> listYlb= ylbRepository.obtainYlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
+		List<Ylb> listYlb=new ArrayList<Ylb>();
+		if(xlbm.equals("")){
+			listYlb=ylbRepository.obtainYl(map.get("date").toString(), gsbm, fgsbm, xlbm, "", "xlbm");
+		}else{
+			listYlb=ylbRepository.obtainYlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
+		}
 		Map<String, Ylb> mapYlb=new HashMap<>();
 		for (int j = 0; j < listYlb.size(); j++) {
 			Ylb y=listYlb.get(j);
-			if(mapYlb.get(y.getJsy()+y.getNbbm()+y.getLp())==null){
-				mapYlb.put(y.getJsy()+y.getNbbm()+y.getLp(), y);
+			if(mapYlb.get(y.getXlbm()+y.getJsy()+y.getNbbm()+y.getLp())==null){
+				mapYlb.put(y.getXlbm()+y.getJsy()+y.getNbbm()+y.getLp(), y);
 			}
 		}
 		List<ScheduleRealInfo> sList;
 		List<ScheduleRealInfo> jList;
-		List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
+		List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+		if(xlbm.equals("")){
+			lists=scheduleRealInfoRepository.scheduleByDateAndLineByGs_(gsbm, fgsbm, map.get("date").toString());
+		}else{
+			lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, map.get("date").toString());
+
+		}
 		double jzyl_z=0.0;
 		double czyl_z=0.0;
 		double jzl_z=0.0;
@@ -165,8 +195,8 @@ public class JdtestServiceImpl implements JdtestService {
 			double yh=0.0;
 			String rylx="";
-			if(mapYlb.get(m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
-				Ylb t=mapYlb.get(m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
+			if(mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
+				Ylb t=mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
 				jzyl=t.getJzyl();
 				czyl=t.getCzyl();
 				jzl=t.getJzl();
@@ -191,7 +221,8 @@ public class JdtestServiceImpl implements JdtestService {
 			m.put("dh", "");
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(m.get("clZbh").toString().equals(s.getClZbh()) &&
+				if(m.get("xlBm").toString().equals(s.getXlBm()) &&
+				   m.get("clZbh").toString().equals(s.getClZbh()) &&
 				   m.get("jGh").toString().equals(s.getjGh()) &&
 				   m.get("lp").toString().equals(s.getLpName()) ){
 							jList.add(s);
@@ -206,7 +237,7 @@ public class JdtestServiceImpl implements JdtestService {
 				}
 			}
-			
+			m.put("xlName", jList.get(0).getXlName());
 			m.put("jName", jList.get(0).getjName());
 			int jhbc=culateMileageService.culateJhbc(jList, "");
@@ -233,7 +264,8 @@ public class JdtestServiceImpl implements JdtestService {
 		}
 		Map<String, Object> mmp=new HashMap<>();
-		mmp.put("lp", "合计");
+		mmp.put("xlName", "合计");
+		mmp.put("lp", "");
 		mmp.put("jGh", "");
 		mmp.put("clZbh", "");
 		mmp.put("jName", "");
@@ -2818,7 +2818,7 @@ public class ReportServiceImpl implements ReportService{
 				}
 			});
 		}else{
-			sql+="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.j_name,r.s_name"
+			sql+="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("")){
@@ -2827,7 +2827,7 @@ public class ReportServiceImpl implements ReportService{
 			}else{
 				sql += " and r.xl_bm = '"+line+"'";
 			}
-			sql += " group  by  r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.j_name,r.s_name";
+			sql += " group  by  r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh";
 			listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
 				@Override
 				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -2836,8 +2836,8 @@ public class ReportServiceImpl implements ReportService{
 					map.put("nbbm", arg0.getString("cl_zbh"));
 					map.put("jGh", arg0.getString("j_gh"));
 					map.put("sGh", arg0.getString("s_gh"));
-					map.put("jName", arg0.getString("j_name"));
-					map.put("sName", arg0.getString("s_name"));
+//					map.put("jName", arg0.getString("j_name"));
+//					map.put("sName", arg0.getString("s_name"));
 					return map;
 				}
 			});
@@ -2864,6 +2864,15 @@ public class ReportServiceImpl implements ReportService{
 					if(xl_bm.equals(s.getXlBm()) && nbbm.equals(s.getClZbh())
 							&& jGh.equals(s.getjGh()) && sGh.equals(s.getsGh())){
 						lists.add(s);
+
+						if((m.get("jName") == null || m.get("jName").toString().length() == 0)
+								&& s.getjName() != null && s.getjName().length() > 0){
+							m.put("jName", s.getjName());
+						}
+						if((m.get("sName") == null || m.get("sName").toString().length() == 0)
+								&& s.getsName() != null && s.getsName().length() > 0){
+							m.put("sName", s.getsName());
+						}
 					}
 				}
 			}
@@ -2946,32 +2955,7 @@ public class ReportServiceImpl implements ReportService{
 		}
 		if(!zt.equals("zbh")){
-			String sqls="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.s_name,r.j_name"
-					+ " 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,r.s_name,r.j_name";
-
-			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"));
-					map.put("jName", arg0.getString("j_name"));
-					map.put("sName", arg0.getString("s_name"));
-					return map;
-				}
-			});
-			lMap=lists(listGroupBys, lMaps, gsdm, fgsdm, date, date2);
-
+			lMap=lists(listGroupBy, lMaps, gsdm, fgsdm, date, date2);
 		}
 		if(type.equals("export")){
 			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -1270,8 +1270,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		try {
 			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
-					+ " a.xl_bm, a.fgs_bm, a.cc_service, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
-					+ " where schedule_date_str = '"+date+"'"
+					+ " a.xl_bm, a.fgs_bm, a.cc_service, (select start_opt from bsth_c_line_config where id ="
+					+ " (select max(id) from bsth_c_line_config where line = (select id from bsth_c_line where line_code = a.xl_bm))) start_opt"
+					+ " from bsth_c_s_sp_info_real a where schedule_date_str = '"+date+"'"
 					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.trim().length() != 0)
 				sql += " and xl_bm = '"+line+"'";
@@ -1302,7 +1303,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setFgsBm(rs.getString("fgs_bm"));
 					schedule.setCcService(rs.getBoolean("cc_service"));
-					int startOpt = 0;
+					int startOpt = 120;
 					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
 						String[] split = rs.getString("start_opt").split(":");
 						startOpt = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
@@ -1541,9 +1542,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		try {
 			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_bm, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
-					+ " a.fgs_bm, a.cc_service, a.remarks, a.adjust_exps, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b "
-					+ " on a.xl_bm = b.line"
-					+ " where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"
+					+ " a.fgs_bm, a.cc_service, a.remarks, a.adjust_exps, (select start_opt from bsth_c_line_config where id = "
+					+ " (select max(id) from bsth_c_line_config where line = (select id from bsth_c_line where line_code = a.xl_bm))) start_opt"
+					+ " from bsth_c_s_sp_info_real a where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"
 					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.length() != 0)
 				sql += " and xl_bm = '"+line+"'";
@@ -1575,8 +1576,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setCcService(rs.getBoolean("cc_service"));
 					schedule.setRemarks(rs.getString("remarks")!=null?rs.getString("remarks"):"");
 					schedule.setAdjustExps(rs.getString("adjust_exps")!=null?rs.getString("adjust_exps"):"");
-					
-					int startOpt = 0;
+
+					int startOpt = 120;
 					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
 						String[] split = rs.getString("start_opt").split(":");
 						startOpt = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
@@ -55,15 +55,16 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="16">调度班次日报</th>
+								<th colspan="17">调度班次日报</th>
 							</tr>
 							<tr>
 								<td>线路</td>
-								<td colspan="7"><span id="form_line">&nbsp;</span></td>
+								<td colspan="8"><span id="form_line">&nbsp;</span></td>
 								<td>时间</td>
 								<td colspan="7"><span id="form_date">&nbsp;</span></td>
 							</tr>
 							<tr>
+								<td>线路</td>
 								<td>路牌</td>
 								<td>车辆</td>
 								<td>工号</td>
@@ -138,7 +139,7 @@
 		$("#gsdmDaily").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdmDaily').val();
-			var options = '';
+			var options = '<option value="">全部分公司</option>';
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
@@ -153,7 +154,7 @@
 		var tempData = {};
 		$.get('/report/lineList',function(xlList){
 			var data = [];
-// 			data.push({id: " ", text: "全部线路"});
+			data.push({id: " ", text: "全部线路"});
 			$.get('/user/companyData', function(result){
 				for(var i = 0; i < result.length; i++){
 					var companyCode = result[i].companyCode;
@@ -204,7 +205,7 @@
 		fgsdmDaily = $("#fgsdmDaily").val();
 		lineName=$("#select2-line-container").html();
 		var i = layer.load(2);
-		$get('/jdtest/daily',{ line:line,date:date,type:'query'},function(result){
+		$get('/jdtest/daily',{ gsbm:gsdmDaily,fgsbm:fgsdmDaily, line:line,date:date,type:'query'},function(result){
 			 $("#form_line").text(lineName);
 			 $("#form_date").text(date);
 			// 把数据填充到模版中
@@ -222,9 +223,15 @@
 		}
 		line = $("#line").val();
 		date = $("#date").val();
-		lineName=$("#select2-line-container").html();
+		
+		 lineName = $("#select2-line-container").html();
+		if(lineName == "全部线路")
+			lineName = $('#fgsdmDaily option:selected').text()+"全部线路";
+		if(lineName == "全部分公司全部线路")
+			lineName = $('#gsdmDaily option:selected').text()+"全部线路";
+		
 		var i = layer.load(2);
-		$get('/jdtest/daily',{line:line,date:date,type:'export',lineName:lineName},function(result){
+		$get('/jdtest/daily',{gsbm:gsdmDaily,fgsbm:fgsdmDaily,line:line,date:date,type:'export',lineName:lineName},function(result){
 			window.open("/downloadFile/download?fileName="
 					+date+"-"+lineName+"-班次日报表");
 			layer.close(i);
@@ -235,6 +242,7 @@
 <script type="text/html" id="dailyJdtest">
 	{{each list as obj i}}
 		<tr>
+			<td>{{obj.xlName}}</td>	
 			<td>{{obj.lp}}</td>	
 			<td>{{obj.clZbh}}</td>
 			<td>{{obj.jGh}}</td>
@@ -467,7 +467,7 @@
 				 divFrom2 = window.document.getElementById('forms_1');
 				divFrom2.style.width=divFrom1.offsetWidth+"px";
 			});
-			$.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query"},function(result){
+			$.get('/realSchedule/realScheduleList_zrw',{line:line,date:date,type:"query"},function(result){
 				getTime(result);
 				var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
 				$('#forms_2 .scheduleDaily_3').html(scheduleDaily_3);
@@ -513,7 +513,7 @@
 			params['xlName'] = xlName;
 			params['type'] = "export";
 			params['state'] = '2';
-			params['genre'] = 'fqp';
+			params['genre'] = 'zrw';
 			$get('/realSchedule/scheduleDailyExport', params, function(result){
 				if(date.length == 10)
 					window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+lineName+"-调度日报");