潘钊 / bsth_control · Commits

Commit 334ff0b6710e90a5eae07e78b61560492ce65ce4

Authored by 娄高锋
1 parent ede0e52a

线路首末班查询 班次类型除去区间类型

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
  View file @334ff0b
@@ -1210,8 +1210,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1210,8 +1210,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1210 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," 1210 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,"
1211 + " 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" 1211 + " 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"
1212 + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'" 1212 + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'"
1213 - + " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";  
1214 - if(line.length() != 0) 1213 + + " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
  1214 + if(line.trim().length() != 0)
1215 sql += " and xl_bm = '"+line+"'"; 1215 sql += " and xl_bm = '"+line+"'";
1216 if(company.length() != 0) 1216 if(company.length() != 0)
1217 sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'"; 1217 sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
@@ -1427,7 +1427,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1427,7 +1427,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1427 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," 1427 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,"
1428 + " 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" 1428 + " 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"
1429 + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'" 1429 + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"
1430 - + " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'"; 1430 + + " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
1431 if(line.length() != 0) 1431 if(line.length() != 0)
1432 sql += " and xl_bm = '"+line+"'"; 1432 sql += " and xl_bm = '"+line+"'";
1433 if(company.length() != 0) 1433 if(company.length() != 0)