双周排课

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseTimeDto.java

@@ -16,6 +16,9 @@ public class CourseTimeDto {
     @ApiModelProperty(value = "课程类型", required = true)
     private CourseSchedule.CourseScheduleType courseType;
 
+    @ApiModelProperty(value = "开始排课时间（原来按周排课参数，从外层，提到内层）")
+    private Date courseCreateStartTime;
+
     @ApiModelProperty(value = "排课星期几")
     private Integer dayOfWeek;
     //当前排课日期

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupCourseAdjustInfoDto.java

@@ -23,7 +23,7 @@ public class VipGroupCourseAdjustInfoDto {
     @ApiModelProperty(value = "需要调整的vip课排课计划的编号")
     private String courseScheduleIds;
 
-    @ApiModelProperty(value = "开始排课时间")
+    @ApiModelProperty(value = "开始排课时间（兼容历史版本）")
     private Date courseCreateStartTime;
 
     @ApiModelProperty(value = "教学形式")

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -1606,9 +1606,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(StringUtils.isBlank(courseAdjustInfo.getCourseScheduleIds())){
 			throw new BizException("请指定课程");
 		}
-		if(Objects.isNull(courseAdjustInfo.getCourseCreateStartTime())){
-			throw new BizException("请指定课程调整起始时间");
-		}
 		if(Objects.isNull(courseAdjustInfo.getCourseTimes())){
 			throw new BizException("请指定课程调整周期");
 		}
@@ -1637,9 +1634,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 			return null;
 		}));
-
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(courseAdjustInfo.getCourseCreateStartTime());
 		List<Date> courseStartDates = new ArrayList<>();
 
 		Set<String> holidayDays = new HashSet<>();
@@ -1657,13 +1651,18 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}};
 		while (true) {
 			for (CourseTimeDto courseTime : courseAdjustInfo.getCourseTimes()) {
+				if(courseTime.getCourseCreateStartTime() == null){
+					courseTime.setCourseCreateStartTime(courseAdjustInfo.getCourseCreateStartTime());
+				}
 				if (courseTime.getCalendar() == null) {
+					Calendar calendar = Calendar.getInstance();
+					calendar.setTime(courseTime.getCourseCreateStartTime());
 					courseTime.setCalendar(calendar);
 				}
 				while (courseAdjustInfo.isHoliday() && holidayDays.contains(DateUtil.format(courseTime.getCalendar().getTime(), "yyyy-MM-dd"))) {
 					courseTime.getCalendar().add(Calendar.DATE, courseTime.getIntervalDays());
 				}
-				String dateYmdStr = DateUtil.dateToString(calendar.getTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
+				String dateYmdStr = DateUtil.dateToString(courseTime.getCalendar().getTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
 				dateYmdStr = dateYmdStr + " " + courseTime.getStartClassTime();
 				Date courseStartTime = DateUtil.stringToDate(dateYmdStr, "yyyy-MM-dd HH:mm");