时刻表分析添加班次类型选项

娄高锋
1 parent 45621ce9
Showing 2 changed files with 21 additions and 9 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
@@ -516,6 +516,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String endDate = map.get("endDate").toString();
 		String model = map.get("model").toString();
 		String type = map.get("type").toString();
+		String bcType = map.get("bcType").toString();
 		if(startDate.length() == 0){
 			startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
@@ -533,7 +534,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(Integer.valueOf(bcType) == 1){
+				sql += " and bc_type != 'region'";
+			} else if(Integer.valueOf(bcType) == 2){
+				sql += " and bc_type = 'region'";
+			}
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
@@ -7,7 +7,8 @@
 	  .table-bordered > tbody > tr > td,
 	  .table-bordered > tfoot > tr > th,
 	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
+	    border: 1px solid;
+	    text-align: center; }
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
@@ -39,6 +40,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="line" 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>
@@ -54,7 +63,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>
@@ -202,6 +211,7 @@
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
 		var model = $("#model").val();
+		var bcType = $('#bcType').val();
 		var company = $("#company").val();
 		var subCompany = $("#subCompany").val();
 		function jsDoQuery(pagination){
@@ -218,6 +228,7 @@
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
 			model = $("#model").val();
+			bcType = $("#bcType").val();
 			company = $("#company").val();
 			subCompany = $("#subCompany").val();
 			params['page'] = page;
@@ -225,6 +236,7 @@
 			params['startDate'] = startDate;
 			params['endDate'] = endDate;
 			params['model'] = model;
+			params['bcType'] = bcType;
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['type'] = "query";
@@ -274,12 +286,7 @@
 				line = "";
 			updateModel();
 		});
-		$('#startDate').on("blur", function(){
-			startDate = $("#startDate").val();
-			endDate = $("#endDate").val();
-			updateModel();
-		});
-		$('#endDate').on("blur", function(){
+		$('#startDate, #endDate').on("blur", function(){
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
 			updateModel();