update

娄高锋
1 parent dd2b768b
Showing 3 changed files with 86 additions and 42 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/mould/scheduleAnaly_sum.xls
src/main/resources/static/pages/forms/statement/scheduleAnaly_sum.html
@@ -868,101 +868,122 @@ 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("upbc", "0"); m0.put("dnbc", "0");
+			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("upbc", "0"); m1.put("dnbc", "0");
+			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("upbc", "0"); m2.put("dnbc", "0");
+			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("upbc", "0"); m3.put("dnbc", "0");
+			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("upbc", "0"); m4.put("dnbc", "0");
+			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("upbc", "0"); m5.put("dnbc", "0");
+			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("upbc", "0"); m6.put("dnbc", "0");
+			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("upbc", "0"); m7.put("dnbc", "0");
+			m7.put("upys", "--"); m7.put("dnys", "--");
 			m7.put("pjys", "--");
 			tempList.add(m7);
 		}
+		String companyName = "";
+		String subCompanyName = "";
+		
 		//按时间段分组
 		for(ScheduleRealInfo schedule : list){
+			if(companyName.length()==0&&schedule.getGsName()!=null
+					&&schedule.getGsName().trim().length()!=0){
+				companyName = schedule.getGsName();
+			}
+			if(subCompanyName.length()==0&&schedule.getFgsName()!=null
+					&&schedule.getFgsName().trim().length()!=0){
+				subCompanyName = schedule.getFgsName();
+			}
+			
 			if(schedule.getFcsjActualTime()!=null && schedule.getZdsjActualTime()!=null){
 				Long fcsjA = schedule.getFcsjActualTime();
-				if(fcsjA <= 6*60+30){
+				if(!schedule.getRealExecDate().equals(schedule.getScheduleDateStr())
+						|| fcsjA > 20*60+30){
+					if(!keyMap.containsKey("20:31~末"))
+						keyMap.put("20:31~末", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("20:31~末").add(schedule);
+					
+				} else if(fcsjA <= 6*60+30){
+					
 					if(!keyMap.containsKey("首~6:30"))
 						keyMap.put("首~6:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("首~6:30").add(schedule);
-				}
-				if(fcsjA > 6*60+30 && fcsjA <= 8*60+30){
+					
+				} else if(fcsjA > 6*60+30 && fcsjA <= 8*60+30){
+					
 					if(!keyMap.containsKey("6:31~8:30"))
 						keyMap.put("6:31~8:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("6:31~8:30").add(schedule);
-				}
-				if(fcsjA > 8*60+30 && fcsjA <= 11*60){
+					
+				} else if(fcsjA > 8*60+30 && fcsjA <= 11*60){
+					
 					if(!keyMap.containsKey("8:31~11:00"))
 						keyMap.put("8:31~11:00", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("8:31~11:00").add(schedule);
-				}
-				if(fcsjA > 11*60 && fcsjA <= 13*60+30){
+					
+				} else if(fcsjA > 11*60 && fcsjA <= 13*60+30){
+					
 					if(!keyMap.containsKey("11:01~13:30"))
 						keyMap.put("11:01~13:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("11:01~13:30").add(schedule);
-				}
-				if(fcsjA > 13*60+30 && fcsjA <= 16*60){
+					
+				} else if(fcsjA > 13*60+30 && fcsjA <= 16*60){
+					
 					if(!keyMap.containsKey("13:31~16:00"))
 						keyMap.put("13:31~16:00", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("13:31~16:00").add(schedule);
-				}
-				if(fcsjA > 16*60 && fcsjA <= 18*60){
+					
+				} else if(fcsjA > 16*60 && fcsjA <= 18*60){
+					
 					if(!keyMap.containsKey("16:01~18:00"))
 						keyMap.put("16:01~18:00", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("16:01~18:00").add(schedule);
-				}
-				if(fcsjA > 18*60 && fcsjA <= 20*60+30){
+					
+				} else if(fcsjA > 18*60 && fcsjA <= 20*60+30){
+					
 					if(!keyMap.containsKey("18:01~20:30"))
 						keyMap.put("18:01~20:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("18:01~20:30").add(schedule);
 				}
-				if(fcsjA > 20*60+30){
-					if(!keyMap.containsKey("20:31~末"))
-						keyMap.put("20:31~末", new ArrayList<ScheduleRealInfo>());
-					keyMap.get("20:31~末").add(schedule);
-				}
 			}
 		}
+		boolean flag = false;
 		for(String key : keyMap.keySet()){
 			Map<String, Object> m = null;
 			for(Map<String, Object> map2 : tempList){
@@ -973,6 +994,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			int upbc = 0, dnbc = 0;
 			long upys = 0, dnys = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				flag = true;
 				if(schedule.getXlDir().equals("0")){
 					upbc++;
 					upys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
@@ -980,15 +1002,25 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					dnbc++;
 					dnys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
 				}
+				
+				if(schedule.getXlName() != null && schedule.getXlName().trim().length() != 0){
+					m.put("line", schedule.getXlName());
+				}
 			}
 			m.put("upbc", upbc);
 			m.put("dnbc", dnbc);
-			m.put("upys", nf.format((float)upys / upbc));
-			m.put("dnys", nf.format((float)dnys / dnbc));
-			m.put("pjys", nf.format((float) (upys + dnys) / (upbc + dnbc)));
+			m.put("upys", upbc > 0 ? nf.format((float)upys / upbc) : "/");
+			m.put("dnys", dnbc > 0 ? nf.format((float)dnys / dnbc) : "/");
+			m.put("pjys", (upbc + dnbc) > 0 ? nf.format((float) (upys + dnys) / (upbc + dnbc)) : "/");
+			m.put("company", companyName.trim());
+			m.put("subCompany", subCompanyName.trim());
 		}
-		modelMap.put("dataList", tempList);
+		if(flag){
+			modelMap.put("dataList", tempList);
+		} else {
+			modelMap.put("dataList", new ArrayList<Map<String, Object>>());
+		}
 		//导出
 		if(type.equals("export")){
@@ -11,14 +11,16 @@
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
-	 
 	 .table > tbody + tbody {
 	   border-top: 1px solid; }
+	#forms > tbody > tr{
+		background-color: #FFFFFF;
+	}
 </style>
 <div class="page-head">
 	<div class="page-title">
-		<h1>时刻表分析</h1>
+		<h1>时刻表分析(汇总)</h1>
 	</div>
 </div>
@@ -70,6 +72,9 @@
 						<thead>
 							<tr class="hidden">
 								<th style="display: none;"></th>
+								<th>公司</th>
+								<th>分公司</th>
+								<th>线路</th>
 								<th>时间段</th>
 								<th>上行班次</th>
 								<th>下行班次</th>
@@ -196,6 +201,8 @@
 			jsDoQuery(true);
 		});
+		var companyName = "";
+		var subCompanyName = "";
 		var line = $("#line").val();
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
@@ -232,7 +239,7 @@
 			$(".hidden").removeClass("hidden");
 			$get('/pcpc/scheduleAnaly_sum', params, function(result){
 				// 把数据填充到模版中
-				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList});
+				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList, companyName:companyName, subCompanyName:subCompanyName});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
@@ -362,6 +369,11 @@
 	{{each list as obj i}}
 		<tr>
 			<th style="display: none;"></th>
+			{{if i == 0}}
+				<td rowspan='8'>{{obj.company}}</td>
+				<td rowspan='8'>{{obj.subCompany}}</td>
+				<td rowspan='8'>{{obj.line}}</td>
+			{{/if}}
 			<td>{{obj.time}}</td>
 			<td>{{obj.upbc}}</td>
 			<td>{{obj.dnbc}}</td>
@@ -372,7 +384,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="9"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file