|
|
@@ -2882,7 +2882,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
|
|
|
//上课日期变更
|
|
|
//间隔天数
|
|
|
- int betweenDays = 0, tempBetweenDays = 0;
|
|
|
+ int betweenDays = 0;
|
|
|
//节假日
|
|
|
Set<String> holidayDays = new HashSet<>();
|
|
|
if(Objects.nonNull(courseAdjustInfo.getPauseDate())&&Objects.nonNull(courseAdjustInfo.getRecoveryDate())){
|
|
|
@@ -2897,7 +2897,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
LocalDate recoveryDate = LocalDate.parse(courseAdjustInfo.getRecoveryDate(), DateUtil.dateFormatter);
|
|
|
|
|
|
betweenDays = (int) (recoveryDate.toEpochDay()-pauseDate.toEpochDay());
|
|
|
- tempBetweenDays = betweenDays;
|
|
|
}
|
|
|
|
|
|
//上课时间变更
|
|
|
@@ -2919,15 +2918,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
throw new BizException("选择的课程中存在进行中或已结束的课程，无法进行调整");
|
|
|
}
|
|
|
//上课日期变更
|
|
|
- if(tempBetweenDays!=0){
|
|
|
+ if(betweenDays!=0){
|
|
|
LocalDate classDate = LocalDateTime.ofInstant(oldCourses.get(i).getClassDate().toInstant(), DateUtil.zoneId).toLocalDate();
|
|
|
- classDate = classDate.plusDays(tempBetweenDays);
|
|
|
+ classDate = classDate.plusDays(betweenDays);
|
|
|
if (courseAdjustInfo.getHoliday() && holidayDays.contains(classDate.toString())) {
|
|
|
- tempBetweenDays=tempBetweenDays+7;
|
|
|
+ betweenDays=betweenDays+7;
|
|
|
i=i-1;
|
|
|
continue;
|
|
|
}
|
|
|
- tempBetweenDays = betweenDays;
|
|
|
oldCourses.get(i).setClassDate(Date.from(classDate.atStartOfDay().atZone(DateUtil.zoneId).toInstant()));
|
|
|
}
|
|
|
|
Joburgess