线路首末班准点率汇总与时间区间

娄高锋
1 parent 48bbb52b
Showing 4 changed files with 437 additions and 307 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/mould/firstAndLastBus_sum.xls
src/main/resources/static/pages/forms/statement/firstAndLastBus.html
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
@@ -1180,8 +1180,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 	@Override
 	public List<Map<String, Object>> firstAndLastBus(Map<String, Object> map) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		NumberFormat nf = NumberFormat.getNumberInstance();
+		nf.setMinimumFractionDigits(2);
+		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
@@ -1190,151 +1193,173 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String type = map.get("type").toString();
 		if(date.length() == 0)
-			date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+			date = sdf.format(new Date());
-		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line, date);
+		try {
+			String sql = "select a.schedule_date_Str, a.real_exec_date, 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,"
+					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
+					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'"
+					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			if(line.length() != 0)
+				sql += " and xl_bm = '"+line+"'";
+			if(company.length() != 0)
+				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+			
+			list = jdbcTemplate.query(sql,
+					new RowMapper<ScheduleRealInfo>(){
+				@Override
+				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
+					ScheduleRealInfo schedule = new ScheduleRealInfo();
+					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setRealExecDate(rs.getString("real_exec_date"));
+					schedule.setXlName(rs.getString("xl_name"));
+					schedule.setFcsj(rs.getString("fcsj"));
+					schedule.setFcsjActual(rs.getString("fcsj_actual"));
+					schedule.setZdsj(rs.getString("zdsj"));
+					schedule.setZdsjActual(rs.getString("zdsj_actual"));
+					schedule.setQdzName(rs.getString("qdz_name"));
+					schedule.setZdzName(rs.getString("zdz_name"));
+					schedule.setXlDir(rs.getString("xl_dir"));
+					schedule.setStatus(rs.getInt("status"));
+					schedule.setGsName(rs.getString("gs_name"));
+					schedule.setFgsName(rs.getString("fgs_name"));
+					
+					int startOpt = 0;
+					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
+						String[] split = rs.getString("start_opt").split(":");
+						startOpt = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+					}
+					
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
+					if(schedule.getFcsj() != null){
+						String[] split = schedule.getFcsj().split(":");
+						int fcsj = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						if(fcsj < startOpt)
+							fcsj += 1440;
+						schedule.setFcsjT((long)fcsj);
+					}
+					if(schedule.getFcsjActual() != null){
+						String[] split = schedule.getFcsjActual().split(":");
+						int fcsjA = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						if(fcsjA < startOpt || !schedule.getRealExecDate().equals(schedule.getScheduleDateStr()))
+							fcsjA += 1440;
+						schedule.setFcsjActualTime((long)fcsjA);
+					}
+					
+					return schedule;
+				}
+			});
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
-		for(ScheduleRealInfo schedule : list){
-			if(schedule.getBcType().equals("in") || schedule.getBcType().equals("out") || schedule.getBcType().equals("ldks"))
-				continue;
-			if(schedule.getStatus() == -1){
-				continue;
-			}
-			String key = schedule.getXlName();
-			if(key == null || key.trim().length() == 0)
-				continue;
-			if(!keyMap.containsKey(key))
-				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-			keyMap.get(key).add(schedule);
+		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
+		String companyName = "", subCompanyName = "";
+		
+		for(ScheduleRealInfo s : list){
+			String xlName = s.getXlName();
+			if(!keyMap.containsKey(xlName))
+				keyMap.put(xlName, new ArrayList<ScheduleRealInfo>());
+			keyMap.get(xlName).add(s);
+			if(companyName.length()==0&&s.getGsName()!=null&&s.getGsName().trim().length()!=0)
+				companyName = s.getGsName();
+			if(subCompanyName.length()==0&&s.getFgsName()!=null&&s.getFgsName().trim().length()!=0)
+				subCompanyName = s.getFgsName();
 		}
-		for(String key : keyMap.keySet()){
+		
+		for(String xlName : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
-			Map<Long, ScheduleRealInfo> temp0 = new HashMap<Long, ScheduleRealInfo>();
-			List<Long> longList0 = new ArrayList<Long>();
-			Map<Long, ScheduleRealInfo> temp1 = new HashMap<Long, ScheduleRealInfo>();
-			List<Long> longList1 = new ArrayList<Long>();
-			String companyName = "", subCompanyName = "";
-			for(ScheduleRealInfo schedule : keyMap.get(key)){
-				if(schedule.getFcsjActual() == null || schedule.getFcsjActual().trim().length() == 0){
-					continue;
-				}
-				if(schedule.getGsName() != null && companyName.length() == 0)
-					companyName = schedule.getGsName();
-				if(schedule.getFgsName() != null && subCompanyName.length() == 0)
-					subCompanyName = schedule.getFgsName();
-				String[] split = schedule.getFcsj().split(":");
-				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-				schedule.setFcsjT(min);
-				if(schedule.getXlDir().equals("0")){
-					temp0.put(min, schedule);
-					longList0.add(min);
-				} else {
-					temp1.put(min, schedule);
-					longList1.add(min);
+			tempMap.put("date", date.substring(5));
+			tempMap.put("line", xlName);
+			List<Long> up1 = new ArrayList<Long>();
+			List<Long> up2 = new ArrayList<Long>();;
+			List<Long> dn1 = new ArrayList<Long>();
+			List<Long> dn2 = new ArrayList<Long>();
+			Map<Long, ScheduleRealInfo> up1Map = new HashMap<Long, ScheduleRealInfo>();
+			Map<Long, ScheduleRealInfo> up2Map = new HashMap<Long, ScheduleRealInfo>();
+			Map<Long, ScheduleRealInfo> dn1Map = new HashMap<Long, ScheduleRealInfo>();
+			Map<Long, ScheduleRealInfo> dn2Map = new HashMap<Long, ScheduleRealInfo>();
+			for(ScheduleRealInfo s : keyMap.get(xlName)){
+				if(s.getXlDir().equals("0")){
+					up1.add(s.getFcsjT());
+					up2.add(s.getFcsjActualTime());
+					up1Map.put(s.getFcsjT(), s);
+					up2Map.put(s.getFcsjActualTime(), s);
+				} else if(s.getXlDir().equals("1")){
+					dn1.add(s.getFcsjT());
+					dn2.add(s.getFcsjActualTime());
+					dn1Map.put(s.getFcsjT(), s);
+					dn2Map.put(s.getFcsjActualTime(), s);
 				}
 			}
-			
-			if(longList0.size() == 0 && longList1.size() == 0){
-				continue;
-			}
-			
-			if(longList0.size() != 0){
-				Collections.sort(longList0);
-				ScheduleRealInfo shouban0 = temp0.get(longList0.get(0));
-				ScheduleRealInfo moban0 = temp0.get(longList0.get(longList0.size() - 1));
-				tempMap.put("qdzFirst0", shouban0.getQdzName());
-				tempMap.put("jhfcFirst0", shouban0.getFcsj());
-				tempMap.put("qdzLast0", moban0.getQdzName());
-				tempMap.put("jhfcLast0", moban0.getFcsj());
-				if(shouban0.getFcsjActual() != null){
-					String[] split = shouban0.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]); 
-					long delay = shouban0.getFcsjT() - min;
-					tempMap.put("sjfcFirst0", shouban0.getFcsjActual());
-					if(delay > 0)
-						tempMap.put("delayFirst0", "+" + delay);
-					else
-						tempMap.put("delayFirst0", delay);
-				} else {
-					tempMap.put("sjfcFirst0", "/");
-					tempMap.put("delayFirst0", "/");
-				}
-				if(moban0.getFcsjActual() != null){
-					String[] split = moban0.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-					long delay = moban0.getFcsjT() - min;
-					tempMap.put("sjfcLast0", moban0.getFcsjActual());
-					if(delay > 0)
-						tempMap.put("delayLast0", "+" + delay);
-					else
-						tempMap.put("delayLast0", delay);
-				} else {
-					tempMap.put("sjfcLast0", "/");
-					tempMap.put("delayLast0", "/");
-				}
-			}else{
+			if(up1.size() > 0 && up2.size() > 0){
+				Collections.sort(up1);
+				Collections.sort(up2);
+				ScheduleRealInfo s1 = up1Map.get(up1.get(0));
+				ScheduleRealInfo s2 = up2Map.get(up2.get(0));
+				ScheduleRealInfo s3 = up1Map.get(up1.get(up1.size()-1));
+				ScheduleRealInfo s4 = up2Map.get(up2.get(up2.size()-1));
+				long delayFirst0 = up1.get(0) - up2.get(0);
+				long delayLast0 = up1.get(up1.size()-1) - up2.get(up2.size()-1);
+				tempMap.put("qdzFirst0", s1.getQdzName());
+				tempMap.put("jhfcFirst0", s1.getFcsj());
+				tempMap.put("sjfcFirst0", s2.getFcsjActual());
+				tempMap.put("delayFirst0", delayFirst0>0?"+"+delayFirst0:delayFirst0);
+				tempMap.put("qdzLast0", s3.getQdzName());
+				tempMap.put("jhfcLast0", s3.getFcsj());
+				tempMap.put("sjfcLast0", s4.getFcsjActual());
+				tempMap.put("delayLast0", delayLast0>0?"+"+delayLast0:delayLast0);
+			} else {
 				tempMap.put("qdzFirst0", "--");
 				tempMap.put("jhfcFirst0", "/");
-				tempMap.put("qdzLast0", "--");
-				tempMap.put("jhfcLast0", "/");
 				tempMap.put("sjfcFirst0", "/");
 				tempMap.put("delayFirst0", "/");
+				tempMap.put("qdzLast0", "--");
+				tempMap.put("jhfcLast0", "/");
 				tempMap.put("sjfcLast0", "/");
 				tempMap.put("delayLast0", "/");
 			}
-			
-			if(longList1.size() != 0){
-				Collections.sort(longList1);
-				ScheduleRealInfo shouban1 = temp1.get(longList1.get(0));
-				ScheduleRealInfo moban1 = temp1.get(longList1.get(longList1.size() - 1));
-				tempMap.put("qdzFirst1", shouban1.getQdzName());
-				tempMap.put("jhfcFirst1", shouban1.getFcsj());
-				tempMap.put("qdzLast1", moban1.getQdzName());
-				tempMap.put("jhfcLast1", moban1.getFcsj());
-				if(shouban1.getFcsjActual() != null){
-					String[] split = shouban1.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]); 
-					long delay = shouban1.getFcsjT() - min;
-					tempMap.put("sjfcFirst1", shouban1.getFcsjActual());
-					if(delay > 0)
-						tempMap.put("delayFirst1", "+" + delay);
-					else
-						tempMap.put("delayFirst1", delay);
-				} else {
-					tempMap.put("sjfcFirst1", "/");
-					tempMap.put("delayFirst1", "/");
-				}
-				if(moban1.getFcsjActual() != null){
-					String[] split = moban1.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-					long delay = moban1.getFcsjT() - min;
-					tempMap.put("sjfcLast1", moban1.getFcsjActual());
-					if(delay > 0)
-						tempMap.put("delayLast1", "+" + delay);
-					else
-						tempMap.put("delayLast1", delay);
-				} else {
-					tempMap.put("sjfcLast1", "/");
-					tempMap.put("delayLast1", "/");
-				}
-			}else{
+			if(dn1.size() > 0 && dn2.size() > 0){
+				Collections.sort(dn1);
+				Collections.sort(dn2);
+				ScheduleRealInfo s1 = dn1Map.get(dn1.get(0));
+				ScheduleRealInfo s2 = dn2Map.get(dn2.get(0));
+				ScheduleRealInfo s3 = dn1Map.get(dn1.get(dn1.size()-1));
+				ScheduleRealInfo s4 = dn2Map.get(dn2.get(dn2.size()-1));
+				long delayFirst1 = dn1.get(0) - dn2.get(0);
+				long delayLast1 = dn1.get(dn1.size()-1) - dn2.get(dn2.size()-1);
+				tempMap.put("qdzFirst1", s1.getQdzName());
+				tempMap.put("jhfcFirst1", s1.getFcsj());
+				tempMap.put("sjfcFirst1", s2.getFcsjActual());
+				tempMap.put("delayFirst1", delayFirst1>0?"+"+delayFirst1:delayFirst1);
+				tempMap.put("qdzLast1", s3.getQdzName());
+				tempMap.put("jhfcLast1", s3.getFcsj());
+				tempMap.put("sjfcLast1", s4.getFcsjActual());
+				tempMap.put("delayLast1", delayLast1>0?"+"+delayLast1:delayLast1);
+			} else {
 				tempMap.put("qdzFirst1", "--");
 				tempMap.put("jhfcFirst1", "/");
-				tempMap.put("qdzLast1", "--");
-				tempMap.put("jhfcLast1", "/");
 				tempMap.put("sjfcFirst1", "/");
 				tempMap.put("delayFirst1", "/");
+				tempMap.put("qdzLast1", "--");
+				tempMap.put("jhfcLast1", "/");
 				tempMap.put("sjfcLast1", "/");
 				tempMap.put("delayLast1", "/");
 			}
-			
-			tempMap.put("date", date);
 			tempMap.put("company", companyName);
 			tempMap.put("subCompany", subCompanyName);
-			tempMap.put("line", key);
+			tempMap.put("date", date);
+			tempMap.put("line", xlName);
 			resList.add(tempMap);
 		}
-		
+
 		if(type.equals("export")){
 			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
 					sdfSimple = new SimpleDateFormat("yyyyMMdd");
@@ -1357,164 +1382,248 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 	@Override
 	public List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		NumberFormat nf = NumberFormat.getNumberInstance();
 		nf.setMinimumFractionDigits(2);
+		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
 		String line = map.get("line").toString();
-		String date = map.get("date").toString();
+//		String date = map.get("date").toString();
+		String startDate = map.get("startDate").toString();
+		String endDate = map.get("endDate").toString();
 		String type = map.get("type").toString();
-		if(date.length() == 0)
-			date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-		
-		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line, date);
+		if(startDate.length() == 0)
+			startDate = sdf.format(new Date());
+		if(endDate.length() == 0)
+			endDate = sdf.format(new Date());
-		for(ScheduleRealInfo schedule : list){
-			if(schedule.getBcType().equals("in") || schedule.getBcType().equals("out") || schedule.getBcType().equals("ldks"))
-				continue;
-			if(schedule.getStatus() == -1){
-				continue;
-			}
-			String key = schedule.getXlName();
-			if(key == null || key.trim().length() == 0)
-				continue;
-			if(!keyMap.containsKey(key))
-				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-			keyMap.get(key).add(schedule);
+		String dates = "";
+		if(startDate.equals(endDate)){
+			String[] split = startDate.split("-");
+			dates = split[0]+"年"+split[1]+"月"+split[2]+"日";
+		} else {
+			String[] split1 = startDate.split("-");
+			String[] split2 = endDate.split("-");
+			dates = split1[0]+"年"+split1[1]+"月"+split1[2]+"日--"
+					+split2[0]+"年"+split2[1]+"月"+split2[2]+"日";
 		}
-		for(String key : keyMap.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			Map<String, Object> m = new HashMap<String, Object>();
-			Map<Long, ScheduleRealInfo> temp0 = new HashMap<Long, ScheduleRealInfo>();
-			List<Long> longList0 = new ArrayList<Long>();
-			Map<Long, ScheduleRealInfo> temp1 = new HashMap<Long, ScheduleRealInfo>();
-			List<Long> longList1 = new ArrayList<Long>();
-			String companyName = "", subCompanyName = "";
-			for(ScheduleRealInfo schedule : keyMap.get(key)){
-				if(schedule.getFcsjActual() == null || schedule.getFcsjActual().trim().length() == 0){
-					continue;
-				}
-				if(schedule.getGsName() != null && companyName.length() == 0)
-					companyName = schedule.getGsName();
-				if(schedule.getFgsName() != null && subCompanyName.length() == 0)
-					subCompanyName = schedule.getFgsName();
-				String[] split = schedule.getFcsj().split(":");
-				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-				schedule.setFcsjT(min);
-				if(schedule.getXlDir().equals("0")){
-					temp0.put(min, schedule);
-					longList0.add(min);
-				} else {
-					temp1.put(min, schedule);
-					longList1.add(min);
+		
+		try {
+			String sql = "select a.schedule_date_Str, a.real_exec_date, 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,"
+					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
+					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"
+					+ " and fcsj_actual is not null and fcsj_actual != '' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			if(line.length() != 0)
+				sql += " and xl_bm = '"+line+"'";
+			if(company.length() != 0)
+				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+			
+			list = jdbcTemplate.query(sql,
+					new RowMapper<ScheduleRealInfo>(){
+				@Override
+				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
+					ScheduleRealInfo schedule = new ScheduleRealInfo();
+					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setRealExecDate(rs.getString("real_exec_date"));
+					schedule.setXlName(rs.getString("xl_name"));
+					schedule.setFcsj(rs.getString("fcsj"));
+					schedule.setFcsjActual(rs.getString("fcsj_actual"));
+					schedule.setZdsj(rs.getString("zdsj"));
+					schedule.setZdsjActual(rs.getString("zdsj_actual"));
+					schedule.setQdzName(rs.getString("qdz_name"));
+					schedule.setZdzName(rs.getString("zdz_name"));
+					schedule.setXlDir(rs.getString("xl_dir"));
+					schedule.setStatus(rs.getInt("status"));
+					schedule.setGsName(rs.getString("gs_name"));
+					schedule.setFgsName(rs.getString("fgs_name"));
+					
+					int startOpt = 0;
+					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
+						String[] split = rs.getString("start_opt").split(":");
+						startOpt = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+					}
+					
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
+					if(schedule.getFcsj() != null){
+						String[] split = schedule.getFcsj().split(":");
+						int fcsj = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						if(fcsj < startOpt)
+							fcsj += 1440;
+						schedule.setFcsjT((long)fcsj);
+					}
+					if(schedule.getFcsjActual() != null){
+						String[] split = schedule.getFcsjActual().split(":");
+						int fcsjA = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]);
+						if(fcsjA < startOpt || !schedule.getRealExecDate().equals(schedule.getScheduleDateStr()))
+							fcsjA += 1440;
+						schedule.setFcsjActualTime((long)fcsjA);
+					}
+					
+					return schedule;
 				}
-			}
+			});
-			if(longList0.size() == 0 && longList1.size() == 0){
-				continue;
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+		
+		Map<String, Map<String, List<ScheduleRealInfo>>> keyMap = new HashMap<String, Map<String,List<ScheduleRealInfo>>>();
+		String companyName = "", subCompanyName = "";
+		
+		for(ScheduleRealInfo s : list){
+			String xlName = s.getXlName();
+			String date = s.getScheduleDateStr();
+			if(!keyMap.containsKey(xlName))
+				keyMap.put(xlName, new HashMap<String, List<ScheduleRealInfo>>());
+			if(!keyMap.get(xlName).containsKey(date))
+				keyMap.get(xlName).put(date, new ArrayList<ScheduleRealInfo>());
+			keyMap.get(xlName).get(date).add(s);
+			if(companyName.length()==0&&s.getGsName()!=null&&s.getGsName().trim().length()!=0)
+				companyName = s.getGsName();
+			if(subCompanyName.length()==0&&s.getFgsName()!=null&&s.getFgsName().trim().length()!=0)
+				subCompanyName = s.getFgsName();
+		}
+		
+		for(String xlName : keyMap.keySet()){
+			List<Map<String, Object>> tempList = new ArrayList<Map<String,Object>>();
+			Map<String, Object> tempMap = new HashMap<String, Object>();
+			Map<Long, String> dateMap = new HashMap<Long, String>();
+			List<Long> Longs = new ArrayList<Long>();
+			int jhbc = 0, sjbc = 0;
+			for(String date : keyMap.get(xlName).keySet()){
+				String[] split = date.split("-");
+				long l = Long.valueOf(split[0])*10000 + Long.valueOf(split[1])*100 + Long.valueOf(split[2]);
+				dateMap.put(l, date);
+				Longs.add(l);
 			}
-			int jhbc = 0;
-			int sjbc = 0;
-			
-			if(longList0.size() != 0){
-				Collections.sort(longList0);
-				ScheduleRealInfo shouban0 = temp0.get(longList0.get(0));
-				ScheduleRealInfo moban0 = temp0.get(longList0.get(longList0.size() - 1));
-				if(shouban0.getFcsjActual() != null){
-					jhbc++;
-					String[] split = shouban0.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]); 
-					long delay = shouban0.getFcsjT() - min;
-					if(delay >= -3 && delay <= 1){
-						sjbc++;
+			Collections.sort(Longs);
+			for(long l : Longs){
+				String date = dateMap.get(l);
+				Map<String, Object> temp = new HashMap<String, Object>();
+				temp.put("date", date.substring(5));
+				temp.put("line", xlName);
+				List<Long> up1 = new ArrayList<Long>();
+				List<Long> up2 = new ArrayList<Long>();;
+				List<Long> dn1 = new ArrayList<Long>();
+				List<Long> dn2 = new ArrayList<Long>();
+				Map<Long, ScheduleRealInfo> up1Map = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> up2Map = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> dn1Map = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> dn2Map = new HashMap<Long, ScheduleRealInfo>();
+				for(ScheduleRealInfo s : keyMap.get(xlName).get(date)){
+					if(s.getXlDir().equals("0")){
+						up1.add(s.getFcsjT());
+						up2.add(s.getFcsjActualTime());
+						up1Map.put(s.getFcsjT(), s);
+						up2Map.put(s.getFcsjActualTime(), s);
+					} else if(s.getXlDir().equals("1")){
+						dn1.add(s.getFcsjT());
+						dn2.add(s.getFcsjActualTime());
+						dn1Map.put(s.getFcsjT(), s);
+						dn2Map.put(s.getFcsjActualTime(), s);
 					}
-					m.put("qdzFirst0", shouban0.getQdzName());
-					m.put("jhfcFirst0", shouban0.getFcsj());
-					m.put("sjfcFirst0", shouban0.getFcsjActual());
-					m.put("delayFirst0", delay>0?"+"+delay:delay);
 				}
-				
-				if(moban0.getFcsjActual() != null){
-					jhbc++;
-					String[] split = moban0.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-					long delay = moban0.getFcsjT() - min;
-					if(delay >= -3 && delay <= 1){
+				if(up1.size() > 0 && up2.size() > 0){
+					Collections.sort(up1);
+					Collections.sort(up2);
+					ScheduleRealInfo s1 = up1Map.get(up1.get(0));
+					ScheduleRealInfo s2 = up2Map.get(up2.get(0));
+					ScheduleRealInfo s3 = up1Map.get(up1.get(up1.size()-1));
+					ScheduleRealInfo s4 = up2Map.get(up2.get(up2.size()-1));
+					long delayFirst0 = up1.get(0) - up2.get(0);
+					long delayLast0 = up1.get(up1.size()-1) - up2.get(up2.size()-1);
+					temp.put("qdzFirst0", s1.getQdzName());
+					temp.put("jhfcFirst0", s1.getFcsj());
+					temp.put("sjfcFirst0", s2.getFcsjActual());
+					temp.put("delayFirst0", delayFirst0>0?"+"+delayFirst0:delayFirst0);
+					temp.put("qdzLast0", s3.getQdzName());
+					temp.put("jhfcLast0", s3.getFcsj());
+					temp.put("sjfcLast0", s4.getFcsjActual());
+					temp.put("delayLast0", delayLast0>0?"+"+delayLast0:delayLast0);
+					jhbc += 2;
+					if(delayFirst0 <= 1l && delayFirst0 >= -3l)
 						sjbc++;
-					}
-					m.put("qdzLast0", moban0.getQdzName());
-					m.put("jhfcLast0", moban0.getFcsj());
-					m.put("sjfcLast0", moban0.getFcsjActual());
-					m.put("delayLast0", delay>0?"+"+delay:delay);
-				}
-			} else {
-				m.put("qdzFirst0", "--");
-				m.put("jhfcFirst0", "/");
-				m.put("sjfcFirst0", "/");
-				m.put("delayFirst0", "/");
-				m.put("qdzLast0", "--");
-				m.put("jhfcLast0", "/");
-				m.put("sjfcLast0", "/");
-				m.put("delayLast0", "/");
-			}
-			
-			if(longList1.size() != 0){
-				Collections.sort(longList1);
-				ScheduleRealInfo shouban1 = temp1.get(longList1.get(0));
-				ScheduleRealInfo moban1 = temp1.get(longList1.get(longList1.size() - 1));
-				if(shouban1.getFcsjActual() != null){
-					jhbc++;
-					String[] split = shouban1.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]); 
-					long delay = shouban1.getFcsjT() - min;
-					if(delay >= -3 && delay <= 1){
+					if(delayLast0 <= 1l && delayLast0 >= -3l)
 						sjbc++;
-					}
-					m.put("qdzFirst1", shouban1.getQdzName());
-					m.put("jhfcFirst1", shouban1.getFcsj());
-					m.put("sjfcFirst1", shouban1.getFcsjActual());
-					m.put("delayFirst1", delay>0?"+"+delay:delay);
+				} else {
+					temp.put("qdzFirst0", "--");
+					temp.put("jhfcFirst0", "/");
+					temp.put("sjfcFirst0", "/");
+					temp.put("delayFirst0", "/");
+					temp.put("qdzLast0", "--");
+					temp.put("jhfcLast0", "/");
+					temp.put("sjfcLast0", "/");
+					temp.put("delayLast0", "/");
 				}
-				
-				if(moban1.getFcsjActual() != null){
-					jhbc++;
-					String[] split = moban1.getFcsjActual().split(":");
-					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-					long delay = moban1.getFcsjT() - min;
-					if(delay >= -3 && delay <= 1){
+				if(dn1.size() > 0 && dn2.size() > 0){
+					Collections.sort(dn1);
+					Collections.sort(dn2);
+					ScheduleRealInfo s1 = dn1Map.get(dn1.get(0));
+					ScheduleRealInfo s2 = dn2Map.get(dn2.get(0));
+					ScheduleRealInfo s3 = dn1Map.get(dn1.get(dn1.size()-1));
+					ScheduleRealInfo s4 = dn2Map.get(dn2.get(dn2.size()-1));
+					long delayFirst1 = dn1.get(0) - dn2.get(0);
+					long delayLast1 = dn1.get(dn1.size()-1) - dn2.get(dn2.size()-1);
+					temp.put("qdzFirst1", s1.getQdzName());
+					temp.put("jhfcFirst1", s1.getFcsj());
+					temp.put("sjfcFirst1", s2.getFcsjActual());
+					temp.put("delayFirst1", delayFirst1>0?"+"+delayFirst1:delayFirst1);
+					temp.put("qdzLast1", s3.getQdzName());
+					temp.put("jhfcLast1", s3.getFcsj());
+					temp.put("sjfcLast1", s4.getFcsjActual());
+					temp.put("delayLast1", delayLast1>0?"+"+delayLast1:delayLast1);
+					jhbc += 2;
+					if(delayFirst1 <= 1l && delayFirst1 >= -3l)
 						sjbc++;
-					}
-					m.put("qdzLast1", moban1.getQdzName());
-					m.put("jhfcLast1", moban1.getFcsj());
-					m.put("sjfcLast1", moban1.getFcsjActual());
-					m.put("delayLast1", delay>0?"+"+delay:delay);
+					if(delayLast1 <= 1l && delayLast1 >= -3l)
+						sjbc++;
+				} else {
+					temp.put("qdzFirst1", "--");
+					temp.put("jhfcFirst1", "/");
+					temp.put("sjfcFirst1", "/");
+					temp.put("delayFirst1", "/");
+					temp.put("qdzLast1", "--");
+					temp.put("jhfcLast1", "/");
+					temp.put("sjfcLast1", "/");
+					temp.put("delayLast1", "/");
 				}
-			} else {
-				m.put("qdzFirst1", "--");
-				m.put("jhfcFirst1", "/");
-				m.put("sjfcFirst1", "/");
-				m.put("delayFirst1", "/");
-				m.put("qdzLast1", "--");
-				m.put("jhfcLast1", "/");
-				m.put("sjfcLast1", "/");
-				m.put("delayLast1", "/");
+				tempList.add(temp);
 			}
-
-			m.put("line", key);
-			tempMap.put("map", m);
+			tempMap.put("map", tempList);
+			tempMap.put("company", companyName);
+			tempMap.put("subCompany", subCompanyName);
+			tempMap.put("date", dates);
+			tempMap.put("line", xlName);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
 			tempMap.put("zdl", nf.format((float) sjbc / jhbc *100) + "%");
-			tempMap.put("date", date);
-			tempMap.put("company", companyName);
-			tempMap.put("subCompany", subCompanyName);
-			tempMap.put("line", key);
 			resList.add(tempMap);
 		}
+
+		Map<String, Object> tempMap = new HashMap<String, Object>();
+		if(resList.size() > 0){
+			tempMap.put("date", "合计汇总");
+			int jhbc = 0, sjbc = 0;
+			for(Map<String, Object> m : resList){
+				jhbc += Integer.valueOf(m.get("jhbc").toString());
+				sjbc += Integer.valueOf(m.get("sjbc").toString());
+			}
+			tempMap.put("jhbc", jhbc);
+			tempMap.put("sjbc", sjbc);
+			tempMap.put("zdl", nf.format((float) sjbc / jhbc *100) + "%");
+			if(!type.equals("export"))
+				resList.add(tempMap);
+		}
 		if(type.equals("export")){
 			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -1525,8 +1634,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			try {
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus_sum.xls",
-						path+"export/线路首末班准点率" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_sum.xls",
+						path+"export/线路首末班准点率" + sdfSimple.format(sdfMonth.parse(startDate)) +
+						(startDate.equals(endDate)?"":"-"+sdfSimple.format(sdfMonth.parse(endDate))) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -7,7 +7,8 @@
 	  .table-bordered > tbody > tr > td,
 	  .table-bordered > tfoot > tr > th,
 	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
+	    border: 1px solid;
+	    text-align: center; }
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
@@ -250,7 +251,7 @@
 			<td>{{obj.company}}</td>
 			<td>{{obj.subCompany}}</td>
 			<td>{{obj.line}}</td>
-			{{if obj.delayFirst0 != '/' && obj.delayFirst0 != '0'}}
+			{{if obj.delayFirst0 != '/' && (obj.delayFirst0 > 1 || obj.delayFirst0 < -2)}}
 				<td style="background-color: #FF9999">{{obj.qdzFirst0}}</td>
 				<td style="background-color: #FF9999">{{obj.jhfcFirst0}}</td>
 				<td style="background-color: #FF9999">{{obj.sjfcFirst0}}</td>
@@ -261,7 +262,7 @@
 				<td>{{obj.sjfcFirst0}}</td>
 				<td>{{obj.delayFirst0}}</td>
 			{{/if}}
-			{{if obj.delayLast0 != '/' && obj.delayLast0 != '0'}}
+			{{if obj.delayLast0 != '/' && (obj.delayLast0 > 1 || obj.delayLast0 < -2)}}
 				<td style="background-color: #FF9999">{{obj.qdzLast0}}</td>
 				<td style="background-color: #FF9999">{{obj.jhfcLast0}}</td>
 				<td style="background-color: #FF9999">{{obj.sjfcLast0}}</td>
@@ -272,7 +273,7 @@
 				<td>{{obj.sjfcLast0}}</td>
 				<td>{{obj.delayLast0}}</td>
 			{{/if}}
-			{{if obj.delayFirst1 != '/' && obj.delayFirst1 != '0'}}
+			{{if obj.delayFirst1 != '/' && (obj.delayFirst1 > 1 || obj.delayFirst1 < -2)}}
 				<td style="background-color: #FF9999">{{obj.qdzFirst1}}</td>
 				<td style="background-color: #FF9999">{{obj.jhfcFirst1}}</td>
 				<td style="background-color: #FF9999">{{obj.sjfcFirst1}}</td>
@@ -283,7 +284,7 @@
 				<td>{{obj.sjfcFirst1}}</td>
 				<td>{{obj.delayFirst1}}</td>
 			{{/if}}
-			{{if obj.delayLast1 != '/' && obj.delayLast1 != '0'}}
+			{{if obj.delayLast1 != '/' && (obj.delayLast1 > 1 || obj.delayLast1 < -2)}}
 				<td style="background-color: #FF9999">{{obj.qdzLast1}}</td>
 				<td style="background-color: #FF9999">{{obj.jhfcLast1}}</td>
 				<td style="background-color: #FF9999">{{obj.sjfcLast1}}</td>
@@ -7,7 +7,8 @@
 	  .table-bordered > tbody > tr > td,
 	  .table-bordered > tfoot > tr > th,
 	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
+	    border: 1px solid;
+	    text-align: center; }
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
@@ -27,11 +28,11 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form id="history" class="form-inline" action="">
-					<div style="display: inline-block;margin-left: 10px;" id="company1">
+					<div style="display: inline-block;margin-left: 28px;" id="company1">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="company" style="width: 160px;"></select>
 					</div>
-					<div style="display: inline-block;margin-left: 10px;" id="subCompany1">
+					<div style="display: inline-block;margin-left: 24px;" id="subCompany1">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select>
 					</div>
@@ -39,11 +40,16 @@
 						<span class="item-label" style="width: 80px;">线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 160px;"></select>
 					</div>
+					<div style="margin-top: 10px"></div>
+					<div style="display: inline-block;margin-left: 0px;">
+						<span class="item-label" style="width: 80px;">开始时间: </span>
+						<input class="form-control" type="text" id="startDate" style="width: 160px;"/>
+					</div>
 					<div style="display: inline-block;margin-left: 10px;">
-						<span class="item-label" style="width: 80px;">时间: </span>
-						<input class="form-control" type="text" id="date" style="width: 160px;"/>
+						<span class="item-label" style="width: 80px;">结束时间: </span>
+						<input class="form-control" type="text" id="endDate" style="width: 160px;"/>
 					</div>
-					<div class="form-group">
+					<div class="form-group" style="margin-left: 10px;">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
 					</div>
@@ -54,7 +60,7 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr class="hidden">
-								<th>日期</th>
+								<th width="240px">日期</th>
 								<th>公司</th>
 								<th>分公司</th>
 								<th>线路</th>
@@ -73,6 +79,7 @@
 						<thead>
 							<tr class="hidden">
 								<th style="display: none;"></th>
+								<th rowspan="2">日期</th>
 								<th rowspan="2">线路</th>
 								<th colspan="4">上行首发</th>
 								<th colspan="4">上行末发</th>
@@ -116,12 +123,12 @@
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
-		$("#date").datetimepicker({
+
+		$("#startDate,#endDate").datetimepicker({
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
-		
+
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -130,7 +137,7 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		$("#date").val(year + "-" + month + "-" + day);
+		$("#startDate,#endDate").val(year + "-" + month + "-" + day);
 		var fage=false;
 		var xlList;
@@ -216,9 +223,14 @@
 		var company = $("#company").val();
 		var subCompany = $("#subCompany").val();
 		var line = $("#line").val();
-		var date = $("#date").val();
+		var startDate = $("#startDate").val();
+		var endDate = $("#endDate").val();
 		function jsDoQuery(pagination){
-			if($("#date").val() == null || $("#date").val().trim().length == 0){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
+			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
 				layer.msg("请选择时间！");
 				return;
 			}
@@ -226,14 +238,15 @@
 			company = $("#company").val();
 			subCompany = $("#subCompany").val();
 			line = $("#line").val();
-			date = $("#date").val();
+			startDate = $("#startDate").val();
+			endDate = $("#endDate").val();
 			if(line == " ")
 				line = "";
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['line'] = line;
-			params['line'] = line;
-			params['date'] = date;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
 			params['type'] = "query";
 			$("#forms .hidden").removeClass("hidden");
 			$("#map tr").addClass("hidden");
@@ -253,19 +266,15 @@
 		}
 		$("#export").on("click",function(){
-			if($("#date").val() == null || $("#date").val().trim().length == 0){
-				layer.msg("请选择时间！");
-				return;
-			}
 			var params = {};
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['line'] = line;
-			params['line'] = line;
-			params['date'] = date;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
 			params['type'] = "export";
 			$get('/pcpc/firstAndLastBus_sum', params, function(result){
-				window.open("/downloadFile/download?fileName=线路首末班准点率"+moment(date).format("YYYYMMDD"));
+				window.open("/downloadFile/download?fileName=线路首末班准点率"+moment(startDate).format("YYYYMMDD")+(startDate==endDate?"":("-"+moment(endDate).format("YYYYMMDD"))));
 			});
 		});
@@ -276,13 +285,20 @@
 <script type="text/html" id="list_firstAndLastBus">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.date}}</td>
-			<td>{{obj.company}}</td>
-			<td>{{obj.subCompany}}</td>
-			<td>{{obj.line}}</td>
-			<td>{{obj.jhbc}}</td>
-			<td>{{obj.sjbc}}</td>
-			<td><a id='delay'>{{obj.zdl}}</a></td>
+			{{if obj.date != '合计汇总'}}
+				<td>{{obj.date}}</td>
+				<td>{{obj.company}}</td>
+				<td>{{obj.subCompany}}</td>
+				<td>{{obj.line}}</td>
+				<td>{{obj.jhbc}}</td>
+				<td>{{obj.sjbc}}</td>
+				<td><a id='delay'>{{obj.zdl}}</a></td>
+			{{else}}
+				<td colspan='4'>{{obj.date}}</td>
+				<td>{{obj.jhbc}}</td>
+				<td>{{obj.sjbc}}</td>
+				<td>{{obj.zdl}}</td>
+			{{/if}}
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -292,23 +308,26 @@
 	{{/if}}
 </script>
 <script type="text/html" id="list_maps">
+	{{each list as obj i}}
 		<tr>
-			<td>{{list.line}}</td>
-			<td>{{list.qdzFirst0}}</td>
-			<td>{{list.jhfcFirst0}}</td>
-			<td>{{list.sjfcFirst0}}</td>
-			<td>{{list.delayFirst0}}</td>
-			<td>{{list.qdzLast0}}</td>
-			<td>{{list.jhfcLast0}}</td>
-			<td>{{list.sjfcLast0}}</td>
-			<td>{{list.delayLast0}}</td>
-			<td>{{list.qdzFirst1}}</td>
-			<td>{{list.jhfcFirst1}}</td>
-			<td>{{list.sjfcFirst1}}</td>
-			<td>{{list.delayFirst1}}</td>
-			<td>{{list.qdzLast1}}</td>
-			<td>{{list.jhfcLast1}}</td>
-			<td>{{list.sjfcLast1}}</td>
-			<td>{{list.delayLast1}}</td>
+			<td>{{obj.date}}</td>
+			<td>{{obj.line}}</td>
+			<td>{{obj.qdzFirst0}}</td>
+			<td>{{obj.jhfcFirst0}}</td>
+			<td>{{obj.sjfcFirst0}}</td>
+			<td>{{obj.delayFirst0}}</td>
+			<td>{{obj.qdzLast0}}</td>
+			<td>{{obj.jhfcLast0}}</td>
+			<td>{{obj.sjfcLast0}}</td>
+			<td>{{obj.delayLast0}}</td>
+			<td>{{obj.qdzFirst1}}</td>
+			<td>{{obj.jhfcFirst1}}</td>
+			<td>{{obj.sjfcFirst1}}</td>
+			<td>{{obj.delayFirst1}}</td>
+			<td>{{obj.qdzLast1}}</td>
+			<td>{{obj.jhfcLast1}}</td>
+			<td>{{obj.sjfcLast1}}</td>
+			<td>{{obj.delayLast1}}</td>
 		</tr>
+	{{/each}}
 </script>
 \ No newline at end of file