行车时刻统计停站时间区分上下行

娄高锋
1 parent 0e2c3762
Showing 2 changed files with 36 additions and 27 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/report/timetable/timetable.html
@@ -720,36 +720,40 @@ public class ReportServiceImpl implements ReportService{
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<Map<String, Object>> list2 = keyMap.get(key);
 			List<Integer> cjs = new ArrayList<Integer>();
-			int sxsj = 0, xxsj = 0, zcj = 0, tssj = 0;
-			int sxbc = 0, xxbc = 0;
-			int temp = 24*60+1;
+			int sxsj = 0, xxsj = 0, sxtssj = 0, xxtssj = 0;
+			int sxbc = 0, xxbc = 0, sxtsbc = 0, xxtsbc = 0;
+			int temp = 24*60+1, zcj = 0;
 			boolean ists = false;
 			for(Map<String, Object> m : list2){
 				String[] split = m.get("fcsj").toString().split(":");
 				int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 				int xlDir = Integer.valueOf(m.get("dir").toString());
 				int bcsj = Integer.valueOf(m.get("bcsj").toString());
+				if(temp >= fcsj){
+					temp = fcsj;
+					ists = false;
+				}
 				if(xlDir == 0){
 					sxsj += bcsj;
 					sxbc ++;
+					if(ists){
+						sxtssj += fcsj - temp;
+						sxtsbc++;
+					}
 				} else {
 					xxsj += bcsj;
 					xxbc ++;
-				}
-				if(temp >= fcsj){
-					temp = fcsj;
-					ists = false;
-				} else {
 					if(ists){
-						tssj += fcsj - temp;
-						ists = false;
-					} else {
-						cjs.add(fcsj - temp);
+						xxtssj += fcsj - temp;
+						xxtsbc++;
 					}
+				}
+				if(temp < fcsj){
+					cjs.add(fcsj - temp);
 					temp = fcsj;
-					if(m.get("ists").equals("1")){
-						ists = true;
-					}
+				}
+				if(m.get("ists").toString().trim().equals("1")){
+					ists = true;
 				}
 			}
 			Collections.sort(cjs);
@@ -757,12 +761,14 @@ public class ReportServiceImpl implements ReportService{
 				zcj += i;
 			}
 			tempMap.put("sjd", key);
-			tempMap.put("sxsj", sxsj / sxbc);
-			tempMap.put("xxsj", xxsj / xxbc);
-			tempMap.put("fqsj", (sxsj + xxsj) / list2.size());
+			tempMap.put("sxsj", sxbc != 0 ? sxsj / sxbc : "0");
+			tempMap.put("xxsj", xxbc != 0 ? xxsj / xxbc : "0");
+			tempMap.put("sxtssj", sxtsbc != 0 ? sxtssj / sxtsbc : "0");
+			tempMap.put("xxtssj", xxtsbc != 0 ? xxtssj / xxtsbc : "0");
+			tempMap.put("fqsj", Integer.valueOf(tempMap.get("sxsj").toString()) + Integer.valueOf(tempMap.get("xxsj").toString())
+						+ Integer.valueOf(tempMap.get("sxtssj").toString()) + Integer.valueOf(tempMap.get("xxtssj").toString()));
 			tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
 			tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
-			tempMap.put("tssj", tssj);
 			maps.put(key, tempMap);
 		}
 		newList.add(maps.get("(首)——6:30"));
@@ -165,19 +165,21 @@
 							<div class="col-md-6" >
 								<table  class="table table-bordered table-checkable" id="formsTime5">
 									<tr>
-										<td colspan="7">全日分组行驶时间(区间除外)</td>
+										<td colspan="8">全日分组行驶时间(区间除外)</td>
 									</tr>
 									<tr>
 										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">分组   时间</td>
-										<td width="23%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">分圈时间</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">停驶时间</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
-										<td width="12%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
+										<td width="19%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
+										<td width="19%" colspan="2" style="text-align:center;vertical-align:middle;">停站时间</td>
+										<td width="14%" rowspan="2" style="text-align:center;vertical-align:middle;">周转时间</td>
+										<td width="14%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
+										<td width="14%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
 									</tr>
 									<tr>
 										<td>上行</td>
 										<td style="text-align:center;">下行</td>
+										<td>上行</td>
+										<td style="text-align:center;">下行</td>
 									</tr>
 									<tbody class="tbody_time_5">
@@ -405,15 +407,16 @@
 		<td align="center">{{result.sjd}}</td>
 		<td align="center">{{result.sxsj}}</td>
 		<td align="center">{{result.xxsj}}</td>
+		<td align="center">{{result.sxtssj}}</td>
+		<td align="center">{{result.xxtssj}}</td>
 		<td align="center">{{result.fqsj}}</td>
-		<td align="center">{{result.tssj}}</td>
 		<td align="center">{{result.cjqj}}</td>
 		<td align="center">{{result.pjcj}}</td>
 	</tr>
 {{/each}}
 {{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="8"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>