大间隔统计表新增周一至周五与周六日的查询条件

娄高锋
1 parent 2d075400
Showing 3 changed files with 206 additions and 74 deletions
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/resources/static/pages/report/sheet/intervalCount.html
src/main/resources/static/pages/report/sheet/intervalSum.html
@@ -13,9 +13,11 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,8 +29,6 @@ import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
 import com.bsth.entity.calc.CalcInterval;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.sheet.CalcSheet;
-import com.bsth.entity.sheet.Sheet;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.calc.CalcIntervalRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
@@ -36,9 +36,7 @@ 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 {
@@ -61,6 +59,8 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	public List<Map<String, Object>> countList(Map<String, Object> map) {
 		// TODO Auto-generated method stub
     	final DecimalFormat df = new DecimalFormat("0.00");
+    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
 		List<Map<String, Object>> list=new ArrayList<>();
 		String level=map.get("levelType").toString();
 		String line=map.get("line").toString().trim();
@@ -69,6 +69,25 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		String sDate=map.get("date").toString();
 		String eDate=map.get("endDate").toString();
 		String nature=map.get("nature").toString();
+		String week=map.get("week").toString();
+		String weekend="";
+		
+		try {
+			if(!("0".equals(week))){
+				Date d1 = sdf.parse(sDate);
+				Date d2 = sdf.parse(eDate);
+				for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
+					if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
+						if(weekend.length() > 0){
+							weekend = weekend + ",";
+						}
+						weekend = weekend + "'" + sdf.format(d1) + "'";
+					}
+				}
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
 		//D级线路显示发车准点率
 		if(level.equals("D") && false){		//新的计算规则D级也显示大间隔
@@ -136,7 +155,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 //					+ "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, level "
+			+ "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime,substr(level,1,1) level "
 			+ "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("")){
@@ -148,8 +167,13 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 			}else{
 				sql +=" and xl_bm ='"+line+"'";
 			}
-			sql += "   group by  xl_bm,gsbm,fgsbm,xl_name,level"
-					+" order by  xl_bm,level";
+			if(weekend.length() > 0 && "1".equals(week)){
+				sql +=" and date not in ("+weekend+")";
+			} else if(weekend.length() > 0 && "2".equals(week)){
+				sql +=" and date in ("+weekend+")";
+			}
+			sql += "   group by  xl_bm,gsbm,fgsbm,xl_name,substr(level,1,1)"
+					+" order by  gsbm,fgsbm,xl_bm,level";
 			list=jdbcTemplate.query(sql, 
 					 new RowMapper<Map<String,Object>>(){
@@ -171,15 +195,15 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 					 }else{
 						 m.put("fsl", "0.0");
 					 }
-					 m.put("djgAll", rs.getString("djgAll"));
-					 m.put("djgGf", rs.getString("djgGf"));
-					 m.put("djgZgf", rs.getString("djgZgf"));
-					 m.put("djgWgf", rs.getString("djgWgf"));
-					 m.put("djgDg", rs.getString("djgDg"));
+					 m.put("djgAll", rs.getString("djgAll")!=null?rs.getString("djgAll"):"");
+					 m.put("djgGf", rs.getString("djgGf")!=null?rs.getString("djgGf"):"");
+					 m.put("djgZgf", rs.getString("djgZgf")!=null?rs.getString("djgZgf"):"");
+					 m.put("djgWgf", rs.getString("djgWgf")!=null?rs.getString("djgWgf"):"");
+					 m.put("djgDg", rs.getString("djgDg")!=null?rs.getString("djgDg"):"");
 					 if("0".equals(rs.getString("djgTime")) || "0.0".equals(rs.getString("djgTime"))){
 						 m.put("djgTime", "");
 					 } else {
-						 m.put("djgTime", rs.getString("djgTime"));
+						 m.put("djgTime", rs.getString("djgTime")!=null?rs.getString("djgTime"):"");
 					 }
 					 if(rs.getString("level").toString().trim().length() > 1){
 						 m.put("level", rs.getString("level").trim().substring(0, 1));
@@ -263,15 +287,44 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	public List<Map<String, Object>> listInterval(Map<String, Object> map) {
 		// TODO Auto-generated method stub
     	final DecimalFormat df = new DecimalFormat("0.00");
+    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String line=map.get("line").toString();
 		String date=map.get("date").toString();
 		String endDate=map.get("endDate").toString();
 		String levelType=map.get("levelType").toString();
+		String week=map.get("week").toString();
+		Set<String> weekend = new HashSet<String>();
+		
+		try {
+			if(!("0".equals(week))){
+				Date d1 = sdf.parse(date);
+				Date d2 = sdf.parse(endDate);
+				for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
+					if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
+						weekend.add(sdf.format(d1));
+					}
+				}
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		
 		List<CalcInterval> listAll=calcIntervalRepository.selectByDateAndLine(line, date, endDate, levelType);
 		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
 		for (int i = 0; i < listAll.size(); i++) {
 			CalcInterval t=listAll.get(i);
+			
+			if("1".equals(week)){
+				if(weekend.contains(t.getDate())){
+					continue;
+				}
+			} else if("2".equals(week)){
+				if(!(weekend.contains(t.getDate()))){
+					continue;
+				}
+			}
+			
 //			if(!t.getLevel().equals("D") && t.getDjgAll()>0){
 			if(t.getDjgAll() != null && t.getDjgAll() > 0){
 				Map<String, Object> m=new HashMap<>();
@@ -300,7 +353,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				tempList.add(m);
 			}
 		}
-		if(map.get("type").equals("export")){	
+		if(map.get("type").equals("export")){
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("date", date);
@@ -710,10 +763,29 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	@Override
 	public List<Map<String, Object>> exportDetail(Map<String, Object> map) {
 		// TODO Auto-generated method stub
+    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
 		String line=map.get("line").toString().trim();
 		String date=map.get("date").toString();
 		String endDate=map.get("endDate").toString();
 		String level=map.get("levelType").toString();
+		String week=map.get("week").toString();
+		Set<String> weekend = new HashSet<String>();
+		
+		try {
+			if(!("0".equals(week))){
+				Date d1 = sdf.parse(date);
+				Date d2 = sdf.parse(endDate);
+				for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
+					if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
+						weekend.add(sdf.format(d1));
+					}
+				}
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		
 		String nature="0", gs = "", fgs = "";
 		if(map.containsKey("nature")){
 			nature = map.get("nature").toString().trim();
@@ -735,7 +807,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				+ " d.date >= '"+date+"' and d.date <= '"+endDate+"' "
 				+ " and d.level like '%"+level+"%' "
 				+ " and d.level is not null and d.level <> '' "
-				+ " order by d.line_code, d.date asc, d.level asc ";
+				+ " order by i.gsbm, i.fgsbm, d.line_code, d.date asc, d.level asc ";
 		List<Map<String, Object>> resList=jdbcTemplate.query(sql, 
 				 new RowMapper<Map<String,Object>>(){
@@ -763,6 +835,17 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		Map<String, Boolean> lineMap=lineService.lineNature();
         for (int i = 0; i < resList.size(); i++) {
 			Map<String, Object> m=resList.get(i);
+			
+			if("1".equals(week)){
+				if(weekend.contains(m.get("date"))){
+					continue;
+				}
+			} else if("2".equals(week)){
+				if(!(weekend.contains(m.get("date")))){
+					continue;
+				}
+			}
+			
 			if(null != line && line.length() > 0){
 				if(line.equals(m.get("xlBm").toString())){
 					list.add(m);
@@ -811,12 +894,33 @@ 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");
+		final DecimalFormat df = new DecimalFormat("0.00");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
 		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 week=map.get("week").toString();
+		String weekend="";
+		
+		try {
+			if(!("0".equals(week))){
+				Date d1 = sdf.parse(sDate);
+				Date d2 = sdf.parse(eDate);
+				for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
+					if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
+						if(weekend.length() > 0){
+							weekend = weekend + ",";
+						}
+						weekend = weekend + "'" + sdf.format(d1) + "'";
+					}
+				}
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
         List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
@@ -830,6 +934,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				sql +=" and gsbm = '"+gs+"'";
 			}
 		}
+		if(weekend.length() > 0 && "1".equals(week)){
+			sql +=" and date not in ("+weekend+")";
+		} else if(weekend.length() > 0 && "2".equals(week)){
+			sql +=" and date in ("+weekend+")";
+		}
 		sql += " order by gsbm,fgsbm,level";
 		List<Map<String, Object>> countList = new ArrayList<Map<String, Object>>();
@@ -27,54 +27,60 @@
 		<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: 33px;">
-                    	    <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;">
+					<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: 160px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 20px;" id="fgsdmDiv">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 160px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 33px;">
+                   	    <span class="item-label" style="width: 80px;">线路: </span>
+						<select class="form-control" name="line" id="line" style="width: 160px;"></select>
+                   	</div>
+                   	<div style="display: inline-block;margin-left: 6px;">
 						<span class="item-label" style="width: 80px;">线路性质: </span>
-						 <select
-							class="form-control" name="nature" id="nature"
-							style="width: 180px;">
+						<select class="form-control" name="nature" id="nature" style="width: 160px;">
 							<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: 20px;">
+						<span class="item-label" style="width: 80px;">日期: </span>
+						<select class="form-control" name="week" id="week" style="width: 160px;">
+							<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;margin-left: 33px;">
-                    	    <span class="item-label" style="width: 80px;">等级: </span>
-                            <select class="form-control"  style="width: 180px;" id=levelType>
-                                <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>
+                   	    <span class="item-label" style="width: 80px;">等级: </span>
+						<select class="form-control"  style="width: 160px;" id=levelType>
+							<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: 14px;">开始时间: </span>
-                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                        <span class="item-label" style="width: 80px;margin-left: 6px;">开始时间: </span>
+                        <input class="form-control" type="text" id="date" style="width: 160px;"/>
                     </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;"/>
+                        <span class="item-label" style="width: 80px;margin-left: 6px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 160px;"/>
                     </div>
                     <div class="form-group">
                     	<input type="hidden" id="id"/>
                     	<input type="hidden" id="dataLevel"/>
-                        <input class="btn btn-default" type="button" id="query" value="查询"/>
+                        <input class="btn btn-default" type="button" id="query" value="查询" style="margin-left: 2px;"/>
                         <input class="btn btn-default" type="button" id="export" value="导出" title="导出查询的大间隔情况"/>
                         <input class="btn btn-default" type="button" id="export2" value="导出全部详情" title="导出查询的全部线路的大间隔详细"/>
                     </div>
@@ -297,8 +303,9 @@
 			var gs=$('#gsdm').val();
 			var levelType=$('#levelType').val();
 			var nature=$("#nature").val();
+			var week=$("#week").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){
+		    $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,week:week,type:'query'},function(result){
 // 			if(levelType=="D"){
 // 				var intervalList_d = template('intervalList_d',{list:result});
 // 				$('#forms_d tbody').html(intervalList_d);
@@ -334,9 +341,10 @@
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
 			var levelType=$(this).data('level');
+			var week=$("#week").val();
 			$("#id").val(id);
 			$("#dataLevel").val(levelType);
-			$get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,type:'query'},function(result){
+			$get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,week:week,type:'query'},function(result){
 				var intervalList = template('intervalList_1',{list:result});
 				$('#forms_1 tbody').html(intervalList);
 				$('.btn-intervalList_1').on('click', openIntervalList);
@@ -427,6 +435,7 @@
 			var gs=$('#gsdm').val();
 			var levelType=$('#levelType').val();
 			var nature=$('#nature').val();
+			var week=$("#week").val();
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdm option:selected').text();
@@ -434,7 +443,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,nature:nature,type:"export",lineName:lineName},function(result){
+			$get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,week:week,type:"export",lineName:lineName},function(result){
 				var dateTime = "";
 				if(date == endDate){
 					dateTime = moment(date).format("YYYYMMDD");
@@ -462,9 +471,10 @@
 			var nature=$('#nature').val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
+			var week=$("#week").val();
 			var i = layer.load(2);
-			$get('/calcInterval/exportDetail',{gs:gs,fgs:fgs,line:id,date:date,endDate:endDate,levelType:levelType,nature:nature,type:'export'},function(result){
+			$get('/calcInterval/exportDetail',{gs:gs,fgs:fgs,line:id,date:date,endDate:endDate,levelType:levelType,nature:nature,week:week,type:'export'},function(result){
 				window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD")+"大间隔详细");
 				layer.close(i);
 			});
@@ -475,6 +485,7 @@
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
 			var levelType=$("#dataLevel").val();
+			var week=$("#week").val();
 // 			if(levelType=='D'){
 // 				var i = layer.load(2);
 // 				$get('/calcSheet/calcListSheet',{line:id,date:date,endDate:endDate,type:'export'},function(result){
@@ -483,7 +494,7 @@
 // 				});
 // 			}else{
 				var i = layer.load(2);
-				$get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,type:'export'},function(result){
+				$get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,week:week,type:'export'},function(result){
 					window.open("/downloadFile/download?fileName=大间距汇总表"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
 					layer.close(i);
 				});
@@ -496,8 +507,9 @@
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
 			var levelType=$("#dataLevel").val();
+			var week=$("#week").val();
 			var i = layer.load(2);
-			$get('/calcInterval/exportDetail',{line:id,date:date,endDate:endDate,levelType:levelType,type:'export'},function(result){
+			$get('/calcInterval/exportDetail',{line:id,date:date,endDate:endDate,levelType:levelType,week:week,type:'export'},function(result){
 				window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD")+"大间隔详细");
 				layer.close(i);
 			});
@@ -27,24 +27,32 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-				<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> 
-						<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" selected="selected">全部线路</option>
-								<option value="1">营运线路</option>
-								<option value="2">非营运线路</option>
-							</select>
-						</div>
+					<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> 
+					<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="display: inline-block;margin-left: 20px;">
+						<span class="item-label" style="width: 80px;">日期: </span>
+						<select class="form-control" name="week" id="week" style="width: 160px;">
+							<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;">
@@ -167,8 +175,10 @@
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
 			var nature=$("#nature").val();
+			var week=$("#week").val();
+
 			var i = layer.load(2);
-		    $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:'query'},function(result){
+		    $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,week:week,type:'query'},function(result){
 			var intervalList_sum = template('intervalList_sum',{list:result});
 			$('#forms_djg_sum tbody').html(intervalList_sum);
@@ -186,12 +196,13 @@
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
 			var nature=$('#nature').val();
+			var week=$("#week").val();
 			var lineName = $('#fgsdm option:selected').text();
 			if(lineName=="全部分公司")
 				lineName = $('#gsdm option:selected').text();
 			var i = layer.load(2);
-			$get('/calcInterval/sumInterval',{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,week:week,type:"export",lineName:lineName},function(result){
 				var dateTime = "";
 				if(date == endDate){
 					dateTime = moment(date).format("YYYYMMDD");