Merge branch 'pudong' of http://192.168.168.201:8888/panzhaov5/bsth_control.git into pudong

王通
2 parents b5ce7fbd 96097ffc
Showing 2 changed files with 3 additions and 3 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -229,6 +229,6 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	Integer updateLpChange(Long id);
 	@Query(value = "select count (s.id) from ScheduleRealInfo s where s.clZbh=?1 and s.scheduleDateStr=?2 and s.xlBm=?3 and s.qdzCode=?4")
-	Object isCircleQdz(String clzbh,String sdr,String xlbm,String qdzCode);
+	Long isCircleQdz(String clzbh,String sdr,String xlbm,String qdzCode);
 }
@@ -5991,8 +5991,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String time =sdf.format(Long.parseLong(sdr));
-        Object num=scheduleRealInfoRepository.isCircleQdz(clzbh, time, xlbm, qdzCode);
-        Integer num2=num==0||num==0L?0:1;
+        Long num=scheduleRealInfoRepository.isCircleQdz(clzbh, time, xlbm, qdzCode);
+        Integer num2=num==0L?0:1;
         return num2;
     }
 }