|
|
@ -26,52 +26,52 @@ public class LabTimeController {
|
|
|
|
private UserController userController;
|
|
|
|
private UserController userController;
|
|
|
|
|
|
|
|
|
|
|
|
//创建实验室可预约时间段
|
|
|
|
//创建实验室可预约时间段
|
|
|
|
@PostMapping(value = "/addLabTime", consumes = "application/json")
|
|
|
|
// @PostMapping(value = "/addLabTime", consumes = "application/json")
|
|
|
|
public ResultVO addLabTime(@RequestBody Map<String, Object> map) {
|
|
|
|
// public ResultVO addLabTime(@RequestBody Map<String, Object> map) {
|
|
|
|
//转换对象
|
|
|
|
// //转换对象
|
|
|
|
LabTimeBean labTime1 = (LabTimeBean) Map2Object.map2Object(map, LabTimeBean.class);
|
|
|
|
// LabTimeBean labTime1 = (LabTimeBean) Map2Object.map2Object(map, LabTimeBean.class);
|
|
|
|
System.out.println(labTime1);
|
|
|
|
// System.out.println(labTime1);
|
|
|
|
//查重
|
|
|
|
// //查重
|
|
|
|
if (labTimeService.findByTime(labTime1.getTime()) != null) {
|
|
|
|
// if (labTimeService.findByTime(labTime1.getTime()) != null) {
|
|
|
|
return ResultVOUtil.error(-1, "该时间段已存在");
|
|
|
|
// return ResultVOUtil.error(-1, "该时间段已存在");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
labTimeService.add(labTime1);
|
|
|
|
// labTimeService.add(labTime1);
|
|
|
|
return ResultVOUtil.success();
|
|
|
|
// return ResultVOUtil.success();
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
//通过ltId删除实验室可预约时间段
|
|
|
|
//通过ltId删除实验室可预约时间段
|
|
|
|
@PostMapping(value = "/deleteLabTime")
|
|
|
|
// @PostMapping(value = "/deleteLabTime")
|
|
|
|
public ResultVO deleteLabTime(@RequestBody LabTimeBean labTime) {
|
|
|
|
// public ResultVO deleteLabTime(@RequestBody LabTimeBean labTime) {
|
|
|
|
//查找实验室是否存在
|
|
|
|
// //查找实验室是否存在
|
|
|
|
LabTimeBean labTime1 = labTimeService.findByLtId(labTime.getLtId());
|
|
|
|
// LabTimeBean labTime1 = labTimeService.findByLtId(labTime.getLtId());
|
|
|
|
if (labTime1 == null) {
|
|
|
|
// if (labTime1 == null) {
|
|
|
|
return ResultVOUtil.error(-1, "该时间段不存在");
|
|
|
|
// return ResultVOUtil.error(-1, "该时间段不存在");
|
|
|
|
} else {
|
|
|
|
// } else {
|
|
|
|
labTimeService.deleteByLtId(labTime1.getLabId());
|
|
|
|
// labTimeService.deleteByLtId(labTime1.getLabId());
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
return ResultVOUtil.success();
|
|
|
|
// return ResultVOUtil.success();
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
//修改实验室可预约时间段
|
|
|
|
//修改实验室可预约时间段
|
|
|
|
@PostMapping(value = "/updateLabTimeOld", consumes = "application/json")
|
|
|
|
// @PostMapping(value = "/updateLabTimeOld", consumes = "application/json")
|
|
|
|
public ResultVO updateLabTimeOld(@RequestBody Map<String, Object> map, HttpServletRequest request) {
|
|
|
|
// public ResultVO updateLabTimeOld(@RequestBody Map<String, Object> map, HttpServletRequest request) {
|
|
|
|
//转换对象
|
|
|
|
// //转换对象
|
|
|
|
LabTimeBean labTime1 = (LabTimeBean) Map2Object.map2Object(map, LabTimeBean.class);
|
|
|
|
// LabTimeBean labTime1 = (LabTimeBean) Map2Object.map2Object(map, LabTimeBean.class);
|
|
|
|
if (labTime1.getLtId() == null) {
|
|
|
|
// if (labTime1.getLtId() == null) {
|
|
|
|
return ResultVOUtil.error(-1, "该实验室不存在,无法修改");
|
|
|
|
// return ResultVOUtil.error(-1, "该实验室不存在,无法修改");
|
|
|
|
} else {
|
|
|
|
// } else {
|
|
|
|
labTimeService.update(labTime1);
|
|
|
|
// labTimeService.update(labTime1);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
return ResultVOUtil.success();
|
|
|
|
// return ResultVOUtil.success();
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
//通过ltId查找实验室预约时间段
|
|
|
|
//通过ltId查找实验室预约时间段
|
|
|
|
@GetMapping(value = "/findLabTimeById")
|
|
|
|
// @GetMapping(value = "/findLabTimeById")
|
|
|
|
public ResultVO<Map<String, Object>> findLabTimeById(@RequestParam("ltId") Integer lt_id) {
|
|
|
|
// public ResultVO<Map<String, Object>> findLabTimeById(@RequestParam("ltId") Integer lt_id) {
|
|
|
|
LabTimeBean labTime1 = labTimeService.findByLtId(lt_id);
|
|
|
|
// LabTimeBean labTime1 = labTimeService.findByLtId(lt_id);
|
|
|
|
System.out.println(labTime1);
|
|
|
|
// System.out.println(labTime1);
|
|
|
|
return ResultVOUtil.success(labTime1);
|
|
|
|
// return ResultVOUtil.success(labTime1);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
//查找实验室预约周次(包含已预约)
|
|
|
|
//查找实验室预约周次(包含已预约)
|
|
|
|
// author 吴志岳
|
|
|
|
// author 吴志岳
|
|
|
@ -186,7 +186,7 @@ public class LabTimeController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 获取实验室可被预约的【5】【7】时间表
|
|
|
|
* 获取用户可预约的【5】【7】时间表
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param lab_id
|
|
|
|
* @param lab_id
|
|
|
|
* @param year
|
|
|
|
* @param year
|
|
|
|