潘钊 / bsth_control · Commits

Commit d71b5a59dfc823542751c1c58c4073f1b9650b76

Authored by 潘钊
2 parents df306bdf 6f6e2a67
build: skipped

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

Inline Side-by-side
Showing 2 changed files with 7 additions and 5 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @d71b5a5
... ... @@ -131,20 +131,22 @@ public class ReportServiceImpl implements ReportService{
131 131 cal.setTime(dates);
132 132 //周数，表分区字段
133 133 int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
134   -
  134 + int weeks_year_next=weeks_year +1;
135 135 Connection conn = null;
136 136 PreparedStatement ps = null;
137 137 ResultSet rs = null;
138 138 String year=date.substring(0,4);
139   - String sql = "select * from bsth_c_arrival_info_"+year+" where device_id=? AND line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
  139 + String sql = "select * from bsth_c_arrival_info_"+year+" where device_id=? AND line_id=? "
  140 + + " AND weeks_year>=? AND weeks_year<=? AND ts >= ? AND ts <=? order by ts";
140 141 try{
141 142 conn = DBUtils_MS.getConnection();
142 143 ps = conn.prepareStatement(sql);
143 144 ps.setString(1, sbbb);
144 145 ps.setString(2,line);
145 146 ps.setInt(3, weeks_year);
146   - ps.setLong(4, date1);
147   - ps.setLong(5, date2);
  147 + ps.setInt(4, weeks_year_next);
  148 + ps.setLong(5, date1);
  149 + ps.setLong(6, date2);
148 150 rs = ps.executeQuery();
149 151  
150 152 list = resultSet2Set(rs);
... ...
src/main/resources/static/pages/report/inoutstation.html
  View file @d71b5a5
... ... @@ -419,7 +419,7 @@
419 419 layer.msg("请选择时间");
420 420 }else if(zdlx=="" || zdlx==null){
421 421 layer.msg("请选择方向");
422   - }else if(zd=="" || zd==null){
  422 + }else if(zd=="" || zd==null||zd==" "){
423 423 layer.msg("请选择站点");
424 424 }else{
425 425 var xlmc="线路: "+$("#select2-line-container").html();
... ...