修改车辆设备号处理驾驶员请求台账

廖磊
1 parent 64217be7
Showing 2 changed files with 5 additions and 5 deletions
src/main/java/com/bsth/repository/CarDeviceRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface CarDeviceRepository extends BaseRepository<CarDevice, Long> {
-	@Query(value="select s from CarDevice s where s.oldDeviceNo=?1 and s.qyrq<=?2 ")
+	@Query(value="select s from CarDevice s where s.newDeviceNo=?1 and s.qyrq<=?2 ")
 	List<CarDevice> findCarDevice(String device,Date date );
 }
@@ -1129,8 +1129,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	if(BasicData.deviceId2NbbmMap.get(obj[0].toString())==null){
             		List<CarDevice> carDeviceList=new ArrayList<CarDevice>();
 					try {
-						carDeviceList = carDeviceRepository.findCarDevice(obj[0].toString(), sdf.parse(date + " 00:00:00"));
-					} catch (ParseException e) {
+						carDeviceList = carDeviceRepository.findCarDevice(obj[0].toString(), new Date(Long.parseLong(obj[3].toString())));
+					} catch (Exception e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
 					}
@@ -1901,8 +1901,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                  if(BasicData.deviceId2NbbmMap.get(obj[2])==null){
              		List<CarDevice> carDeviceList=new ArrayList<CarDevice>();
  					try {
- 						carDeviceList = carDeviceRepository.findCarDevice(obj[2].toString(), sdf.parse(date + " 00:00:00"));
- 					} catch (ParseException e) {
+ 						carDeviceList = carDeviceRepository.findCarDevice(obj[2].toString(), sdf.parse(obj[1].toString()));
+ 					} catch (Exception e) {
  						// TODO Auto-generated catch block
  						e.printStackTrace();
  					}