时刻表分析(汇总) 添加班次类型条件

娄高锋
1 parent c38714aa
Showing 2 changed files with 19 additions and 1 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleAnaly_sum.html
@@ -803,6 +803,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String line = map.get("line").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
+		String bcType = map.get("bcType").toString();
 		String nbbm = map.get("nbbm").toString();
 		String type = map.get("type").toString();
@@ -829,6 +830,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				sql += " and gs_bm like '%"+company+"%' and fgs_bm like '%"+subCompany+"%'";
 //			}
 			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			if(bcType.trim().equals("1")){
+				sql += " and bc_type != 'region'";
+			} else if(bcType.trim().equals("2")){
+				sql += " and bc_type = 'region'";
+			}
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -41,6 +41,14 @@
 						<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: 10px;">
+						<span class="item-label" style="width: 80px;">班次类型: </span>
+						<select class="form-control" name="bcType" id="bcType" style="width: 160px;">
+							<option value="0">全部</option>
+							<option value="1">全程</option>
+							<option value="2">区间</option>
+						</select>
+					</div>
 					<div style="margin-top: 10px"></div>
 					<div style="display: inline-block;margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">开始时间: </span>
@@ -60,7 +68,7 @@
 <!-- 							<option value="">请选择...</option> -->
 <!-- 						</select> -->
 <!-- 					</div> -->
-					<div class="form-group">
+					<div class="form-group" style="margin-left: 10px">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
 					</div>
@@ -207,6 +215,7 @@
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
 		var model = $("#model").val();
+		var bcType = "0";
 		var nbbm = "";
 		var company = $("#company").val();
 		var subCompany = $("#subCompany").val();
@@ -224,6 +233,7 @@
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
 // 			model = $("#model").val();
+			bcType = $("#bcType").val();
 			nbbm = $("#nbbm").val()!=null?$("#nbbm").val():"";
 			company = $("#company").val();
 			subCompany = $("#subCompany").val();
@@ -231,6 +241,7 @@
 			params['line'] = line;
 			params['startDate'] = startDate;
 			params['endDate'] = endDate;
+			params['bcType'] = bcType;
 // 			params['model'] = model;
 			params['company'] = company;
 			params['subCompany'] = subCompany;
@@ -265,6 +276,7 @@
 			params['line'] = line;
 			params['startDate'] = startDate;
 			params['endDate'] = endDate;
+			params['bcType'] = bcType;
 // 			params['model'] = model;
 			params['company'] = company;
 			params['subCompany'] = subCompany;