Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

娄高锋
2 parents d5311bc4 8b2fab5f
Showing 2 changed files with 4 additions and 3 deletions
src/main/java/com/bsth/service/traffic/impl/VehicleInoutStopServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
@@ -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;
 	}
 }
@@ -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}}