Merge branch 'pudong_test' of 192.168.168.201:panzhaov5/bsth_control into pudong_test

徐烜
2 parents caf8d7f7 ef3da1b4
Showing 9 changed files with 549 additions and 56 deletions
src/main/java/com/bsth/controller/calc/CalcIntervalController.java
src/main/java/com/bsth/repository/calc/CalcIntervalRepository.java
src/main/java/com/bsth/service/calc/CalcIntervalService.java
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/report/sheet/intervalCount.html
src/main/resources/static/pages/report/sheet/intervalList.html
src/main/resources/static/pages/report/sheet/intervalSum.html
 package com.bsth.controller.calc;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +32,18 @@ public class CalcIntervalController  extends BaseController&lt;CalcInterval,Integer
 	@RequestMapping(value="/interval")
 	public List<Map<String,Object>> interval(@RequestParam Map<String, Object> map){
-		List<Map<String,Object>> list=calcIntervalService.interval(map);
+		List<Map<String,Object>> list=new ArrayList<Map<String,Object>>();
+		if(map.get("status")==null){
+			list=calcIntervalService.interval(map);
+		}else{
+			list=calcIntervalService.intervalDetail(map);
+		}
+		return list;
+	}
+	
+	@RequestMapping(value="/sumInterval")
+	public List<Map<String,Object>> sumInterval(@RequestParam Map<String, Object> map){
+		List<Map<String, Object>> list=calcIntervalService.sumInterval(map);
 		return list;
 	}
@@ -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);
@@ -13,5 +13,11 @@ public interface CalcIntervalService extends BaseService&lt;CalcInterval,Integer&gt; {
 	 List<Map<String,Object>> countList(Map<String, Object> map);
 	 List<Map<String,Object>> listInterval(Map<String, Object> map);
+	 //根据排班表查询
 	 List<Map<String,Object>> interval(Map<String, Object> map);
+	 //根据预统计表查询
+	 List<Map<String,Object>> intervalDetail(Map<String, Object> map);
+	 //大间隔统计表（大间隔发生次数统计表）
+	 List<Map<String,Object>> sumInterval(Map<String, Object> map);
+
 }
 package com.bsth.service.calc.impl;
+import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -31,10 +32,13 @@ import com.bsth.entity.sheet.Sheet;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.calc.CalcIntervalRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.LineService;
 import com.bsth.service.calc.CalcIntervalService;
 import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.util.Arith;
 import com.bsth.util.ComparableReal;
 import com.bsth.util.ReportUtils;
+import com.mysql.fabric.xmlrpc.base.Array;
 @Service
 public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Integer> implements CalcIntervalService {
@@ -51,6 +55,8 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	LineRepository lineRepository;
 	@Autowired
     JdbcTemplate jdbcTemplate;
+	@Autowired
+	LineService lineService;
 	@Override
 	public List<Map<String, Object>> countList(Map<String, Object> map) {
 		// TODO Auto-generated method stub
@@ -62,9 +68,10 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		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();
 		//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("")){
@@ -124,10 +131,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+"'";
@@ -164,22 +174,46 @@ 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;
 				 }
 			});
 		}
+		//根据线路类型确定是否营运
+		Map<String, Boolean> lineMap=lineService.lineNature();
+        List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
+        for (int i = 0; i < list.size(); i++) {
+			Map<String, Object> m=list.get(i);
+			if (nature.equals("0")) {
+				listAll.add(m);
+			}else if(nature.equals("1")){
+				if(lineMap.get(m.get("xlBm").toString())){
+					listAll.add(m);
+				}
+			}else{
+				if(!lineMap.get(m.get("xlBm").toString())){
+					listAll.add(m);
+				}
+			}
+		}
+		
 		if(map.get("type").equals("export")){
 			String lineName="";
-			if(line.equals("")){
-				if(fgs.equals("")){
-					lineName=list.get(0).get("gs").toString();
-				}else{
-					lineName=list.get(0).get("fgs").toString();
+			if(listAll.size()>0){
+				if(line.equals("")){
+					if(fgs.equals("")){
+						lineName=listAll.get(0).get("gs").toString();
+					}else{
+						lineName=listAll.get(0).get("fgs").toString();
+					}
+				}else{ 
+					lineName=listAll.get(0).get("xlName").toString();
 				}
-			}else{ 
-				lineName=list.get(0).get("xlName").toString();
 			}
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
@@ -193,21 +227,21 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 					dateTime = sDate.replaceAll("-", "")+"-"+
 							eDate.replaceAll("-", "");
 				}
-				listI.add(list.iterator());
+				listI.add(listAll.iterator());
 				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);
@@ -216,7 +250,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				e.printStackTrace();
 			}
 		}
-		return list;
+		return listAll;
 	}
 	@Override
 	public List<Map<String, Object>> listInterval(Map<String, Object> map) {
@@ -230,7 +264,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());
@@ -607,6 +642,49 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		return list;
 	}
+	@Override
+	public List<Map<String, Object>> intervalDetail(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		String line=map.get("line").toString();
+		String date=map.get("date").toString();
+		String sql="select * from bsth_c_calc_interval_detail where line_code='"+line+"' and "
+				+ " date ='"+date+"'";
+		
+		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("xlName", rs.getString("line_name"));
+				m.put("level", rs.getString("level"));
+				m.put("jhfc1", rs.getString("jhfc1"));
+				m.put("sjfc1", rs.getString("sjfc1"));
+				m.put("jhfc2", rs.getString("jhfc2"));
+				m.put("sjfc2", rs.getString("sjfc2"));
+				m.put("subTime", rs.getString("sub_time"));
+				m.put("date", rs.getString("date"));
+				m.put("station", rs.getString("station"));
+
+				 return m;
+			 }
+		});
+		if(map.get("type").toString().equals("export")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(list.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "interval.xls",
+						path + "export/"+date+"大间隔详细.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		return list;
+	}
 	private Long minFcsjs(int id){
     	String minfcsj="02:00";
@@ -620,6 +698,154 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
     	return minSj;
     }
+	
+	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();
+		
+        List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
+        
+        String sql="select gsbm,fgsbm,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){
+			if(fgs.length() > 0){
+				sql +=" and gsbm = '"+gs+"' and fgsbm = '"+fgs+"'";
+			} else {
+				sql +=" and gsbm = '"+gs+"'";
+			}
+		}
+		sql += " order by gsbm,fgsbm,level";
+    			
+		List<Map<String, Object>> countList=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("level", rs.getString("level"));
+				 m.put("djgAll", rs.getInt("djg_all"));
+				 m.put("bcs", rs.getInt("bcs"));
+				 return 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("djgNum", "0");
+        sumMap1.put("bcs", "0");
+        sumMap2.put("gs", "合计");	//公司合计
+        sumMap2.put("djgNum", "0");
+        sumMap2.put("bcs", "0");
+        for(Map<String, Object> m : countList){
+        	String gsName = m.get("gs").toString();
+        	String fgsName = m.get("fgs").toString();
+        	String level = m.get("level").toString();
+        	String key = gsName + "^" + fgsName + "/" + level;
+        	Map<String, Object> temp = new HashMap<String, Object>();
+        	if(keyList.size() == 0){
+        		sumMap1.put("gs", gsName);
+        	}
+        	if(!(keyMap.containsKey(key))){
+        		if(keyList.size() > 0 && !(keyList.get(keyList.size() - 1).split("/")[0].equals(key.split("/")[0]))){
+        			keyList.add(sumMap1.get("gs").toString() + "^合计_" + fgsName);
+        			keyMap.put(sumMap1.get("gs").toString() + "^合计_" + fgsName, sumMap1);
+        			sumMap1 = new HashMap<String, Object>();
+            		sumMap1.put("gs", gsName);
+        			sumMap1.put("fgs", "合计");
+        	        sumMap1.put("djgNum", "0");
+        	        sumMap1.put("bcs", "0");
+        		}
+        		temp.put("gs", gsName);
+        		temp.put("fgs", fgsName);
+        		temp.put("level", level);
+        		temp.put("djgNum", "0");
+        		temp.put("bcs", "0");
+        		keyList.add(key);
+        		keyMap.put(key, temp);
+        	} else {
+        		temp = keyMap.get(key);
+        	}
+        	if(m.get("djgAll") != null && m.get("djgAll").toString().trim().length() > 0){
+	        	temp.put("djgNum", Arith.add(temp.get("djgNum"), m.get("djgAll")));
+	        	sumMap1.put("djgNum", Arith.add(sumMap1.get("djgNum"), m.get("djgAll")));
+	        	sumMap2.put("djgNum", Arith.add(sumMap2.get("djgNum"), m.get("djgAll")));
+        	}
+        	if(m.get("bcs") != null && m.get("bcs").toString().trim().length() > 0){
+	        	temp.put("bcs", Arith.add(temp.get("bcs"), m.get("bcs")));
+	        	sumMap1.put("bcs", Arith.add(sumMap1.get("bcs"), m.get("bcs")));
+	        	sumMap2.put("bcs", Arith.add(sumMap2.get("bcs"), m.get("bcs")));
+        	}
+        }
+		keyList.add((sumMap1.get("gs")!=null?sumMap1.get("gs").toString():"") + "^合计_");
+		keyMap.put((sumMap1.get("gs")!=null?sumMap1.get("gs").toString():"") + "^合计_", sumMap1);
+		keyList.add("合计");
+		keyMap.put("合计", sumMap2);
+		
+		for(String key : keyList){
+			Map<String, Object> m = keyMap.get(key);
+			double djgAll = new BigDecimal(m.get("djgNum").toString()).doubleValue();
+			double bcs = new BigDecimal(m.get("bcs").toString()).doubleValue();
+			//万班次发生率 （大间隔次数/全日班次数*10000）
+			if(bcs > 0){
+				double fsl = djgAll / bcs * 10000;
+				m.put("fsl", df.format(fsl));
+			} else {
+				m.put("fsl", "0.0");
+			}
+			listAll.add(m);
+		}
+		
+		if(map.get("type").equals("export")){
+			String lineName="";
+			if(listAll.size()>0){
+				if(fgs.equals("")){
+					lineName=listAll.get(0).get("gs").toString();
+				}else{
+					lineName=listAll.get(0).get("fgs").toString();
+				}
+			}
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			
+			ReportUtils ee = new ReportUtils();
+			try {
+				String dateTime = "";
+				if(sDate.equals(eDate)){
+					dateTime = sDate.replaceAll("-", "");
+				} else {
+					dateTime = sDate.replaceAll("-", "")+"-"+
+							eDate.replaceAll("-", "");
+				}
+				listI.add(listAll.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				String xls="";
+				String xlsName="";
+				m.put("sDate", sDate);
+				m.put("eDate", eDate);
+				xls="calcIntervalCount.xls";
+				xlsName="大间隔情况表.xls";
+				
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + ""+xls,
+						path + "export/"+dateTime+"-"+lineName+"-"+xlsName);
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		return listAll;
+	}
+	
 }
 class ComparableJhfc implements Comparator<ScheduleRealInfo>{
@@ -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,21 +39,35 @@
                     	    <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: 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="margin-top: 10px">
                     </div>
 					<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>
@@ -106,7 +120,6 @@
 						</tbody>
 					</table>
-					
 				</div>
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
@@ -126,7 +139,7 @@
 								<td>低谷次数</td>
 								<td>全日班次数</td>
 								<td>万班次发生率</td>
-								<td>最大间隔</td>
+								<td>最大间隔时间</td>
 								<td>查看</td>
 							</tr>
 						</thead>
@@ -255,10 +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);
@@ -275,21 +291,22 @@
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
 			var levelType=$('#levelType').val();
+			var nature=$("#nature").val();
 			var i = layer.load(2);
-		    $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,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{
+		    $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{
 				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();
@@ -396,6 +413,7 @@
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
 			var levelType=$('#levelType').val();
+			var nature=$('#nature').val();
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdm option:selected').text();
@@ -403,7 +421,7 @@
 				lineName = $('#gsdm option:selected').text();
 			var i = layer.load(2);
-			$get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,type:"export",lineName:lineName},function(result){
+			$get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,type:"export",lineName:lineName},function(result){
 				var dateTime = "";
 				if(date == endDate){
 					dateTime = moment(date).format("YYYYMMDD");
@@ -411,13 +429,13 @@
 					dateTime = moment(date).format("YYYYMMDD")+"-"+
 							moment(endDate).format("YYYYMMDD");
 				}
-				if(levelType=="D"){
-					window.open("/downloadFile/download?fileName="
-							+dateTime+"-"+lineName+"-发车到站准点率");
-				}else{
+// 				if(levelType=="D"){
+// 					window.open("/downloadFile/download?fileName="
+// 							+dateTime+"-"+lineName+"-发车到站准点率");
+// 				}else{
 					window.open("/downloadFile/download?fileName="
-							+dateTime+"-"+lineName+"-大间隔汇总表");
-				}
+							+dateTime+"-"+lineName+"-大间情况表");
+// 				}
 				layer.close(i);
 			});
@@ -428,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);
 				});
-			}
+// 			}
 		})
@@ -63,7 +63,7 @@
 			no=id.split(",")[0];
 			dates = id.split(",")[1];
 			var i = layer.load(2);
-			$get('/calcInterval/interval',{line:no,date:dates,type:'query'},function(result){
+			$get('/calcInterval/interval',{line:no,date:dates,status:"detail",type:'query'},function(result){
 				layer.close(i);
 				var calcIntervalList_2 = template('calcIntervalList_2',{list:result});
 				$('#forms_2 tbody').html(calcIntervalList_2);
@@ -71,7 +71,7 @@
 		})
 		$("#exportList").on('click',function(){
 			var i = layer.load(2);
-			$get('/calcInterval/interval',{line:no,date:dates,type:'export'},function(result){
+			$get('/calcInterval/interval',{line:no,date:dates,status:"detail",type:'export'},function(result){
 				window.open("/downloadFile/download?fileName="+dates+"大间隔详细");
 				layer.close(i);
 			});
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>大间隔统计表</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<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">
+							<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: 28px;" id="fgsdmDiv">
+							<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="margin-top: 10px">
+                    </div>
+					<div style="display: inline-block;">
+                        <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: 14px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 180px;"/>
+                    </div>
+                    
+                    <div class="form-group">
+                    	<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="导出"/> -->
+                    </div>
+				</form>
+			</div>
+			
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms_djg_sum">
+						<thead>
+							<tr>
+								<td>公司</td>
+								<td>分公司</td>
+								<td>线路等级</td>
+								<td>发生次数</td>
+								<td>班次数</td>
+								<td>万班次发生率</td>
+							</tr>
+						</thead>
+						<tbody>
+						</tbody>
+					</table>
+					
+				</div>
+				
+			</div>
+		</div>
+	</div>
+</div>
+<script src="/pages/mforms/singledatas/jquery.table2excel.min.js"></script>
+<script>
+	$(function(){
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		var d = new Date();
+		d.setTime(d.getTime() - 1*1000*60*60*24);
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0"+month;
+		if(day < 10)
+			day = "0"+day;
+		var dateTime = year + "-" + month + "-" + day;
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#date").val(dateTime);
+		$("#endDate").val(dateTime);
+		
+		var fage=false;
+		var obj = [];
+		var xlList;
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				if(obj.length == 0){
+					 $("#gsdmDiv").css('display','none');
+				}else if(obj.length == 1){
+					 $("#gsdmDiv").css('display','none');
+					if(obj[0].children.length == 1 || obj[0].children.length == 0)
+						$('#fgsdmDiv').css('display','none');
+				}
+				$('#gsdm').html(options);
+				
+				updateCompany();
+			});
+		});
+
+		$("#gsdm").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdm').val();
+			var options = '<option value="">全部分公司</option>';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdm').html(options);
+		}
+
+
+		$("#export").attr('disabled',"true");
+		
+		//查询
+		$("#query").on('click',function(){
+			var date = $("#date").val();
+			var endDate = $("#endDate").val();
+			var fgs=$('#fgsdm').val();
+			var gs=$('#gsdm').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){
+			var intervalList_sum = template('intervalList_sum',{list:result});
+			$('#forms_djg_sum tbody').html(intervalList_sum);
+
+			layer.close(i);
+			if(result.length == 0)
+				$("#export").attr('disabled',"true");
+			else
+				$("#export").removeAttr("disabled");
+			});
+		});
+		
+		$("#export").on("click",function(){
+			var date = $("#date").val();
+			var endDate = $("#endDate").val();
+			var fgs=$('#fgsdm').val();
+			var gs=$('#gsdm').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){
+				var dateTime = "";
+				if(date == endDate){
+					dateTime = moment(date).format("YYYYMMDD");
+				} else {
+					dateTime = moment(date).format("YYYYMMDD")+"-"+
+							moment(endDate).format("YYYYMMDD");
+				}
+				window.open("/downloadFile/download?fileName="
+						+dateTime+"-"+lineName+"-大间统计表");
+				
+				layer.close(i);
+			});
+		});
+		
+		
+	});
+</script>
+<script type="text/html" id="intervalList_sum">
+	{{each list as obj i}}
+		<tr>
+		<td>{{obj.gs}}</td>
+		<td>{{obj.fgs}}</td>
+		<td>{{obj.level}}</td>
+		<td>{{obj.djgNum}}</td>
+		<td>{{obj.bcs}}</td>
+		<td>{{obj.fsl}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+
+