[feat][M]: 新增查询预约详情接口

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

@@ -106,6 +106,21 @@ public class LabRecordController {
         return ResultVOUtil.success(labRecordDTOList);
     }
 
+    /**
+     * author 吴志岳
+     * 查询预约记录详情
+     */
+    @GetMapping("/getRecordDetail")
+    public ResultVO getRecordDetail(@RequestParam("labId") Integer lab_id,
+                                    @RequestParam("year") String year,
+                                    @RequestParam("semester") Integer semester,
+                                    @RequestParam("day") Integer day,
+                                    @RequestParam("time") Integer time,
+                                    @RequestParam("uc_id") Integer uc_id) {
+        Map<String, Object> map = labrecordService.getRecordDetail(lab_id, uc_id, year, semester, day, time);
+        return ResultVOUtil.success(map);
+    }
+
     /**
      * 更改选课时间段
      */

java/src/main/java/com/hzu/bookingsystem/dto/LabRecordDTO.java

@@ -26,11 +26,13 @@ public class LabRecordDTO {
     private Integer status;
 
     //UC
+    private Integer uc_id;
     private String course_name;
     private Integer population;
     private String classes;
 
     //LAB
+    private Integer labId;
     private String lab_name;
 
     private String position;

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

@@ -58,7 +58,9 @@ public interface LabRecordDTOMapper {
             " tb_user_course.`name` AS course_name, " +
             " tb_user_course.population, " +
             " tb_user_course.classes, " +
+            " tb_user_course.uc_id, " +
             " tb_lab.`name` AS lab_name, " +
+            " tb_lab.lab_id AS labId, " +
             " tb_lab.position  " +
             "FROM " +
             " tb_lab_time " +
@@ -152,4 +154,46 @@ public interface LabRecordDTOMapper {
             "GROUP BY " +
             " tb_user_course.uc_id")
     List<Map<String, Object>> getUserSchedule(Integer u_id, String year, Integer semester, Integer day, Integer time);
+
+    /**
+     *  通过lab_id,uc_id以及4项时间查找审核详情
+     */
+    @Select("SELECT " +
+            " tb_lab.lab_id, " +
+            " tb_lab_time.`year`, " +
+            " tb_lab_time.semester, " +
+            " tb_lab_time.`day`, " +
+            " tb_lab_time.time, " +
+            " tb_lab_record.create_time, " +
+            " tb_user.nickname, " +
+            " tb_user.tel, " +
+            " tb_lab.position, " +
+            " tb_user_course.software, " +
+            " tb_user_course.population, " +
+            " tb_user_course.classes, " +
+            " tb_user_course.remind, " +
+            " tb_user_course.isHaveDocuments, " +
+            " tb_lab.`name` AS lab_name, " +
+            " tb_user_course.`name` AS course_name  " +
+            "FROM " +
+            " tb_lab " +
+            " INNER JOIN tb_lab_time ON tb_lab.lab_id = tb_lab_time.lab_id " +
+            " INNER JOIN tb_lab_record ON tb_lab_time.lt_id = tb_lab_record.lt_id " +
+            " INNER JOIN tb_user " +
+            " INNER JOIN tb_user_course ON tb_user.u_id = tb_user_course.u_id  " +
+            "WHERE " +
+            " tb_lab_record.uc_id = tb_user_course.uc_id  " +
+            " AND tb_lab_time.`year` = #{year}  " +
+            " AND tb_lab_time.semester = #{semester} " +
+            " AND tb_lab_time.`day` = #{day}  " +
+            " AND tb_lab_time.time = #{time}  " +
+            " AND tb_lab.lab_id = #{labId}  " +
+            " AND tb_user_course.uc_id = #{uc_id}  " +
+            "GROUP BY " +
+            " tb_lab.lab_id, " +
+            " tb_lab_time.`year`, " +
+            " tb_lab_time.semester, " +
+            " tb_lab_time.`day`, " +
+            " tb_lab_time.time")
+    Map<String,Object> getRecordDetail(Integer labId,Integer uc_id, String year, Integer semester, Integer day, Integer time);
 }

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

@@ -12,6 +12,7 @@ public interface LabRecordService {
 
     /**
      * 新增申请记录
+     *
      * @param labrecord
      * @return
      */
@@ -19,12 +20,14 @@ public interface LabRecordService {
 
     /**
      * 查看所有申请记录
+     *
      * @return
      */
     List<LabRecordBean> findAll();
 
     /**
      * 根据状态查询申请记录
+     *
      * @param stauts
      * @return
      */
@@ -32,6 +35,7 @@ public interface LabRecordService {
 
     /**
      * 根据ID查询记录
+     *
      * @param lr_id
      * @return
      */
@@ -39,6 +43,7 @@ public interface LabRecordService {
 
     /**
      * 修改申请记录
+     *
      * @param labrecord
      * @return
      */
@@ -46,12 +51,14 @@ public interface LabRecordService {
 
     /**
      * 根据Id查询申请记录
+     *
      * @param lr_id
      */
     void deleteById(Integer lr_id);
 
     /**
      * 根据ucid查出实验室记录
+     *
      * @param uc_id
      * @return
      */
@@ -59,6 +66,7 @@ public interface LabRecordService {
 
     /**
      * 根据教师id和学年，学期查询课表
+     *
      * @param u_id
      * @param year
      * @param semester
@@ -103,6 +111,10 @@ public interface LabRecordService {
      */
     List<Map<String, Object>> getUserSchedule(Integer u_id, String year, Integer semester, Integer day, Integer time);
 
-
+    /**
+     * author 吴志岳
+     * 获取审核详情
+     */
+    Map<String, Object> getRecordDetail(Integer labId,Integer uc_id, String year, Integer semester, Integer day, Integer time);
 
 }

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

@@ -43,6 +43,7 @@ public class LabRecordServiceImpl implements LabRecordService{
 
     @PersistenceContext
     private EntityManager entityManager;
+
     @Override
     public LabRecordBean add(LabRecordBean labrcecord) {
         labrcecord.setLrId(null);
@@ -54,6 +55,7 @@ public class LabRecordServiceImpl implements LabRecordService{
 
         return labrecordRepository.findAll();
     }
+
     @Override
     public List<LabRecordBean> findByStatus(Integer status) {
 
@@ -88,8 +90,7 @@ public class LabRecordServiceImpl implements LabRecordService{
         String value_name[][] = new String[7][5];
 
         List<UserCourseBean> usercourses = usercourseservice.findAllByUidAndYearAndSemester(u_id, year, semester);
-        for ( UserCourseBean uc : usercourses)
+        for (UserCourseBean uc : usercourses) {
-        {
 
             List<LabRecordBean> labrecordlist = findByUcIdAndStatus(uc.getUcId(), 2);
 
@@ -125,8 +126,7 @@ public class LabRecordServiceImpl implements LabRecordService{
 
                     int start = 1;
                     int end = 16;
-                    if ( value[i][j][k]!=null && k != 18 && !value[i][j][k].equals(value[i][j][k+1]))
+                    if (value[i][j][k] != null && k != 18 && !value[i][j][k].equals(value[i][j][k + 1])) {
-                    {
                         if (value_name[i][j] == null) value_name[i][j] = "";
                         value_name[i][j] = value_name[i][j] + value[i][j][k];
                         value_name[i][j] = value_name[i][j] + "第" + (k + 1) + "周\n";
@@ -150,8 +150,7 @@ public class LabRecordServiceImpl implements LabRecordService{
                         }
                     }
 
-                    if (k==18 && value[i][j][18]!=null&& value[i][j][19]!=null&& !value[i][j][18].equals(value[i][j][19])  )
+                    if (k == 18 && value[i][j][18] != null && value[i][j][19] != null && !value[i][j][18].equals(value[i][j][19])) {
-                    {
                         if (value_name[i][j] == null) value_name[i][j] = "";
                         value_name[i][j] = value_name[i][j] + value[i][j][19];
                         value_name[i][j] = value_name[i][j] + "第20周\n";
@@ -176,6 +175,7 @@ public class LabRecordServiceImpl implements LabRecordService{
 
     /**
      * 查询审核记录
+     *
      * @return
      */
     @Override
@@ -220,5 +220,12 @@ public class LabRecordServiceImpl implements LabRecordService{
         return list;
     }
 
+    @Override
+    public Map<String, Object> getRecordDetail(Integer labId, Integer uc_id, String year, Integer semester, Integer day, Integer time) {
+        Map<String, Object> map = labRecordDTOMapper.getRecordDetail(labId, uc_id, year, semester, day, time);
+        map.put("weeks", findWeeksBooked(labId, year, semester, day, time, uc_id));
+        return map;
+    }
+
 
 }