From b23348e7645f477d50c9f48da8aea8ef15c6db21 Mon Sep 17 00:00:00 2001 From: Romesum Date: Wed, 27 May 2020 14:15:18 +0800 Subject: [PATCH] =?UTF-8?q?[feat][M]:=20=E6=96=B0=E5=A2=9E=E6=8B=92?= =?UTF-8?q?=E7=BB=9D=E5=AE=A1=E6=A0=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LabRecordController.java | 16 ++++++++++++++ .../repository/LabRecordDTOMapper.java | 21 +++++++++++++++++++ .../service/LabRecordService.java | 6 ++++++ .../service/impl/LabRecordServiceImpl.java | 19 +++++++++++++++++ 4 files changed, 62 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 abdde4a..5817117 100644 --- a/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java +++ b/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java @@ -288,4 +288,20 @@ public class LabRecordController { return ResultVOUtil.success(); } + /** + * 拒绝审核 + * author 吴志岳 + */ + @PostMapping(value = "/refuse", consumes = "application/json") + public ResultVO refuse(@RequestBody Map map) { + labrecordService.refuseRecord((Integer)map.get("lab_id"), + (Integer)map.get("uc_id"), + (String) map.get("year"), + (Integer)map.get("semester"), + (Integer)map.get("day"), + (Integer)map.get("time"), + (String)map.get("refuse_reason")); + return ResultVOUtil.success(); + } + } \ No newline at end of file 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 71bfbb7..82b1006 100644 --- a/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordDTOMapper.java +++ b/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordDTOMapper.java @@ -2,6 +2,7 @@ package com.hzu.bookingsystem.repository; import com.hzu.bookingsystem.VO.WeekVO; import com.hzu.bookingsystem.bean.LabRecordBean; +import com.hzu.bookingsystem.bean.LabTimeBean; import com.hzu.bookingsystem.dto.LabRecordDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -213,6 +214,7 @@ public interface LabRecordDTOMapper { " 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_record.`status` = 0 " + " AND tb_lab_time.`year` = #{year} " + " AND tb_lab_time.semester = #{semester} " + " AND tb_lab_time.`day` = #{day} " + @@ -220,4 +222,23 @@ public interface LabRecordDTOMapper { " AND tb_lab.lab_id = #{labId} " + " AND tb_user_course.uc_id = #{uc_id} ") List getRecordDetailLabRecordList(Integer labId, Integer uc_id, String year, Integer semester, Integer day, Integer time); + + @Select("SELECT " + + " tb_lab_time.*,tb_lab_time.lt_id as ltId,tb_lab_time.lab_id as labId,tb_lab_time.creator_id as creatorId "+ + " 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_record.`status` = 0 " + + " 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} ") + List getRecordDetailLabTimeList(Integer labId, Integer uc_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 53f80a9..d168d42 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java +++ b/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java @@ -124,4 +124,10 @@ public interface LabRecordService { */ void passRecord(Integer labId,Integer uc_id, String year, Integer semester, Integer day, Integer time); + /** + * 拒绝审核 + * author 吴志岳 + */ + void refuseRecord(Integer labId,Integer uc_id, String year, Integer semester, Integer day, Integer time,String refuseReason); + } 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 d97a48c..fd7acee 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 @@ -240,5 +240,24 @@ public class LabRecordServiceImpl implements LabRecordService { } } + @Override + @Transactional + public void refuseRecord(Integer labId, Integer uc_id, String year, Integer semester, Integer day, Integer time,String refuseReason) { + List labRecordBeanList = labRecordDTOMapper.getRecordDetailLabRecordList(labId,uc_id,year,semester,day,time); + List labTimeBeanList = labRecordDTOMapper.getRecordDetailLabTimeList(labId,uc_id,year,semester,day,time); + // 拒绝审核 + for(LabRecordBean labRecordBean: labRecordBeanList){ + labRecordBean.setStatus(1); + labRecordBean.setRefuseReason(refuseReason); + labRecordBean.setCheckTime(new Date()); + update(labRecordBean); + } + // 重新开放相关时间段 + for(LabTimeBean labTimeBean: labTimeBeanList){ + labTimeBean.setCreateTime(new Date()); + labtimeservice.add(labTimeBean); + } + } + }