潘钊 / bsth_control · Commits

Commit 031c9662eb76b29fa67cc87a3abece40810db868

Authored by 潘钊
2 parents b2439e42 78adddad
build: skipped

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

Inline Side-by-side
Showing 5 changed files with 7 additions and 6 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @031c966
... ... @@ -1735,7 +1735,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1735 1735 long id = schedule.getId();
1736 1736 if(schedule1 == 0l || schedule1 > id)
1737 1737 schedule1 = id;
1738   - if(schedule2 == 0l || schedule1 < id)
  1738 + if(schedule2 == 0l || schedule2 < id)
1739 1739 schedule2 = id;
1740 1740 }
1741 1741 Map<Long, Set<ChildTaskPlan>> cts = getChildTaskPlans(schedule1, schedule2);
... ...
src/main/java/com/bsth/service/traffic/impl/VehicleInoutStopServiceImpl.java
  View file @031c966
... ... @@ -82,7 +82,7 @@ public class VehicleInoutStopServiceImpl extends BaseServiceImpl&lt;VehicleInoutSto
82 82 "if( up_down= 0,'上行','下行') as up_down ," +
83 83 "if( in_out_stop= 0,'站内','站外') as in_out_stop , " +
84 84 "stop,report_date FROM bsth_c_shreal " + packageParam(map,"") ;
85   - logger.info("车载上报停靠站查询sql:",sql);
  85 + logger.info("车载上报停靠站查询sql:"+sql);
86 86 List<Map<String, Object>> result = jdbcTemp.queryForList(sql);
87 87 return result;
88 88 }
... ... @@ -96,6 +96,7 @@ public class VehicleInoutStopServiceImpl extends BaseServiceImpl&lt;VehicleInoutSto
96 96 JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
97 97 String sql = "SELECT count(1) COUNT FROM bsth_c_shreal" + packageParam(map,"count");
98 98 long result = Long.valueOf(jdbcTemp.queryForMap(sql).get("COUNT")+"");
  99 + logger.info("车载上报停靠站查询count-sql:"+sql);
99 100 return result;
100 101 }
101 102 }
... ...
src/main/resources/static/pages/forms/statement/firstAndLastBus_delay.html
  View file @031c966
... ... @@ -19,7 +19,7 @@
19 19  
20 20 <div class="page-head">
21 21 <div class="page-title">
22   - <h1>线路首末班准点率</h1>
  22 + <h1>线路首末班误点班次</h1>
23 23 </div>
24 24 </div>
25 25  
... ...
src/main/resources/static/pages/punctual/list.html
  View file @031c966
... ... @@ -39,9 +39,9 @@
39 39 <td>路牌</td>
40 40 <td>计划发车</td>
41 41 <td>实际发车</td>
  42 + <td>发车准点</td>
42 43 <td>计划到站</td>
43 44 <td>实际到站</td>
44   - <td>发车准点</td>
45 45 <td>到站准点</td>
46 46 </tr>
47 47 </thead>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
  View file @031c966
... ... @@ -171,7 +171,7 @@
171 171 <div class="col-md-3">
172 172 <div class="input-group">
173 173 <input type="datetime-local" class="form-control" name="qyrq"
174   - ng-model="ctrl.deviceInfoForSave.qyrq"
  174 + ng-model="ctrl.deviceInfoForSave.qyrq" required
175 175 remote-Validation
176 176 remotevtype="cde1"
177 177 remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}" />
... ... @@ -180,7 +180,7 @@
180 180 </div>
181 181 <!-- 隐藏块，显示验证信息 -->
182 182 <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
183   - 启用日期必须选择
  183 + 启用日期必须选择，精确到具体时间
184 184 </div>
185 185 <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
186 186 {{$remote_msg}}
... ...