[feat][M]: 添加重构接口findWeeksAble，通过UCID查找

java/src/main/java/com/hzu/bookingsystem/controller/LabTimeController.java

@@ -92,8 +92,9 @@ public class LabTimeController {
                                                                  @RequestParam("year") String year,
                                                                  @RequestParam("semester") Integer semester,
                                                                  @RequestParam("day") Integer day,
-                                                                 @RequestParam("time") Integer time)  {
-        List<Integer> weeks = labTimeService.findWeeksAble(lab_id, year, semester, day, time);
+                                                                 @RequestParam("time") Integer time,
+                                                                 @RequestParam("uc_id") Integer uc_id) {
+        List<Integer> weeks = labTimeService.findWeeksAble(lab_id, year, semester, day, time, uc_id);
         return ResultVOUtil.success(weeks);
     }
 

java/src/main/java/com/hzu/bookingsystem/repository/LabTimeRepository.java

@@ -85,4 +85,24 @@ public interface LabTimeRepository extends JpaRepository<LabTimeBean,String> {
             " tb_lab_time.lt_id not in (select lt_id from tb_lab_record where status is not null)" , nativeQuery = true)
     List<LabTimeBean> findWeeksAbleBook(Integer lab_id, String year, Integer semester, Integer day, Integer time) ;
 
+    @Query(value = "SELECT " +
+            " tb_lab_time.* " +
+            "FROM " +
+            "tb_lab_time LEFT JOIN tb_lab_record ON tb_lab_time.lt_id=tb_lab_record.lt_id " +
+            "WHERE " +
+            " tb_lab_time.lab_id = ?1 AND " +
+            " tb_lab_time.`year` = ?2 AND " +
+            " tb_lab_time.semester = ?3 AND " +
+            " tb_lab_time.`day` = ?4 AND " +
+            " tb_lab_time.time = ?5 AND " +
+            " tb_lab_time.lt_id not in (select lt_id from tb_lab_record where status is not null)" +
+            "OR " +
+            " tb_lab_time.lab_id = ?1 AND " +
+            " tb_lab_time.`year` = ?2 AND " +
+            " tb_lab_time.semester = ?3 AND " +
+            " tb_lab_time.`day` = ?4 AND " +
+            " tb_lab_time.time = ?5 AND " +
+            "tb_lab_record.uc_id = ?6" , nativeQuery = true)
+    List<LabTimeBean> findWeeksAbleBook(Integer lab_id, String year, Integer semester, Integer day, Integer time,Integer uc_id) ;
+
 }

java/src/main/java/com/hzu/bookingsystem/service/LabTimeService.java

@@ -83,6 +83,14 @@ public interface LabTimeService {
      */
     List<Integer> findWeeksAble(Integer lab_id,String year,Integer semester, Integer day,Integer time) ;
 
+    /**
+     * 通过学期、周、星期、上课时间、ucid查找实验室可预约时间段周次
+     *author 吴志岳
+     * @param lab_id、year、semester
+     * @return List<Integer>
+     */
+    List<Integer> findWeeksAble(Integer lab_id,String year,Integer semester, Integer day,Integer time,Integer uc_id) ;
+
     /**
      * 通过学年、学期、星期、上课时间查找实验室预约时间段
      */

java/src/main/java/com/hzu/bookingsystem/service/impl/LabTimeServiceImpl.java

@@ -119,6 +119,24 @@ public class LabTimeServiceImpl implements LabTimeService {
         return weeks;
     }
 
+    /**
+     * author 吴志岳
+     *
+     * @param lab_id、year、semester
+     * @param year
+     * @param semester
+     * @return
+     */
+    @Override
+    public List<Integer> findWeeksAble(Integer lab_id, String year, Integer semester, Integer day, Integer time,Integer uc_id) {
+        List<LabTimeBean> list = labTimeRepository.findWeeksAbleBook(lab_id, year, semester, day, time, uc_id);
+        List<Integer> weeks = new ArrayList<>();
+        for (LabTimeBean labtime : list) {
+            weeks.add(labtime.getWeek());
+        }
+        return weeks;
+    }
+
     @Override
     public List<LabTimeBean> findTimes(Integer lab_id, String year, Integer semester, Integer day, Integer time) {
         return labTimeRepository.findByLabIdAndYearAndSemesterAndDayAndTime(lab_id, year, semester, day, time);