diff --git a/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordRepository.java b/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordRepository.java index a22da5c..90454cf 100644 --- a/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordRepository.java +++ b/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordRepository.java @@ -24,6 +24,7 @@ public interface LabRecordRepository extends JpaRepository void deleteBylrId(Integer lt_id); + LabRecordBean findByUcId(Integer uc_id); 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 674464f..4b0d398 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java +++ b/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java @@ -48,7 +48,21 @@ public interface LabRecordService { */ void deleteById(Integer lr_id); + /** + * 根据ucid查出实验室记录 + * @param uc_id + * @return + */ + LabRecordBean findByUcId(Integer uc_id); + /** + * 根据教师id和学年,学期查询课表 + * @param u_id + * @param year + * @param semester + * @return + */ + String[][][] getcourseByuser(Integer u_id , String year ,Integer semester ) ; 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 2fb1bfd..fec070e 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 @@ -1,8 +1,12 @@ package com.hzu.bookingsystem.service.impl; import com.hzu.bookingsystem.bean.LabRecordBean; +import com.hzu.bookingsystem.bean.LabTimeBean; +import com.hzu.bookingsystem.bean.UserCourseBean; import com.hzu.bookingsystem.repository.LabRecordRepository; import com.hzu.bookingsystem.service.LabRecordService; +import com.hzu.bookingsystem.service.LabTimeService; +import com.hzu.bookingsystem.service.UserCourseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,6 +18,10 @@ import java.util.List; public class LabRecordServiceImpl implements LabRecordService{ @Resource private LabRecordRepository labrecordRepository; + @Resource + private UserCourseService usercourseservice ; + @Resource + private LabTimeService labtimeservice ; @Override public LabRecordBean add(LabRecordBean labrcecord) { @@ -23,10 +31,12 @@ public class LabRecordServiceImpl implements LabRecordService{ @Override public List findAll() { + return labrecordRepository.findAll(); } @Override public List findByStatus(Integer status) { + return labrecordRepository.findByStatus(status); } @@ -46,4 +56,27 @@ public class LabRecordServiceImpl implements LabRecordService{ labrecordRepository.deleteBylrId(lr_id); } + + @Override + public LabRecordBean findByUcId(Integer uc_id) { + return labrecordRepository.findByUcId(uc_id); + } + + @Override + public String[][][] getcourseByuser(Integer u_id , String year ,Integer semester ) { + String value[][][] = new String[7][5][20] ; + List usercourses=usercourseservice.findAllByUidAndYearAndSemester(u_id,year,semester) ; + for ( UserCourseBean uc : usercourses) + { + LabRecordBean labrecord = findByUcId(uc.getUcId()) ; + LabTimeBean labtime=labtimeservice.findByLtId(labrecord.getLtId()); + + Integer day= Integer.valueOf(labtime.getTime()) -1 ; + Integer time= Integer.valueOf(labtime.getTime()) -1 ; + Integer week= Integer.valueOf(labtime.getWeek()) -1 ; + + value[day][time][week] =uc.getName() ; + } + return value ; + } }