大间隔发生次数汇总添加了营运线路搜索项和导出功能

娄高锋
1 parent 05c2525d
Showing 6 changed files with 53 additions and 30 deletions
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/resources/static/pages/forms/mould/calcIntervalCount.xls
src/main/resources/static/pages/forms/mould/calcIntervalList1.xls
src/main/resources/static/pages/forms/mould/calcIntervalSum.xls
src/main/resources/static/pages/report/sheet/intervalCount.html
src/main/resources/static/pages/report/sheet/intervalSum.html
@@ -702,16 +702,15 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	public List<Map<String, Object>> sumInterval(Map<String, Object> map) {
 		// TODO Auto-generated method stub
     	final DecimalFormat df = new DecimalFormat("0.00");
-		List<Map<String, Object>> list=new ArrayList<>();
 		String gs=map.get("gs").toString().trim();
 		String fgs=map.get("fgs").toString().trim();
 		String sDate=map.get("date").toString();
 		String eDate=map.get("endDate").toString();
-//		String nature=map.get("nature").toString();
+		String nature=map.get("nature").toString();
         List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
-        String sql="select gsbm,fgsbm,level,djg_all,bcs"
+        String sql="select gsbm,fgsbm,xl_bm,xl_name,level,djg_all,bcs"
     			+ " from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"'"
     			+ " and level is not null and level <> '' ";
 		if(gs.length() > 0){
@@ -722,29 +721,52 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 			}
 		}
 		sql += " order by gsbm,fgsbm,level";
-    			
-		List<Map<String, Object>> countList=jdbcTemplate.query(sql, 
+    	
+		List<Map<String, Object>> countList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> list=jdbcTemplate.query(sql, 
 				 new RowMapper<Map<String,Object>>(){
 			 @Override 
 			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException { 
 				 Map<String, Object> m=new HashMap<String,Object>();
 				 m.put("gs", BasicData.businessCodeNameMap.get(rs.getString("gsbm")));
 				 m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsbm")+"_"+rs.getString("gsbm")));
+				 m.put("xlBm", rs.getString("xl_bm"));
+				 m.put("xlName", rs.getString("xl_name"));
 				 m.put("level", rs.getString("level"));
 				 m.put("djgAll", rs.getInt("djg_all"));
 				 m.put("bcs", rs.getInt("bcs"));
 				 return m;
 			 }
 		});
+		
+		//根据线路类型确定是否营运
+		Map<String, Boolean> lineMap=lineService.lineNature();
+	    for (int i = 0; i < list.size(); i++) {
+			Map<String, Object> m=list.get(i);
+			if (nature.equals("0")) {
+				countList.add(m);
+			}else if(nature.equals("1")){
+				if(lineMap.get(m.get("xlBm").toString())){
+					countList.add(m);
+				}
+			}else{
+				if(!lineMap.get(m.get("xlBm").toString())){
+					countList.add(m);
+				}
+			}
+		}
         List<String> keyList = new ArrayList<String>();
         Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
         Map<String, Object> sumMap1 = new HashMap<String, Object>();
         Map<String, Object> sumMap2 = new HashMap<String, Object>();
         sumMap1.put("fgs", "合计");	//分公司合计
+        sumMap1.put("level", "");
         sumMap1.put("djgNum", "0");
         sumMap1.put("bcs", "0");
         sumMap2.put("gs", "合计");	//公司合计
+        sumMap2.put("fgs", "");
+        sumMap2.put("level", "");
         sumMap2.put("djgNum", "0");
         sumMap2.put("bcs", "0");
         for(Map<String, Object> m : countList){
@@ -763,6 +785,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
         			sumMap1 = new HashMap<String, Object>();
             		sumMap1.put("gs", gsName);
         			sumMap1.put("fgs", "合计");
+        	        sumMap1.put("level", "");
         	        sumMap1.put("djgNum", "0");
         	        sumMap1.put("bcs", "0");
         		}
@@ -833,10 +856,10 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				String xlsName="";
 				m.put("sDate", sDate);
 				m.put("eDate", eDate);
-				xls="calcIntervalCount.xls";
-				xlsName="大间隔情况表.xls";
+				xls="calcIntervalSum.xls";
+				xlsName="大间隔发生次数汇总.xls";
-				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + ""+xls,
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + xls,
 						path + "export/"+dateTime+"-"+lineName+"-"+xlsName);
 			} catch (Exception e) {
 				// TODO: handle exception
@@ -434,7 +434,7 @@
 // 							+dateTime+"-"+lineName+"-发车到站准点率");
 // 				}else{
 					window.open("/downloadFile/download?fileName="
-							+dateTime+"-"+lineName+"-大间情况表");
+							+dateTime+"-"+lineName+"-大间隔情况表");
 // 				}
 				layer.close(i);
@@ -18,7 +18,7 @@
 <div class="page-head">
 	<div class="page-title">
-		<h1>大间隔统计表</h1>
+		<h1>大间隔发生次数汇总</h1>
 	</div>
 </div>
@@ -27,7 +27,7 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-				<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
+				<div style="display: inline-block; margin-left: 42px;" id="gsdmDiv">
 							<span class="item-label" style="width: 80px;">公司: </span>
 							<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 						</div> 
@@ -35,16 +35,16 @@
 							<span class="item-label" style="width: 80px;">分公司: </span>
 							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 						</div>
-<!--                     	<div style="display: inline-block;margin-left: 18px;"> -->
-<!-- 							<span class="item-label" style="width: 80px;">线路性质: </span> -->
-<!-- 							 <select -->
-<!-- 								class="form-control" name="nature" id="nature" -->
-<!-- 								style="width: 180px;"> -->
-<!-- 								<option value="0">全部线路</option> -->
-<!-- 								<option value="1" selected="selected">营运线路</option> -->
-<!-- 								<option value="2">非营运线路</option> -->
-<!-- 							</select> -->
-<!-- 						</div> -->
+                    	<div style="display: inline-block;margin-left: 18px;">
+							<span class="item-label" style="width: 80px;">线路性质: </span>
+							 <select
+								class="form-control" name="nature" id="nature"
+								style="width: 180px;">
+								<option value="0" selected="selected">全部线路</option>
+								<option value="1">营运线路</option>
+								<option value="2">非营运线路</option>
+							</select>
+						</div>
 					<div style="margin-top: 10px">
                     </div>
 					<div style="display: inline-block;">
@@ -56,10 +56,10 @@
                         <input class="form-control" type="text" id="endDate" style="width: 180px;"/>
                     </div>
-                    <div class="form-group">
+                    <div class="form-group" style="margin-left: 8px;">
                     	<input type="hidden" id="id"/>
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>
 			</div>
@@ -72,8 +72,8 @@
 								<td>公司</td>
 								<td>分公司</td>
 								<td>线路等级</td>
-								<td>发生次数</td>
-								<td>班次数</td>
+								<td>大间隔发生次数</td>
+								<td>全日班次数</td>
 								<td>万班次发生率</td>
 							</tr>
 						</thead>
@@ -166,9 +166,9 @@
 			var endDate = $("#endDate").val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
-// 			var nature=$("#nature").val();
+			var nature=$("#nature").val();
 			var i = layer.load(2);
-		    $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,type:'query'},function(result){
+		    $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:'query'},function(result){
 			var intervalList_sum = template('intervalList_sum',{list:result});
 			$('#forms_djg_sum tbody').html(intervalList_sum);
@@ -185,13 +185,13 @@
 			var endDate = $("#endDate").val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
-// 			var nature=$('#nature').val();
+			var nature=$('#nature').val();
 			var lineName = $('#fgsdm option:selected').text();
 			if(lineName=="全部分公司")
 				lineName = $('#gsdm option:selected').text();
 			var i = layer.load(2);
-			$get('/calcInterval/countList',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:"export",lineName:lineName},function(result){
+			$get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:"export",lineName:lineName},function(result){
 				var dateTime = "";
 				if(date == endDate){
 					dateTime = moment(date).format("YYYYMMDD");
@@ -200,7 +200,7 @@
 							moment(endDate).format("YYYYMMDD");
 				}
 				window.open("/downloadFile/download?fileName="
-						+dateTime+"-"+lineName+"-大间统计表");
+						+dateTime+"-"+lineName+"-大间隔发生次数汇总");
 				layer.close(i);
 			});