update

娄高锋
1 parent 16615348
Showing 2 changed files with 6 additions and 6 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/resources/static/pages/punctual/onTime.html
@@ -2826,14 +2826,14 @@ 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_name, gs_name, xl_dir, xl_bm " +
-				"from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
+				"from bsth_c_s_sp_info_real " +
+				"where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"' " +
+				"and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and cc_service = 0";
-		if(line.length() != 0)
-			sql += " and xl_bm = '"+line+"'";
 		if(company.length() != 0)
 			sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
-			
-		sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and cc_service = 0";
+		if(line.length() != 0)
+			sql += " and xl_bm = '"+line+"'";
 		System.out.println(sql);
 		List<ScheduleRealInfo> list = jdbcTemplate.query(sql,
@@ -152,7 +152,7 @@
 			$('.menu-toggler.sidebar-toggler').click();
 		var d = new Date();
-		d.setTime(d.getTime() - 1*1000*60*60*24);
+		d.setTime(d.getTime() - 3*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();