时刻表分析

娄高锋
1 parent 56b9c321
Showing 2 changed files with 33 additions and 19 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
@@ -565,7 +565,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		try {
  
-			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
+			String sql = "select schedule_date_str,xl_name,bc_type,gs_name,fgs_name,bcs,fcno,"
+					+"fcsj,fcsj_actual,zdsj,zdsj_actual,bcsj,qdz_name,sp_id,cc_service"
+					+" from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate
+					+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -636,8 +639,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
  
 			if(model.length() != 0){
 //				sql = "select * from bsth_c_s_ttinfo_detail where ttinfo = '"+model+"' and bc_type != 'in' and bc_type != 'out'";
-				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'" +
-						" and bc_type != 'ldks' and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
+				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'"
+						+ " and bc_type != 'ldks' and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
 				if(line.length() != 0){
 					sql += " and xl_bm = '"+line+"'";
 				}
@@ -656,21 +659,21 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			e.printStackTrace();
 		}
  
+		Set<Long> ttSet = new HashSet<Long>();
+		for(Long tt : ttList){
+			ttSet.add(tt);
+		}
 		//分组计算 同时判断是否所选时刻信息
 		for(ScheduleRealInfo schedule : list){
 			if(schedule.isCcService()){
 				continue;
 			}
-			DO:{
 				if(model.length() != 0){
-					for(Long tt : ttList){
-						if((long)tt == (long)schedule.getSpId()){
-							String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj();
-							if(!keyMap.containsKey(key))
-								keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-							keyMap.get(key).add(schedule);
-							break DO;
-						}
+					if(ttSet.contains(schedule.getSpId())){
+						String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj();
+						if(!keyMap.containsKey(key))
+							keyMap.put(key, new ArrayList<ScheduleRealInfo>());
+						keyMap.get(key).add(schedule);
 					}
 				} else {
 					String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj();
@@ -678,7 +681,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 						keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 					keyMap.get(key).add(schedule);
 				}
-			}
 		}
 		String companyName = "", subCompanyName = "";
 		for(String key : keyMap.keySet()){
@@ -800,7 +802,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		if(page.length() != 0 && type.equals("query")){
 			int currPage = Integer.valueOf(page);
 			modelMap.put("totalPage", resList.size()%10>0?(resList.size()/10 + 1):resList.size()/10);
-			modelMap.put("dataList", resList.subList(currPage*10,((currPage+1)*10)>=resList.size()?resList.size():(currPage+1)*10));
+//			modelMap.put("dataList", resList.subList(currPage*10,((currPage+1)*10)>=resList.size()?resList.size():(currPage+1)*10));
+			modelMap.put("dataList", resList);
 		} else {
 			modelMap.put("dataList", resList);
 		}
@@ -218,6 +218,7 @@
 			jsDoQuery(true);
 		});
  
+		var list;
 		var line = $("#line").val();
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
@@ -254,10 +255,8 @@
 			$(".hidden").removeClass("hidden");
 			var i = layer.load(2);
 			$get('/pcpc/scheduleAnaly', params, function(result){
-				// 把数据填充到模版中
-				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms tbody').html(tbodyHtml);
+				list = result.dataList;
+				dataPageChange(page, result.dataList);
 				layer.close(i);
  
 				if(result.dataList.length == 0)
@@ -277,6 +276,17 @@
 			});
 		}
  
+		function dataPageChange(page, list){
+			var tempList = [];
+			for(var f = page*10; f < list.length && f < (page+1)*10; f++){
+				tempList[tempList.length] = list[f];
+			}
+			// 把数据填充到模版中
+			var tbodyHtml = template('list_scheduleAnaly',{list:tempList});
+			// 把渲染好的模版html文本追加到表格中
+			$('#forms tbody').html(tbodyHtml);
+		}
+		
 		$("#export").on("click",function(){
 			var params = {};
 			params['page'] = page;
@@ -387,7 +397,8 @@
 			    		return;
 			    	}
 			    	page = num - 1;
-			    	jsDoQuery(false);
+// 			    	jsDoQuery(false);
+					dataPageChange(page, list);
 			    }
 			});
 		}