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 91c281c..abdde4a 100644 --- a/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java +++ b/java/src/main/java/com/hzu/bookingsystem/controller/LabRecordController.java @@ -273,4 +273,19 @@ public class LabRecordController { return ResultVOUtil.success(lists); } + /** + * 审核通过 + * author 吴志岳 + */ + @PostMapping(value = "/commit", consumes = "application/json") + public ResultVO commit(@RequestBody Map map) { + labrecordService.passRecord((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")); + 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 03df19d..71bfbb7 100644 --- a/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordDTOMapper.java +++ b/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordDTOMapper.java @@ -1,6 +1,7 @@ package com.hzu.bookingsystem.repository; import com.hzu.bookingsystem.VO.WeekVO; +import com.hzu.bookingsystem.bean.LabRecordBean; import com.hzu.bookingsystem.dto.LabRecordDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -156,14 +157,15 @@ public interface LabRecordDTOMapper { List> getUserSchedule(Integer u_id, String year, Integer semester, Integer day, Integer time); /** - * 通过lab_id,uc_id以及4项时间查找审核详情 + * 通过lab_id,uc_id以及4项时间查找审核详情 */ @Select("SELECT " + " tb_lab.lab_id, " + - " tb_lab_time.`year`, " + - " tb_lab_time.semester, " + - " tb_lab_time.`day`, " + - " tb_lab_time.time, " + + " tb_lab_time.year, " + + " tb_lab_time.semester*1 AS semester, " + + " tb_lab_time.day*1 AS day, " + + " tb_lab_time.time*1 AS time, " + + " tb_user_course.uc_id, "+ " tb_lab_record.create_time, " + " tb_user.nickname, " + " tb_user.tel, " + @@ -195,5 +197,27 @@ public interface LabRecordDTOMapper { " tb_lab_time.semester, " + " tb_lab_time.`day`, " + " tb_lab_time.time") - Map getRecordDetail(Integer labId,Integer uc_id, String year, Integer semester, Integer day, Integer time); + Map getRecordDetail(Integer labId, Integer uc_id, String year, Integer semester, Integer day, Integer time); + + /** + * author 吴志岳 + * 查找审核详情所有符合的lr_id + */ + @Select("SELECT " + + " tb_lab_record.lr_id as lrId, tb_lab_record.lt_id as ltId, tb_lab_record.uc_id as ucId, tb_lab_record.status,tb_lab_record.refuse_reason as refuseReason,tb_lab_record.check_time as checkTime,tb_lab_record.create_time as createTime " + + "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_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 getRecordDetailLabRecordList(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 d2a98ea..53f80a9 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java +++ b/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java @@ -117,4 +117,11 @@ public interface LabRecordService { */ Map getRecordDetail(Integer labId,Integer uc_id, String year, Integer semester, Integer day, Integer time); + + /** + * 审核通过 + * author 吴志岳 + */ + void passRecord(Integer labId,Integer uc_id, String year, Integer semester, Integer day, Integer time); + } 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 753d2c6..d97a48c 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 @@ -24,6 +24,7 @@ import javax.persistence.PersistenceContext; import javax.persistence.Query; import javax.transaction.Transactional; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -227,5 +228,17 @@ public class LabRecordServiceImpl implements LabRecordService { return map; } + @Override + @Transactional + public void passRecord(Integer labId, Integer uc_id, String year, Integer semester, Integer day, Integer time) { + List labRecordBeanList = labRecordDTOMapper.getRecordDetailLabRecordList(labId,uc_id,year,semester,day,time); + System.out.println(labRecordBeanList); + for(LabRecordBean labRecordBean: labRecordBeanList){ + labRecordBean.setStatus(2); + labRecordBean.setCheckTime(new Date()); + update(labRecordBean); + } + } + }