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

潘钊
2 parents df306bdf 6f6e2a67
Showing 2 changed files with 7 additions and 5 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/report/inoutstation.html
@@ -131,20 +131,22 @@ public class ReportServiceImpl implements ReportService{
 		cal.setTime(dates);
 		//周数，表分区字段
 		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
-
+		int weeks_year_next=weeks_year +1;
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		String year=date.substring(0,4);
-		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";
+		String sql = "select * from bsth_c_arrival_info_"+year+" where  device_id=? AND line_id=? "
+				+ " AND weeks_year>=? AND weeks_year<=? AND ts >= ? AND ts <=? order by ts";
 		try{
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
 			ps.setString(1, sbbb);
 			ps.setString(2,line);
 			ps.setInt(3, weeks_year);
-			ps.setLong(4, date1);
-			ps.setLong(5, date2);
+			ps.setInt(4, weeks_year_next);
+			ps.setLong(5, date1);
+			ps.setLong(6, date2);
 			rs = ps.executeQuery();
 			list = resultSet2Set(rs);
@@ -419,7 +419,7 @@
 				layer.msg("请选择时间");
 			}else if(zdlx=="" || zdlx==null){
 				layer.msg("请选择方向");
-			}else if(zd=="" || zd==null){
+			}else if(zd=="" || zd==null||zd==" "){
 				layer.msg("请选择站点");
 			}else{
 				   var xlmc="线路: "+$("#select2-line-container").html();