潘钊 / bsth_control · Commits

Commit 0e2c376228342ec94dd752bb16d7772b81abc40a

Authored by 娄高锋
1 parent c38714aa

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

Inline Side-by-side
Showing 2 changed files with 19 additions and 1 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
  View file @0e2c376
... ... @@ -803,6 +803,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
803 803 String line = map.get("line").toString();
804 804 String startDate = map.get("startDate").toString();
805 805 String endDate = map.get("endDate").toString();
  806 + String bcType = map.get("bcType").toString();
806 807 String nbbm = map.get("nbbm").toString();
807 808 String type = map.get("type").toString();
808 809  
... ... @@ -829,6 +830,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
829 830 sql += " and gs_bm like '%"+company+"%' and fgs_bm like '%"+subCompany+"%'";
830 831 // }
831 832 sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
  833 + if(bcType.trim().equals("1")){
  834 + sql += " and bc_type != 'region'";
  835 + } else if(bcType.trim().equals("2")){
  836 + sql += " and bc_type = 'region'";
  837 + }
832 838  
833 839 list = jdbcTemplate.query(sql,
834 840 new RowMapper<ScheduleRealInfo>(){
... ...
src/main/resources/static/pages/forms/statement/scheduleAnaly_sum.html
  View file @0e2c376
... ... @@ -41,6 +41,14 @@
41 41 <span class="item-label" style="width: 80px;">线路: </span>
42 42 <select class="form-control" name="line" id="line" style="width: 160px;"></select>
43 43 </div>
  44 + <div style="display: inline-block;margin-left: 10px;">
  45 + <span class="item-label" style="width: 80px;">班次类型: </span>
  46 + <select class="form-control" name="bcType" id="bcType" style="width: 160px;">
  47 + <option value="0">全部</option>
  48 + <option value="1">全程</option>
  49 + <option value="2">区间</option>
  50 + </select>
  51 + </div>
44 52 <div style="margin-top: 10px"></div>
45 53 <div style="display: inline-block;margin-left: 10px;">
46 54 <span class="item-label" style="width: 80px;">开始时间: </span>
... ... @@ -60,7 +68,7 @@
60 68 <!-- <option value="">请选择...</option> -->
61 69 <!-- </select> -->
62 70 <!-- </div> -->
63   - <div class="form-group">
  71 + <div class="form-group" style="margin-left: 10px">
64 72 <input class="btn btn-default" type="button" id="query" value="筛选"/>
65 73 <input class="btn btn-default" type="button" id="export" value="导出"/>
66 74 </div>
... ... @@ -207,6 +215,7 @@
207 215 var startDate = $("#startDate").val();
208 216 var endDate = $("#endDate").val();
209 217 var model = $("#model").val();
  218 + var bcType = "0";
210 219 var nbbm = "";
211 220 var company = $("#company").val();
212 221 var subCompany = $("#subCompany").val();
... ... @@ -224,6 +233,7 @@
224 233 startDate = $("#startDate").val();
225 234 endDate = $("#endDate").val();
226 235 // model = $("#model").val();
  236 + bcType = $("#bcType").val();
227 237 nbbm = $("#nbbm").val()!=null?$("#nbbm").val():"";
228 238 company = $("#company").val();
229 239 subCompany = $("#subCompany").val();
... ... @@ -231,6 +241,7 @@
231 241 params['line'] = line;
232 242 params['startDate'] = startDate;
233 243 params['endDate'] = endDate;
  244 + params['bcType'] = bcType;
234 245 // params['model'] = model;
235 246 params['company'] = company;
236 247 params['subCompany'] = subCompany;
... ... @@ -265,6 +276,7 @@
265 276 params['line'] = line;
266 277 params['startDate'] = startDate;
267 278 params['endDate'] = endDate;
  279 + params['bcType'] = bcType;
268 280 // params['model'] = model;
269 281 params['company'] = company;
270 282 params['subCompany'] = subCompany;
... ...