大间隔情况表 ———— 以新标准计算大间隔

娄高锋
1 parent 4e04a338
Showing 3 changed files with 60 additions and 43 deletions
src/main/java/com/bsth/repository/calc/CalcIntervalRepository.java
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/resources/static/pages/report/sheet/intervalCount.html
@@ -25,7 +25,7 @@ public interface CalcIntervalRepository extends BaseRepository&lt;CalcInterval, Int
 	//按照时间段统计，单条线路
-	@Query(value="select DISTINCT c from CalcInterval c where c.xlBm = ?1  and c.date >= ?2 and c.date <=?3 and c.level like %?4% order by c.xlBm")
+	@Query(value="select DISTINCT c from CalcInterval c where c.xlBm = ?1  and c.date >= ?2 and c.date <=?3 and c.level like %?4% order by c.xlBm, date")
 	List<CalcInterval> selectByDateAndLine(String line,String date,String date2,String level);
@@ -68,7 +68,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		String nature=map.get("nature").toString();
 		//D级线路显示发车准点率
-		if(level.equals("D")){
+		if(level.equals("D") && false){		//新的计算规则D级也显示大间隔
 			String sql1=" select xl_bm,gsbm,fgsbm,xl_name from bsth_c_calc_interval where date >='"+sDate+"' and date <= '"+eDate+"' and `level`='D'";
 			if(line.equals("")){
 				if(fgs.equals("")){
@@ -128,10 +128,13 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 			});
 		}else{
 			//统计信息中需要查询所有班次
-//			and djg_all >0
+			//and djg_all >0
+//			String sql="select gsbm,fgsbm,xl_bm,xl_name,SUM(bcs) as bcs,MAX(id) as id,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,"
+//					+ "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
+//					+ "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D'  ";
 			String sql="select gsbm,fgsbm,xl_bm,xl_name,SUM(bcs) as bcs,MAX(id) as id,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,"
-					+ "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
-					+ "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D'  ";
+			+ "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
+			+ "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level like '%"+level+"%' and level is not null and level <> '' ";
 			if(line.equals("")){
 				if(fgs.equals("")){
 					sql +=" and gsbm = '"+gs+"'";
@@ -168,7 +171,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 					 m.put("djgZgf", rs.getString("djgZgf"));
 					 m.put("djgWgf", rs.getString("djgWgf"));
 					 m.put("djgDg", rs.getString("djgDg"));
-					 m.put("djgTime", rs.getString("djgTime"));
+					 if("0".equals(rs.getString("djgTime")) || "0.0".equals(rs.getString("djgTime"))){
+						 m.put("djgTime", "");
+					 } else {
+						 m.put("djgTime", rs.getString("djgTime"));
+					 }
 					 return m;
 				 }
 			});
@@ -221,17 +228,17 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 				String xls="";
 				String xlsName="";
-				if(level.equals("D")){
-					m.put("date", sDate);
-					m.put("endDate", eDate);
-					xls="calcSheetList.xls";
-					xlsName="发车到站准点率.xls";
-				}else{
+//				if(level.equals("D")){
+//					m.put("date", sDate);
+//					m.put("endDate", eDate);
+//					xls="calcSheetList.xls";
+//					xlsName="发车到站准点率.xls";
+//				}else{
 					m.put("sDate", sDate);
 					m.put("eDate", eDate);
 					xls="calcIntervalCount.xls";
-					xlsName="大间隔汇总表.xls";
-				}
+					xlsName="大间隔情况表.xls";
+//				}
 				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + ""+xls,
 						path + "export/"+dateTime+"-"+lineName+"-"+xlsName);
@@ -254,7 +261,8 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
 		for (int i = 0; i < listAll.size(); i++) {
 			CalcInterval t=listAll.get(i);
-			if(!t.getLevel().equals("D") && t.getDjgAll()>0){
+//			if(!t.getLevel().equals("D") && t.getDjgAll()>0){
+			if(t.getDjgAll() != null && t.getDjgAll() > 0){
 				Map<String, Object> m=new HashMap<>();
 				m.put("gs", t.getGsname());
 				m.put("fgs", t.getFgsname());
@@ -31,7 +31,7 @@
 							<span class="item-label" style="width: 80px;">公司: </span>
 							<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 						</div> 
-						<div style="display: inline-block; margin-left: 38px;" id="fgsdmDiv">
+						<div style="display: inline-block; margin-left: 28px;" id="fgsdmDiv">
 							<span class="item-label" style="width: 80px;">分公司: </span>
 							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 						</div>
@@ -39,7 +39,7 @@
                     	    <span class="item-label" style="width: 80px;">线路: </span>
                             <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     	</div>
-                    	<div style="display: inline-block;margin-left: 42px;">
+                    	<div style="display: inline-block;margin-left: 18px;">
 						<span class="item-label" style="width: 80px;">线路性质: </span>
 						 <select
 							class="form-control" name="nature" id="nature"
@@ -54,16 +54,20 @@
 					<div style="display: inline-block;margin-left: 33px;">
                     	    <span class="item-label" style="width: 80px;">等级: </span>
                             <select class="form-control"  style="width: 180px;" id=levelType>
-                                <option value="A,B,C">A,B,C级线路</option>
+                                <option id="levelTypeAll" value="">全部</option>
+                                <option value="A" selected="selected">A级线路</option>
+                                <option value="B">B级线路</option>
+                                <option value="C">C级线路</option>
                             	<option value="D">D级线路</option>
+                            	<option value="E">E级线路</option>
                             </select>
                     </div>
 					<div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;margin-left: 24px;">开始时间: </span>
+                        <span class="item-label" style="width: 80px;margin-left: 14px;">开始时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 180px;"/>
                     </div>
                     <div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;margin-left: 24px;">结束时间: </span>
+                        <span class="item-label" style="width: 80px;margin-left: 14px;">结束时间: </span>
                         <input class="form-control" type="text" id="endDate" style="width: 180px;"/>
                     </div>
@@ -90,7 +94,7 @@
 								<td>低谷次数</td>
 								<td>全日班次数</td>
 								<td>万班次发生率</td>
-<!-- 								<td>最大间隔时间</td> -->
+								<td>最大间隔时间</td>
 								<td>查看</td>
 							</tr>
 						</thead>
@@ -116,7 +120,6 @@
 						</tbody>
 					</table>
-					
 				</div>
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
@@ -136,6 +139,7 @@
 								<td>低谷次数</td>
 								<td>全日班次数</td>
 								<td>万班次发生率</td>
+								<td>最大间隔时间</td>
 								<td>查看</td>
 							</tr>
 						</thead>
@@ -264,11 +268,13 @@
 				if($("#line").val() == " "){
 					$("#gsdm").attr("disabled", false);
 					$("#fgsdm").attr("disabled", false);
+					$("#levelType").val('A');
 				} else {
 					var temp = tempData[$("#line").val()].split(":");
 					$("#gsdm").val(temp[0]);
 					updateCompany();
 					$("#nature").val(0);
+					$("#levelType").val('');
 					$("#fgsdm").val(temp[1]);
 					$("#gsdm").attr("disabled", true);
 					$("#fgsdm").attr("disabled", true);
@@ -288,19 +294,19 @@
 			var nature=$("#nature").val();
 			var i = layer.load(2);
 		    $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,type:'query'},function(result){
-			if(levelType=="D"){
-				var intervalList_d = template('intervalList_d',{list:result});
-				$('#forms_d tbody').html(intervalList_d);
-				$('.btn-intervalList_d').on('click', showSheetList);
-				$("#forms").hide();
-				$("#forms_d").show();
-			}else{
+// 			if(levelType=="D"){
+// 				var intervalList_d = template('intervalList_d',{list:result});
+// 				$('#forms_d tbody').html(intervalList_d);
+// 				$('.btn-intervalList_d').on('click', showSheetList);
+// 				$("#forms").hide();
+// 				$("#forms_d").show();
+// 			}else{
 				var intervalList = template('intervalList',{list:result});
 				$('#forms tbody').html(intervalList);
 				$('.btn-intervalList').on('click', showIntervalList);
 				$("#forms_d").hide();
 				$("#forms").show();
-			}
+// 			}
 			$("#forms_d_1").hide();
 			$("#forms_1").hide();	
 			$("#export_1").hide();
@@ -423,13 +429,13 @@
 					dateTime = moment(date).format("YYYYMMDD")+"-"+
 							moment(endDate).format("YYYYMMDD");
 				}
-				if(levelType=="D"){
+// 				if(levelType=="D"){
+// 					window.open("/downloadFile/download?fileName="
+// 							+dateTime+"-"+lineName+"-发车到站准点率");
+// 				}else{
 					window.open("/downloadFile/download?fileName="
-							+dateTime+"-"+lineName+"-发车到站准点率");
-				}else{
-					window.open("/downloadFile/download?fileName="
-							+dateTime+"-"+lineName+"-大间隔汇总表");
-				}
+							+dateTime+"-"+lineName+"-大间情况表");
+// 				}
 				layer.close(i);
 			});
@@ -440,18 +446,19 @@
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
 			var levelType=$("#levelType").val();
-			if(levelType=='D'){
+// 			if(levelType=='D'){
+// 				var i = layer.load(2);
+// 				$get('/calcSheet/calcListSheet',{line:id,date:date,endDate:endDate,type:'export'},function(result){
+// 					window.open("/downloadFile/download?fileName=发车到站准点率"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+// 					layer.close(i);
+// 				});
+// 			}else{
 				var i = layer.load(2);
-				$get('/calcSheet/calcListSheet',{line:id,date:date,endDate:endDate,type:'export'},function(result){
-					window.open("/downloadFile/download?fileName=发车到站准点率"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
-					layer.close(i);
-				});
-			}else{
 				$get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,type:'export'},function(result){
 					window.open("/downloadFile/download?fileName=大间距汇总表"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
 					layer.close(i);
 				});
-			}
+// 			}
 		})
@@ -470,6 +477,7 @@
 		<td>{{obj.djgDg}}</td>
 		<td>{{obj.bcs}}</td>
 		<td>{{obj.fsl}}</td>
+		<td>{{obj.djgTime}}</td>
 		<td>
 			<button type="button" class="btn btn-sm blue btn-intervalList" 
 			data-id="{{obj.xlBm}}">查看</button>
@@ -523,6 +531,7 @@
 		<td>{{obj.djgDg}}</td>
 		<td>{{obj.bcs}}</td>
 		<td>{{obj.fsl}}</td>
+		<td>{{obj.djgTime}}</td>
 		<td>
 			<button type="button" class="btn btn-sm blue btn-intervalList_1" 
 			data-id="{{obj.xlBm}}" data-date="{{obj.date}}">详细</button>