时刻表分析加一列表头“路牌”

娄高锋
1 parent f19a4a39
Showing 3 changed files with 25 additions and 9 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/mould/scheduleAnaly.xls
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
@@ -611,7 +611,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		try {
 			String sql = "select schedule_date_str,xl_name,bc_type,gs_name,fgs_name,fgs_bm,bcs,"
-					+"fcno,fcsj,fcsj_actual,zdsj,zdsj_actual,bcsj,qdz_name,sp_id,cc_service"
+					+"fcno,fcsj,fcsj_actual,zdsj,zdsj_actual,bcsj,qdz_name,sp_id,cc_service,lp_name"
 					+" from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate
 					+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
@@ -650,6 +650,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
 					schedule.setCcService(rs.getBoolean("cc_service"));
+					schedule.setLpName(rs.getString("lp_name"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -718,7 +719,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				continue;
 			}
-			String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj()+"/"+schedule.getFgsBm();
+			String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj()+"/"+schedule.getFgsBm()+"/"+schedule.getLpName();
 				if(model.length() != 0){
 					if(ttSet.contains(schedule.getSpId())){
 						if(!keyMap.containsKey(key))
@@ -810,6 +811,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("line", split[0]);
 			tempMap.put("qdz", split[1]);
 			tempMap.put("jhfc", split[2]);
+			tempMap.put("lp", split[4]);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
 			tempList.add(tempMap);
@@ -819,27 +821,32 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		Map<String, List<Map<String, Object>>> listMap = new HashMap<String, List<Map<String, Object>>>();
 		Map<String, List<Map<String, Object>>> listMap2 = new HashMap<String, List<Map<String, Object>>>();
 		for(Map<String, Object> m : tempList){
-			String key = m.get("line").toString() + m.get("qdz") + m.get("subCompany");
+			String key = m.get("line").toString() + "/" + m.get("qdz") + "/" + m.get("subCompany");
 			if(!listMap.containsKey(key))
 				listMap.put(key, new ArrayList<Map<String, Object>>());
 			listMap.get(key).add(m);
 		}
 		for(String key : listMap.keySet()){
-			Map<Integer, Map<String, Object>> tempMap = new HashMap<Integer, Map<String,Object>>();
+			Map<Integer, List<Map<String, Object>>> tempMap = new HashMap<Integer, List<Map<String,Object>>>();
 			List<Integer> keyList = new ArrayList<Integer>();
 			for(Map<String, Object> m : listMap.get(key)){
 				String[] split = m.get("jhfc").toString().split(":");
 				int jhfc = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-				tempMap.put(jhfc, m);
-				keyList.add(jhfc);
+				if(!tempMap.containsKey(jhfc)){
+					tempMap.put(jhfc, new ArrayList<Map<String, Object>>());
+					keyList.add(jhfc);
+				}
+				tempMap.get(jhfc).add(m);
+				
 			}
 			Collections.sort(keyList);
 			for(Integer Int : keyList){
-				Map<String, Object> m = tempMap.get(Int);
+				List<Map<String, Object>> l = tempMap.get(Int);
+				Map<String, Object> m = l.get(0);
 				String str = m.get("line").toString();
 				if(!listMap2.containsKey(str))
 					listMap2.put(str, new ArrayList<Map<String, Object>>());
-				listMap2.get(str).add(m);
+				listMap2.get(str).addAll(l);
 			}
 		}
 		for(String str : listMap2.keySet()){
@@ -860,6 +867,13 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		//导出
 		if(type.equals("export")){
+			for(Map<String, Object> m : resList){
+				if(m.get("lp") != null){
+					if(m.get("lp").toString().contains("+") || m.get("lp").toString().contains("-")){
+						m.put("lp", "\'" + m.get("lp").toString().trim());
+					}
+				}
+			}
 			String lineName = "";
 			if(map.containsKey("lineName"))
 				lineName = map.get("lineName").toString();
@@ -79,6 +79,7 @@
 								<th width="8%">分公司</th>
 								<th width="8%">线路</th>
 								<th width="8%">起点站名</th>
+								<th width="6%">路牌</th>
 								<th width="6%">计发时间</th>
 								<th width="6%">计划运送时间(分)</th>
 								<th width="6%">计划完成次数</th>
@@ -424,6 +425,7 @@
 			<td>{{obj.subCompany}}</td>
 			<td>{{obj.line}}</td>
 			<td>{{obj.qdz}}</td>
+			<td>{{obj.lp}}</td>
 			<td>{{obj.jhfc}}</td>
 			<td>{{obj.bcsj}}</td>
 			<td>{{obj.jhbc}}</td>
@@ -438,7 +440,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="15"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file