闵行超速异常修改

YRF
1 parent b9831686
Showing 3 changed files with 16 additions and 18 deletions
src/main/java/com/bsth/service/excep/impl/NowSpeedingServiceImpl.java
src/main/resources/static/pages/base/station/js/station-list-table.js
src/main/resources/static/pages/excep/mhspeedingList.html
@@ -129,20 +129,19 @@ public class NowSpeedingServiceImpl implements NowSpeedingService {
 	@Override
 	public PageObject<Speeding> Pagequery(Map<String, Object> map) {
 		String sql="select count(*) record from bsth_c_speeding_handle where 1=1 ";
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Object line=map.get("line");
 		Object updown=map.get("updown");
 		Object startDate=map.get("startDate");
 		Object endDate=map.get("endDate");
 		Object times=map.get("times");
-		
-		if(line!=null){
+		if(line!=null && line != ""){
 			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
-		if(updown!=null){
+		if(updown!=null && line != ""){
 			sql +="and up_down like '%"+updown.toString()+"%'";
 		}
-		if(startDate!=null){
+		if(startDate!=null && line != ""){
 			if (startDate.toString().length()>0) {
 				try {
 					Long t1 = sdf.parse(startDate.toString()+" 00:00:00").getTime();
@@ -152,7 +151,7 @@ public class NowSpeedingServiceImpl implements NowSpeedingService {
 				}
 			}
 		}
-		if(endDate!=null){
+		if(endDate!=null && line != ""){
 			if (endDate.toString().length()>0) {
 				try {
 					Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime();
@@ -163,7 +162,7 @@ public class NowSpeedingServiceImpl implements NowSpeedingService {
 			}
 		}
-		if(times!=null && times.toString().length()>0){
+		if(times!=null && times.toString().length()>0 && line != ""){
 			sql +=" and (endTimestamp-startTimestamp) >="+Integer.valueOf(times.toString())*1000;
 		}
@@ -262,7 +262,6 @@
 		var i = layer.load(2);
 		// 异步请求获取表格数据
 		$.get('/stationroute',params,function(result){
-			console.log(result);
 			// 添加序号
 			result.content.page =  page;
 			// 把数据填充到模版中
@@ -302,17 +302,17 @@ $(function(){
 		    	var cells = $('tr.filter')[0].cells
 				,params = {}
 				,name;
-			$.each(cells, function(i, cell){
-				var items = $('input,select', cell);
-				for(var j = 0, item; item = items[j++];){
-					name = $(item).attr('name');
-					if(name){
-						params[name] = $(item).val();
+				$.each(cells, function(i, cell){
+					var items = $('input,select', cell);
+					for(var j = 0, item; item = items[j++];){
+						name = $(item).attr('name');
+						if(name){
+							params[name] = $(item).val();
+						}
 					}
-				}
-			});
-			page = num - 1;
-		   	jsDoQuery(params, false);
+				});
+				page = num - 1;
+			   	jsDoQuery(params, false);
 		    }
 		});
 	}