update

娄高锋
1 parent e77f2925
Showing 2 changed files with 129 additions and 22 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
@@ -869,50 +869,50 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			Map<String, Object> m0 = new HashMap<String, Object>();
 			m0.put("time", "首~6:30");
 			m0.put("upbc", "0"); m0.put("dnbc", "0");
-			m0.put("upys", "--"); m0.put("dnys", "--");
-			m0.put("pjys", "--");
+			m0.put("upys", "/"); m0.put("dnys", "/");
+			m0.put("pjys", "/");
 			tempList.add(m0);
 			Map<String, Object> m1 = new HashMap<String, Object>();
 			m1.put("time", "6:31~8:30");
 			m1.put("upbc", "0"); m1.put("dnbc", "0");
-			m1.put("upys", "--"); m1.put("dnys", "--");
-			m1.put("pjys", "--");
+			m1.put("upys", "/"); m1.put("dnys", "/");
+			m1.put("pjys", "/");
 			tempList.add(m1);
 			Map<String, Object> m2 = new HashMap<String, Object>();
 			m2.put("time", "8:31~11:00");
 			m2.put("upbc", "0"); m2.put("dnbc", "0");
-			m2.put("upys", "--"); m2.put("dnys", "--");
-			m2.put("pjys", "--");
+			m2.put("upys", "/"); m2.put("dnys", "/");
+			m2.put("pjys", "/");
 			tempList.add(m2);
 			Map<String, Object> m3 = new HashMap<String, Object>();
 			m3.put("time", "11:01~13:30");
 			m3.put("upbc", "0"); m3.put("dnbc", "0");
-			m3.put("upys", "--"); m3.put("dnys", "--");
-			m3.put("pjys", "--");
+			m3.put("upys", "/"); m3.put("dnys", "/");
+			m3.put("pjys", "/");
 			tempList.add(m3);
 			Map<String, Object> m4 = new HashMap<String, Object>();
 			m4.put("time", "13:31~16:00");
 			m4.put("upbc", "0"); m4.put("dnbc", "0");
-			m4.put("upys", "--"); m4.put("dnys", "--");
-			m4.put("pjys", "--");
+			m4.put("upys", "/"); m4.put("dnys", "/");
+			m4.put("pjys", "/");
 			tempList.add(m4);
 			Map<String, Object> m5 = new HashMap<String, Object>();
 			m5.put("time", "16:01~18:00");
 			m5.put("upbc", "0"); m5.put("dnbc", "0");
-			m5.put("upys", "--"); m5.put("dnys", "--");
-			m5.put("pjys", "--");
+			m5.put("upys", "/"); m5.put("dnys", "/");
+			m5.put("pjys", "/");
 			tempList.add(m5);
 			Map<String, Object> m6 = new HashMap<String, Object>();
 			m6.put("time", "18:01~20:30");
 			m6.put("upbc", "0"); m6.put("dnbc", "0");
-			m6.put("upys", "--"); m6.put("dnys", "--");
-			m6.put("pjys", "--");
+			m6.put("upys", "/"); m6.put("dnys", "/");
+			m6.put("pjys", "/");
 			tempList.add(m6);
 			Map<String, Object> m7 = new HashMap<String, Object>();
 			m7.put("time", "20:31~末");
 			m7.put("upbc", "0"); m7.put("dnbc", "0");
-			m7.put("upys", "--"); m7.put("dnys", "--");
-			m7.put("pjys", "--");
+			m7.put("upys", "/"); m7.put("dnys", "/");
+			m7.put("pjys", "/");
 			tempList.add(m7);
 		}
@@ -1367,6 +1367,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		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>();
@@ -1410,6 +1411,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					if(delay >= -3 && delay <= 1){
 						sjbc++;
 					}
+					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){
@@ -1420,7 +1425,20 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					if(delay >= -3 && delay <= 1){
 						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){
@@ -1435,7 +1453,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					if(delay >= -3 && delay <= 1){
 						sjbc++;
 					}
+					m.put("qdzFirst1", shouban1.getQdzName());
+					m.put("jhfcFirst1", shouban1.getFcsj());
+					m.put("sjfcFirst1", shouban1.getFcsjActual());
+					m.put("delayFirst1", delay>0?"+"+delay:delay);
 				}
+				
 				if(moban1.getFcsjActual() != null){
 					jhbc++;
 					String[] split = moban1.getFcsjActual().split(":");
@@ -1444,9 +1467,24 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					if(delay >= -3 && delay <= 1){
 						sjbc++;
 					}
+					m.put("qdzLast1", moban1.getQdzName());
+					m.put("jhfcLast1", moban1.getFcsj());
+					m.put("sjfcLast1", moban1.getFcsjActual());
+					m.put("delayLast1", delay>0?"+"+delay:delay);
 				}
+			} 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", "/");
 			}
-			
+
+			m.put("line", key);
+			tempMap.put("map", m);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
 			tempMap.put("zdl", nf.format((float) sjbc / jhbc *100) + "%");
@@ -67,9 +67,42 @@
 						</tbody>
 					</table>
-					<div style="text-align: right;">
-						<ul id="pagination" class="pagination"></ul>
-					</div>
+				</div>
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="map">
+						<thead>
+							<tr class="hidden">
+								<th style="display: none;"></th>
+								<th rowspan="2">线路</th>
+								<th colspan="4">上行首发</th>
+								<th colspan="4">上行末发</th>
+								<th colspan="4">下行首发</th>
+								<th colspan="4">下行末发</th>
+							</tr>
+							<tr class="hidden">
+								<th style="display: none;"></th>
+								<th>站点</th>
+								<th>计发</th>
+								<th>实发</th>
+								<th>快慢</th>
+								<th>站点</th>
+								<th>计发</th>
+								<th>实发</th>
+								<th>快慢</th>
+								<th>站点</th>
+								<th>计发</th>
+								<th>实发</th>
+								<th>快慢</th>
+								<th>站点</th>
+								<th>计发</th>
+								<th>实发</th>
+								<th>快慢</th>
+							</tr>
+						</thead>
+						<tbody>
+							
+						</tbody>
+					</table>
 				</div>
 			</div>
 		</div>
@@ -165,6 +198,18 @@
 			fage=true;
 		}
+		var list;
+		$("#forms tbody").on("click","a",function(){
+			var index = $(this).parent().parent().index();
+			$.each(list, function(i, g){
+				if(index == i){
+					var tbodyHtml = template('list_maps',{list:g.map});
+					$('#map tbody').html(tbodyHtml);
+					$("#map .hidden").removeClass("hidden");
+					$("html,body").animate({scrollTop:$("#map").offset().top},1000);
+				}
+			});
+		});
 		$("#query").on("click",jsDoQuery);
@@ -190,12 +235,15 @@
 			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "query";
-			$(".hidden").removeClass("hidden");
+			$("#forms .hidden").removeClass("hidden");
+			$("#map tr").addClass("hidden");
 			$get('/pcpc/firstAndLastBus_sum', params, function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_firstAndLastBus',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
+				
+				list = result;
 				if(result.length == 0)
 					$("#export").attr('disabled',"true");
@@ -234,7 +282,7 @@
 			<td>{{obj.line}}</td>
 			<td>{{obj.jhbc}}</td>
 			<td>{{obj.sjbc}}</td>
-			<td>{{obj.zdl}}</td>
+			<td><a id='delay'>{{obj.zdl}}</a></td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -242,4 +290,25 @@
 			<td colspan="20"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
+</script>
+<script type="text/html" id="list_maps">
+		<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>
+		</tr>
 </script>
 \ No newline at end of file