驾驶员请求台账

廖磊
1 parent 8f6ab784
Showing 3 changed files with 6 additions and 6 deletions
src/main/java/com/bsth/repository/CarDeviceRepository.java
src/main/java/com/bsth/repository/LineRepository.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.oldDeviceNo=?1 and s.qyrq<=?2 ")
 	List<CarDevice> findCarDevice(String device,Date date );
 }
@@ -45,7 +45,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	public Line findByLineCode(String string);
-	@Query(value = "  SELECT l FROM Line l where l.company like %?1% and l.brancheCompany like %?2% and l.lineCode like ?3")
+	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
 	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
 	@Query("SELECT L FROM Line L where L.destroy=0")
@@ -1870,7 +1870,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     		code=BasicData.deviceId2NbbmMap.inverse().get(code);
     	}
     	String fgs="";
-    	List<Line> lineList= lineRepository.findLineBygsBm("", "", line);
+    	List<Line> lineList= lineRepository.findLineByCode(line);
     	if(lineList.size()>0){
     		Line l=lineList.get(0);
     		fgs=BasicData.businessFgsCodeNameMap.get(l.getBrancheCompany()+"_"+l.getCompany());
@@ -1938,7 +1938,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     		code=BasicData.deviceId2NbbmMap.inverse().get(code);
     	}
     	String fgs="";
-    	List<Line> lineList= lineRepository.findLineBygsBm("", "", line);
+    	List<Line> lineList= lineRepository.findLineByCode(line);
     	if(lineList.size()>0){
     		Line l=lineList.get(0);
     		fgs=BasicData.businessFgsCodeNameMap.get(l.getBrancheCompany()+"_"+l.getCompany());
@@ -1956,8 +1956,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();
 					}