[feat][M]: 新增查看预约记录 管理员接口

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

@@ -96,6 +96,16 @@ public class LabRecordController {
         return ResultVOUtil.success(labRecordDTOList);
     }
 
+    /**
+     * author 吴志岳
+     * 查询预约记录
+     */
+    @GetMapping("/getRecordList")
+    public ResultVO getRecord() {
+        List<LabRecordDTO> labRecordDTOList = labrecordService.findRecordList();
+        return ResultVOUtil.success(labRecordDTOList);
+    }
+
     /**
      * 更改选课时间段
      */
@@ -140,6 +150,7 @@ public class LabRecordController {
                         .ltId(labTimeBean.getLtId())
                         .ucId(uc_id)
                         .status(0)
+                        .createTime(new Date())
                         .build();
                 labrecordService.add(labRecordBean1);
             }

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

@@ -13,7 +13,7 @@ public interface LabRecordDTOMapper {
     @Select("SELECT " +
             " tb_lab_time.`year`,  " +
             " tb_lab_time.semester,  " +
-            "COUNT(tb_lab_time.`week`) AS `week`,"+
+            "COUNT(tb_lab_time.`week`) AS `week`," +
             " tb_lab_time.`day`,  " +
             " tb_lab_time.time,  " +
             " tb_lab_record.`status`,  " +
@@ -39,13 +39,47 @@ public interface LabRecordDTOMapper {
             " tb_lab_time.lab_id = tb_lab.lab_id AND " +
             " tb_user_course.u_id =  #{uId} " +
             "GROUP BY " +
+            " tb_lab_record.uc_id, " +
             " tb_lab_time.`year`,  " +
             " tb_lab_time.semester,  " +
             " tb_lab_time.`day`,  " +
             " tb_lab_time.time,  " +
-            " tb_lab_record.`status`")
+            " tb_lab_record.`status`" +
+            "ORDER BY tb_lab_record.create_time desc")
     List<LabRecordDTO> getRecordListByUId(Integer uId);
 
+    @Select("SELECT " +
+            " tb_lab_time.`year`, " +
+            " tb_lab_time.semester, " +
+            " COUNT( tb_lab_time.`week` ) AS `week`, " +
+            " tb_lab_time.`day`, " +
+            " tb_lab_time.time, " +
+            " tb_lab_record.`status`, " +
+            " tb_user_course.`name` AS course_name, " +
+            " tb_user_course.population, " +
+            " tb_user_course.classes, " +
+            " tb_lab.`name` AS lab_name, " +
+            " tb_lab.position  " +
+            "FROM " +
+            " tb_lab_time " +
+            " INNER JOIN tb_lab_record ON tb_lab_time.lt_id = tb_lab_record.lt_id " +
+            " INNER JOIN tb_lab ON tb_lab_time.lab_id = tb_lab.lab_id, " +
+            " tb_user_course  " +
+            "WHERE " +
+            " tb_lab_time.lt_id = tb_lab_record.lt_id  " +
+            " AND tb_lab_record.uc_id = tb_user_course.uc_id  " +
+            " AND tb_lab_time.lab_id = tb_lab.lab_id  " +
+            "GROUP BY " +
+            " tb_lab_record.uc_id, " +
+            " tb_lab_time.`year`, " +
+            " tb_lab_time.semester, " +
+            " tb_lab_time.`day`, " +
+            " tb_lab_time.time, " +
+            " tb_lab_record.`status`  " +
+            "ORDER BY " +
+            " tb_lab_record.create_time DESC")
+    List<LabRecordDTO> getRecordList();
+
 
     @Select("SELECT " +
             " tb_lab_time.`week`  " +
@@ -63,8 +97,7 @@ public interface LabRecordDTOMapper {
             " AND tb_user_course.uc_id = #{uc_id} " +
             " AND tb_lab_record.`status` IN ( " +
             " 0, " + " 2)")
-    List<WeekVO> getWeekBooked(Integer labId,String year,Integer semester, Integer day,Integer time,Integer uc_id);
-
+    List<WeekVO> getWeekBooked(Integer labId, String year, Integer semester, Integer day, Integer time, Integer uc_id);
 
 
     @Select("SELECT " +
@@ -91,7 +124,7 @@ public interface LabRecordDTOMapper {
             " AND tb_lab_record.status = 2  " +
             "GROUP BY " +
             " tb_user_course.uc_id")
-    List<Map<String,Object>> getLabSchedule(Integer labId, String year, Integer semester, Integer day, Integer time);
+    List<Map<String, Object>> getLabSchedule(Integer labId, String year, Integer semester, Integer day, Integer time);
 
     @Select("SELECT " +
             " tb_user_course.`name` AS course_name, " +
@@ -118,5 +151,5 @@ public interface LabRecordDTOMapper {
             " AND tb_lab_record.status = 2  " +
             "GROUP BY " +
             " tb_user_course.uc_id")
-    List<Map<String,Object>> getUserSchedule(Integer u_id, String year, Integer semester, Integer day, Integer time);
+    List<Map<String, Object>> getUserSchedule(Integer u_id, String year, Integer semester, Integer day, Integer time);
 }

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

@@ -73,6 +73,12 @@ public interface LabRecordService {
      */
     List<LabRecordDTO> findRecordListByUId(Integer uId);
 
+    /**
+     * author 吴志岳
+     * 查看审核记录
+     */
+    List<LabRecordDTO> findRecordList();
+
     /**
      * author 吴志岳
      * 根据LTid与UCid删除LR

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

@@ -174,6 +174,16 @@ public class LabRecordServiceImpl implements LabRecordService{
         return labRecordDTOMapper.getRecordListByUId(13);
     }
 
+    /**
+     * 查询审核记录
+     * @return
+     */
+    @Override
+    public List<LabRecordDTO> findRecordList() {
+        return labRecordDTOMapper.getRecordList();
+    }
+
+
     @Transactional
     @Override
     public void deleteByLtIdAndUcId(Integer ltId, Integer ucId) {