Commit e6bea58eb70167830f6321aab861451a43d7377e

Authored by 娄高锋
1 parent 6a9a90ae

线路首末班准点率空指针问题修复。

src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
@@ -1782,7 +1782,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1782,7 +1782,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1782 try { 1782 try {
1783 List<String> objList = new ArrayList<String>(); 1783 List<String> objList = new ArrayList<String>();
1784 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," 1784 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,"
1785 - + " a.fgs_bm, a.cc_service, a.remarks, a.adjust_exps, (select start_opt from bsth_c_line_config where id = " 1785 + + " a.bc_type, a.fgs_bm, a.cc_service, a.remarks, a.adjust_exps, (select start_opt from bsth_c_line_config where id = "
1786 + " (select max(id) from bsth_c_line_config where line = (select id from bsth_c_line where line_code = a.xl_bm))) start_opt" 1786 + " (select max(id) from bsth_c_line_config where line = (select id from bsth_c_line where line_code = a.xl_bm))) start_opt"
1787 + " from bsth_c_s_sp_info_real a where schedule_date_str >= ? and schedule_date_str <= ?" 1787 + " from bsth_c_s_sp_info_real a where schedule_date_str >= ? and schedule_date_str <= ?"
1788 + " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'"; 1788 + " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
@@ -1810,6 +1810,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -1810,6 +1810,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1810 ScheduleRealInfo schedule = new ScheduleRealInfo(); 1810 ScheduleRealInfo schedule = new ScheduleRealInfo();
1811 schedule.setScheduleDateStr(rs.getString("schedule_date_str")); 1811 schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
1812 schedule.setRealExecDate(rs.getString("real_exec_date")); 1812 schedule.setRealExecDate(rs.getString("real_exec_date"));
  1813 + schedule.setBcType("bc_type");
1813 schedule.setXlName(rs.getString("xl_name")); 1814 schedule.setXlName(rs.getString("xl_name"));
1814 schedule.setXlBm(rs.getString("xl_bm")); 1815 schedule.setXlBm(rs.getString("xl_bm"));
1815 schedule.setFcsj(rs.getString("fcsj")); 1816 schedule.setFcsj(rs.getString("fcsj"));