|
@@ -1953,7 +1953,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
if (i == 1) {
|
|
|
i = 7;
|
|
|
} else {
|
|
|
- i = --i;
|
|
|
+ i = i - 1;
|
|
|
}
|
|
|
for (CourseTimeDto courseTime : vipGroupCourseAdjustInfo.getCourseTimes()) {
|
|
|
if (Objects.isNull(courseTime.getDayOfWeek())) {
|
|
@@ -1963,8 +1963,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
throw new BizException("排课循环周期错误");
|
|
|
}
|
|
|
if (courseTime.getDayOfWeek() == i) {
|
|
|
- String dateYmdStr = DateUtil.dateToString(calendar.getTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
|
|
|
- dateYmdStr = dateYmdStr + " " + courseTime.getStartClassTime();
|
|
|
+ String dateYmdStr = courseTime.getStartClassTime();
|
|
|
Date courseStartTime = DateUtil.stringToDate(dateYmdStr, "yyyy-MM-dd HH:mm");
|
|
|
Date courseEndTime = DateUtil.addMinutes(courseStartTime, singleClassMinutes);
|
|
|
if(DateUtil.daysBetween(DateUtil.stringToDate(DateUtil.format(courseStartTime,DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN),
|