|
|
|
@ -160,6 +160,56 @@ public class LabTimeController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取实验室可被预约的【5】【7】时间表
|
|
|
|
|
*
|
|
|
|
|
* @param lab_id
|
|
|
|
|
* @param year
|
|
|
|
|
* @param semester
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@GetMapping(value = "/getLabScheduleAll")
|
|
|
|
|
public ResultVO getLabScheduleAll(@RequestParam("labId") Integer lab_id,
|
|
|
|
|
@RequestParam("year") String year,
|
|
|
|
|
@RequestParam("semester") Integer semester) {
|
|
|
|
|
//总表
|
|
|
|
|
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++) {
|
|
|
|
|
timeList.add(labTimeService.findWeeks(lab_id, year, semester, j, i));
|
|
|
|
|
}
|
|
|
|
|
lists.add(timeList);
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtil.success(lists);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取实验室可被预约的【5】【7】时间表
|
|
|
|
|
*
|
|
|
|
|
* @param lab_id
|
|
|
|
|
* @param year
|
|
|
|
|
* @param semester
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@GetMapping(value = "/getLabScheduleAbleBook")
|
|
|
|
|
public ResultVO getLabScheduleAbleBook(@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++) {
|
|
|
|
|
timeList.add(labTimeService.findWeeksAble(lab_id, year, semester, j, i, uc_id));
|
|
|
|
|
}
|
|
|
|
|
lists.add(timeList);
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtil.success(lists);
|
|
|
|
|
}
|
|
|
|
|
// /**
|
|
|
|
|
// * author 吴志岳
|
|
|
|
|
// * 一键插入该学年学期 16周所有可选时间段
|
|
|
|
|