解决课表查询bug

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -192,12 +192,13 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             tableVo.setSemesterName(baseSemester.getName());
             LocalDateTime now = LocalDateTime.now();
             //计算本周是第几周
+            LocalDateTime startDateTime = LocalDateTime.ofInstant(baseSemester.getStartDate().toInstant(), ZoneId.systemDefault());
+            LocalDateTime endDateTime = LocalDateTime.ofInstant(baseSemester.getEndDate().toInstant(), ZoneId.systemDefault());
+            Duration between = Duration.between(startDateTime, endDateTime);
+            long days = between.toDays();
+            int weeks = (int) Math.ceil((double) days / 7);
             if(dto.getWeek() == null){
-                LocalDateTime startDateTime = LocalDateTime.ofInstant(baseSemester.getStartDate().toInstant(), ZoneId.systemDefault());
-                LocalDateTime endDateTime = LocalDateTime.ofInstant(baseSemester.getEndDate().toInstant(), ZoneId.systemDefault());
-                Duration between = Duration.between(startDateTime, endDateTime);
-                long days = between.toDays();
-                int weeks = (int) Math.ceil((double) days / 7);
+
                 for (int i = 0; i < weeks; i ++){
                     LocalDateTime startDate = startDateTime.plusDays(i * 7).withHour(0).withMinute(0).withSecond(0).withNano(0);
                     LocalDateTime endDate = startDateTime.plusDays((i + 1) * 7).withHour(23).withMinute(59).withSecond(59).withNano(9999);
@@ -206,6 +207,10 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                     }
                 }
             }else{
+                LocalDateTime startDate = startDateTime.plusDays((dto.getWeek() - 1) * 7).withHour(0).withMinute(0).withSecond(0).withNano(0);
+                LocalDateTime endDate = startDateTime.plusDays(dto.getWeek() * 7).withHour(23).withMinute(59).withSecond(59).withNano(9999);
+                dto.setStartDate(startDate);
+                dto.setEndDate(endDate);
                 tableVo.setWeek("第" + dto.getWeek() + "周");
             }
 

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -140,8 +140,10 @@ public class ScheduleController {
     @ApiOperation(value="今日课表接口(手机端)")
     @SaCheckPermission("room:detail")
     public RT<CourseTableVo> courseInfoDay(CourseTableDto dto){
-        DayOfWeek dayOfWeek = LocalDateTime.now().getDayOfWeek();
+        LocalDateTime now = LocalDateTime.now();
+        DayOfWeek dayOfWeek = now.getDayOfWeek();
         dto.setWeekDay(dayOfWeek.getValue());
+        dto.setToDay(now);
         if(ObjectUtil.isNotNull(dto.getStudentId())){
             List<BaseStudentSchoolRoll> schoolRolls = baseStudentSchoolRollService.list(
                     new QueryWrapper<BaseStudentSchoolRoll>().lambda().eq(BaseStudentSchoolRoll::getUserId, dto.getStudentId())

src/main/java/com/xjrsoft/module/schedule/dto/CourseTableDto.java

@@ -52,4 +52,7 @@ public class CourseTableDto implements Serializable {
     @ApiModelProperty("结束时间")
     private LocalDateTime endDate;
 
+    @ApiModelProperty("当前日期")
+    private LocalDateTime toDay;
+
 }