LGF 报表

娄高锋
1 parent 5acbb9c8
Showing 2 changed files with 15 additions and 10 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
@@ -1102,7 +1102,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int jhbc = 0, sjbc = 0, kbc = 0, mbc = 0;
+			int jhbc = 0, sjbc = 0, wdfz = 0;
 			long jhdf = 0l, sjdf = 0l, wddf1 = 0l, wddf2 = 0l;
 			long jhfc = 0l, sjfc = 0l, wdfc1 = 0l, wdfc2 = 0l;
 			long jhys = 0l, sjys = 0l, yssjMax = 0l, yssjMin = 0l;
@@ -1127,10 +1127,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					yssj += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
 					if(schedule.getFcsjActualTime() - schedule.getFcsjT() < 0){
 						wdfc1 += schedule.getFcsjT() - schedule.getFcsjActualTime();
-						kbc++;
+//						kbc++;
 					} else if(schedule.getFcsjActualTime() - schedule.getFcsjT() > 0){
 						wdfc2 += schedule.getFcsjActualTime() - schedule.getFcsjT();
-						mbc++;
+//						mbc++;
 					}
 					if(schedule.getDfsj() != null){
@@ -1197,8 +1197,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				tempMap.put("pjys", "0分");
 				tempMap.put("pjtz", "0分");
 			}
-			tempMap.put("kbc", kbc);
-			tempMap.put("mbc", mbc);
+//			tempMap.put("kbc", kbc);
+//			tempMap.put("mbc", mbc);
+			if(!tempMap.get("jhfc").toString().equals("/") && !tempMap.get("sjfc").toString().equals("/")){
+				String[] temp1 = tempMap.get("jhfc").toString().split(":");
+				String[] temp2 = tempMap.get("sjfc").toString().split(":");
+				tempMap.put("wdfz", (Integer.valueOf(temp2[0])*60 + Integer.valueOf(temp2[1]))
+						- (Integer.valueOf(temp1[0])*60 + Integer.valueOf(temp1[1])));
+			}else{
+				tempMap.put("wdfz", "/");
+			}
 			tempMap.put("jhys", jhys);
 			tempMap.put("sjys", sjys);
 			tempMap.put("yssjMin", yssjMin);
@@ -121,7 +121,7 @@
 									<th rowspan="2">日期</th>
 									<th colspan="4">到达时间</th>
 									<th colspan="4">发车时间</th>
-									<th colspan="2">误点率</th>
+									<th rowspan="2">误点分钟</th>
 									<th colspan="5">运送时间</th>
 									<th colspan="5">停站时间</th>
 								</tr>
@@ -134,8 +134,6 @@
 									<th>实际</th>
 									<th>平均提前</th>
 									<th>平均延误</th>
-									<th>快</th>
-									<th>慢</th>
 									<th>计划</th>
 									<th>实际</th>
 									<th>最快</th>
@@ -419,8 +417,7 @@
 				<td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc1}}</td>
 				<td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc2}}</td>
 			{{/if}}
-			<td>{{obj.kbc}}</td>
-			<td>{{obj.mbc}}</td>
+			<td>{{obj.wdfz}}</td>
 			<td>{{obj.jhys}}</td>
 			<td>{{obj.sjys}}</td>
 			<td>{{obj.yssjMin}}</td>