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

潘钊
2 parents b2439e42 78adddad
Showing 5 changed files with 7 additions and 6 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/traffic/impl/VehicleInoutStopServiceImpl.java
src/main/resources/static/pages/forms/statement/firstAndLastBus_delay.html
src/main/resources/static/pages/punctual/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
@@ -1735,7 +1735,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			long id = schedule.getId();
 			if(schedule1 == 0l || schedule1 > id)
 				schedule1 = id;
-			if(schedule2 == 0l || schedule1 < id)
+			if(schedule2 == 0l || schedule2 < id)
 				schedule2 = id;
 		}
 		Map<Long, Set<ChildTaskPlan>> cts = getChildTaskPlans(schedule1, schedule2);
@@ -82,7 +82,7 @@ public class VehicleInoutStopServiceImpl extends BaseServiceImpl&lt;VehicleInoutSto
 				"if( up_down= 0,'上行','下行') as up_down ," +
 				"if( in_out_stop= 0,'站内','站外') as in_out_stop , " +
 				"stop,report_date FROM bsth_c_shreal " + packageParam(map,"") ;
-		logger.info("车载上报停靠站查询sql:",sql);
+		logger.info("车载上报停靠站查询sql:"+sql);
 		List<Map<String, Object>> result = jdbcTemp.queryForList(sql);
 		return result;
 	}
@@ -96,6 +96,7 @@ public class VehicleInoutStopServiceImpl extends BaseServiceImpl&lt;VehicleInoutSto
 		JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
 		String sql = "SELECT count(1) COUNT FROM bsth_c_shreal" + packageParam(map,"count");
 		long result = Long.valueOf(jdbcTemp.queryForMap(sql).get("COUNT")+"");
+		logger.info("车载上报停靠站查询count-sql:"+sql);
 		return result;
 	}
 }
@@ -19,7 +19,7 @@
 <div class="page-head">
 	<div class="page-title">
-		<h1>线路首末班准点率</h1>
+		<h1>线路首末班误点班次</h1>
 	</div>
 </div>
@@ -39,9 +39,9 @@
 								<td>路牌</td>
 								<td>计划发车</td>
 								<td>实际发车</td>
+								<td>发车准点</td>
 								<td>计划到站</td>
 								<td>实际到站</td>
-								<td>发车准点</td>
 								<td>到站准点</td>
 							</tr>
 						</thead>
@@ -171,7 +171,7 @@
                     <div class="col-md-3">
                         <div class="input-group">
                             <input type="datetime-local" class="form-control" name="qyrq"
-                                   ng-model="ctrl.deviceInfoForSave.qyrq"
+                                   ng-model="ctrl.deviceInfoForSave.qyrq" required
                                    remote-Validation
                                    remotevtype="cde1"
                                    remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}" />
@@ -180,7 +180,7 @@
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
-                        启用日期必须选择
+                        启用日期必须选择，精确到具体时间
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
                         {{$remote_msg}}