From 3bde0f79808a322eb4e3278c6202c12e41d5835c Mon Sep 17 00:00:00 2001
From: Romesum <zhiyuewu@foxmail.com>
Date: Tue, 26 May 2020 16:30:58 +0800
Subject: [PATCH] =?UTF-8?q?[feat][M]:=20=E6=96=B0=E5=A2=9E=E6=9F=A5?=
 =?UTF-8?q?=E6=89=BE=E7=94=A8=E6=88=B7=E5=BD=93=E5=89=8D=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LabRecordController.java       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java b/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java
index 8d2172b..c27b37e 100644
--- a/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java
+++ b/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java
@@ -2,10 +2,12 @@ package com.hzu.bookingsystem.controller;
 
 
 import com.hzu.bookingsystem.VO.ResultVO;
+import com.hzu.bookingsystem.VO.WeekVO;
 import com.hzu.bookingsystem.bean.LabRecordBean;
 import com.hzu.bookingsystem.bean.LabTimeBean;
 import com.hzu.bookingsystem.converter.Map2Object;
 import com.hzu.bookingsystem.dto.LabRecordDTO;
+import com.hzu.bookingsystem.repository.LabRecordDTOMapper;
 import com.hzu.bookingsystem.service.LabRecordService;
 import com.hzu.bookingsystem.service.LabTimeService;
 import com.hzu.bookingsystem.utils.ResultVOUtil;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +34,9 @@ public class LabRecordController {
     @Autowired
     private UserController userController;
 
+    @Autowired
+    private LabRecordDTOMapper labRecordDTOMapper;
+
     //    根据id查看实验室记录
     @GetMapping(value = "/findlabrecord/{lr_id}")
     public ResultVO<Map<String, LabRecordBean>> FindLabRecordId(@PathVariable("lr_id") Integer lr_id) {
@@ -143,4 +149,27 @@ public class LabRecordController {
         }
         return ResultVOUtil.success();
     }
+
+    /**
+     * 查找用户当前课程已经预约的时间表
+     */
+    @GetMapping("/getWeekBooked")
+    public ResultVO getWeekBooked(@RequestParam("labId") Integer lab_id,
+                                  @RequestParam("year") String year,
+                                  @RequestParam("semester") Integer semester,
+                                  @RequestParam("uc_id") Integer uc_id) {
+        //总表
+        List<List<List<Integer>>> lists = new ArrayList<>();
+        for (int i = 1; i <= 5; i++) {
+            // 一行数据
+            List<List<Integer>> timeList = new ArrayList<>();
+            for (int j = 1; j <= 7; j++) {
+                WeekVO weekVO = new WeekVO();
+
+                timeList.add(labrecordService.findWeeksBooked(lab_id, year, semester, j, i, uc_id));
+            }
+            lists.add(timeList);
+        }
+        return ResultVOUtil.success(lists);
+    }
 }
\ No newline at end of file