Commit 1fa133bde8c7dab5957a4cb8003bec30e5012ba3
1 parent
16615348
update
Showing
2 changed files
with
6 additions
and
6 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
| ... | ... | @@ -2826,14 +2826,14 @@ public class BusIntervalServiceImpl implements BusIntervalService { |
| 2826 | 2826 | |
| 2827 | 2827 | String sql = "select id, cl_zbh, fcsj, fcsj_actual, j_gh, j_name, lp_name, qdz_name, " + |
| 2828 | 2828 | "schedule_date_str, xl_name, zdsj, zdsj_actual, fgs_name, gs_name, xl_dir, xl_bm " + |
| 2829 | - "from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"; | |
| 2829 | + "from bsth_c_s_sp_info_real " + | |
| 2830 | + "where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"' " + | |
| 2831 | + "and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and cc_service = 0"; | |
| 2830 | 2832 | |
| 2831 | - if(line.length() != 0) | |
| 2832 | - sql += " and xl_bm = '"+line+"'"; | |
| 2833 | 2833 | if(company.length() != 0) |
| 2834 | 2834 | sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'"; |
| 2835 | - | |
| 2836 | - sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and cc_service = 0"; | |
| 2835 | + if(line.length() != 0) | |
| 2836 | + sql += " and xl_bm = '"+line+"'"; | |
| 2837 | 2837 | |
| 2838 | 2838 | System.out.println(sql); |
| 2839 | 2839 | List<ScheduleRealInfo> list = jdbcTemplate.query(sql, | ... | ... |
src/main/resources/static/pages/punctual/onTime.html
| ... | ... | @@ -152,7 +152,7 @@ |
| 152 | 152 | $('.menu-toggler.sidebar-toggler').click(); |
| 153 | 153 | |
| 154 | 154 | var d = new Date(); |
| 155 | - d.setTime(d.getTime() - 1*1000*60*60*24); | |
| 155 | + d.setTime(d.getTime() - 3*1000*60*60*24); | |
| 156 | 156 | var year = d.getFullYear(); |
| 157 | 157 | var month = d.getMonth() + 1; |
| 158 | 158 | var day = d.getDate(); | ... | ... |