From 2a623e570a733de65107f603daba8a4a93113618 Mon Sep 17 00:00:00 2001 From: Romesum Date: Tue, 26 May 2020 23:13:48 +0800 Subject: [PATCH] =?UTF-8?q?[feat][M]:=20=E6=96=B0=E5=A2=9E=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95=20=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LabRecordController.java | 11 +++++ .../repository/LabRecordDTOMapper.java | 45 ++++++++++++++++--- .../service/LabRecordService.java | 6 +++ .../service/impl/LabRecordServiceImpl.java | 10 +++++ 4 files changed, 66 insertions(+), 6 deletions(-) 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 7407990..c5d0d8a 100644 --- a/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java +++ b/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 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); } diff --git a/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordDTOMapper.java b/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordDTOMapper.java index b7b4975..24eceee 100644 --- a/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordDTOMapper.java +++ b/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 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 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 getWeekBooked(Integer labId,String year,Integer semester, Integer day,Integer time,Integer uc_id); - + List 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> getLabSchedule(Integer labId, String year, Integer semester, Integer day, Integer time); + List> 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> getUserSchedule(Integer u_id, String year, Integer semester, Integer day, Integer time); + List> getUserSchedule(Integer u_id, String year, Integer semester, Integer day, Integer time); } diff --git a/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java b/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java index 2a0cdc5..9d2a681 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java +++ b/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java @@ -73,6 +73,12 @@ public interface LabRecordService { */ List findRecordListByUId(Integer uId); + /** + * author 吴志岳 + * 查看审核记录 + */ + List findRecordList(); + /** * author 吴志岳 * 根据LTid与UCid删除LR diff --git a/java/src/main/java/com/hzu/bookingsystem/service/impl/LabRecordServiceImpl.java b/java/src/main/java/com/hzu/bookingsystem/service/impl/LabRecordServiceImpl.java index b4e50c7..c70b6a7 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/impl/LabRecordServiceImpl.java +++ b/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 findRecordList() { + return labRecordDTOMapper.getRecordList(); + } + + @Transactional @Override public void deleteByLtIdAndUcId(Integer ltId, Integer ucId) {