From 6594326c505877baaaf13b3257cfb66f193138d1 Mon Sep 17 00:00:00 2001 From: 17727267930 <2419194071@qq.com> Date: Sun, 24 May 2020 19:25:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9F=A5=E7=9C=8B=E6=95=99?= =?UTF-8?q?=E5=B8=88=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/LabRecordRepository.java | 2 +- .../service/LabRecordService.java | 2 +- .../service/impl/LabRecordServiceImpl.java | 43 ++++++++++--------- .../BookingsystemApplicationTests.java | 22 ++++++++-- 4 files changed, 44 insertions(+), 25 deletions(-) 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 6ab5b71..1595fbf 100644 --- a/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordRepository.java +++ b/java/src/main/java/com/hzu/bookingsystem/repository/LabRecordRepository.java @@ -24,7 +24,7 @@ public interface LabRecordRepository extends JpaRepository void deleteBylrId(Integer lt_id); - LabRecordBean findByUcIdAndStatus(Integer uc_id , Integer status); + List findByUcIdAndStatus(Integer uc_id , Integer status); 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 dbb26ed..43a11b1 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java +++ b/java/src/main/java/com/hzu/bookingsystem/service/LabRecordService.java @@ -53,7 +53,7 @@ public interface LabRecordService { * @param uc_id * @return */ - LabRecordBean findByUcIdAndStatus(Integer uc_id,Integer status); + List findByUcIdAndStatus(Integer uc_id,Integer status); /** * 根据教师id和学年，学期查询课表 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 2ec1518..e49e39c 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 @@ -62,7 +62,7 @@ public class LabRecordServiceImpl implements LabRecordService{ @Override - public LabRecordBean findByUcIdAndStatus(Integer uc_id , Integer status) { + public List findByUcIdAndStatus(Integer uc_id , Integer status) { return labrecordRepository.findByUcIdAndStatus(uc_id , status); } @@ -75,28 +75,31 @@ public class LabRecordServiceImpl implements LabRecordService{ for ( UserCourseBean uc : usercourses) { - LabRecordBean labrecord = findByUcIdAndStatus(uc.getUcId(),2) ; - LabTimeBean labtime=labtimeservice.findByLtId(labrecord.getLtId()); + List labrecordlist = findByUcIdAndStatus(uc.getUcId(),2) ; + + UserBean user= userservice.findById(uc.getUId()); // System.out.println(uc.getUcId() +"\t"+labrecord.getLtId()+uc.getUId()); - - Integer day= Integer.valueOf(labtime.getTime()) -1 ; - Integer time= Integer.valueOf(labtime.getTime()) -1 ; - Integer week= Integer.valueOf(labtime.getWeek()) -1 ; - String val = uc.getName()+" "+user.getNickname()+"\n"+ uc.getClasses()+" "+uc.getPopulation() +"\n"; - value[day][time][week] =val ; + for ( LabRecordBean labrecord:labrecordlist) { + 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; + String val = uc.getName( ) + " " + user.getNickname( ) + "\n" + uc.getClasses( ) + " " + uc.getPopulation( ) + "\n"; + value[day][time][week] = val; + } } -// -// for (int i = 0 ; i < 7 ; ++ i ) { -// -// for (int j = 0; j < 5; ++j) { -// for (int k = 0; k < 19; ++k) { -// if (value[i][j][k]!= null) -// System.out.println("第"+(k+1)+"周的第"+(i+1)+"天的第"+(j+1)+"节"+value[i][j][k]+"\t"); -// } -// } -// } + + for (int i = 0 ; i < 7 ; ++ i ) { + + for (int j = 0; j < 5; ++j) { + for (int k = 0; k < 19; ++k) { + if (value[i][j][k]!= null) + System.out.println("第"+(k+1)+"周的第"+(i+1)+"天的第"+(j+1)+"节"+value[i][j][k]+"\t"); + } + } + } for (int i = 0 ; i < 7 ; ++ i ){ for ( int j = 0 ; j < 5 ; ++ j ){ @@ -108,7 +111,7 @@ public class LabRecordServiceImpl implements LabRecordService{ { if (value_name[i][j] == null) value_name[i][j] = ""; value_name[i][j] =value_name[i][j] +value[i][j][k] ; - value_name[i][j]= value_name[i][j] +"第"+ k+"周\n"; + value_name[i][j]= value_name[i][j] +"第"+ (k+1)+"周\n"; } if ( value[i][j][k]!= null&&value[i][j][k].equals(value[i][j][k+1])) { diff --git a/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java b/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java index 8c21e38..8f4822d 100644 --- a/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java +++ b/java/src/test/java/com/hzu/bookingsystem/BookingsystemApplicationTests.java @@ -32,6 +32,8 @@ class BookingsystemApplicationTests { @Autowired private LabTimeService labTimeService; + @Autowired + private LabRecordService labrecordervice; @Test @@ -49,12 +51,26 @@ class BookingsystemApplicationTests { // labService.deleteById(1); // // } - public void test() { - LabTimeBean lab = new LabTimeBean(); - System.out.println(labTimeService.findAll()); +// public void test() { +// LabTimeBean lab = new LabTimeBean(); +// System.out.println(labTimeService.findAll()); +// +// } +//} + + public void test_course() { + String value[][] = labrecordervice.getcourseByuser(13, "2019", 2); + for (int i = 0; i < 7; ++i) + for (int j = 0; j < 5; ++j) { + if (value[i][j] != null) + System.out.println("第" + (i + 1) + "天的第" + (j + 1) + "节：\n" + value[i][j]); + + } } } + + /* @Autowired private UserService userService;