1、添加教务老师字段

2、布置作业

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -411,7 +411,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @param courseGenerateDto: 排课信息
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
 	 */
-	List<CourseSchedule> createCourses(CourseGenerateDto courseGenerateDto);
+	List<CourseSchedule> createCourses(CourseGenerateDto courseGenerateDto, boolean excludePastCourse);
 
 	/**
 	 * @describe 终极课表获取接口

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

@@ -3495,7 +3495,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     }
 
     @Override
-    public List<CourseSchedule> createCourses(CourseGenerateDto courseGenerateInfo) {
+    public List<CourseSchedule> createCourses(CourseGenerateDto courseGenerateInfo, boolean excludePastCourse) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(courseGenerateInfo.getCourseCreateStartTime());
 
@@ -3513,6 +3513,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         }
 
         List<CourseSchedule> courseSchedules = new ArrayList<>();
+        Date now=new Date();
 
         while (true) {
             if (courseGenerateInfo.isSkipHoliday() && !holiday.containsKey(calendar.get(Calendar.YEAR))) {
@@ -3540,6 +3541,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     String dateYmdStr = DateUtil.dateToString(calendar.getTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
                     dateYmdStr = dateYmdStr + " " + courseTime.getStartClassTime();
                     Date courseStartTime = DateUtil.stringToDate(dateYmdStr, "yyyy-MM-dd HH:mm");
+                    if(excludePastCourse&&courseStartTime.before(now)){
+                    	continue;
+					}
                     Date courseEndTime = DateUtil.addMinutes(courseStartTime, courseGenerateInfo.getSingleClassMinutes());
                     CourseSchedule courseSchedule = new CourseSchedule();
                     courseSchedule.setClassDate(courseStartTime);

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

@@ -129,7 +129,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
         courseGroup.setSingleClassMinutes(courseCycleInfo.getSingleClassMinutes());
         courseGroup.setStatus(GroupStatusEnum.NORMAL);
         courseGroup.setOrganId(teacher.getOrganId());
-        List<CourseSchedule> newCourses = courseScheduleService.createCourses(courseGroupCreateInfo.getCourseCycleInfo());
+        List<CourseSchedule> newCourses = courseScheduleService.createCourses(courseGroupCreateInfo.getCourseCycleInfo(),true);
         for (CourseSchedule newCourse : newCourses) {
             newCourse.setTeachMode(TeachModeEnum.ONLINE);
             newCourse.setGroupType(GroupType.COMM);

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

@@ -1681,7 +1681,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			Map<String, Object> courseInfo1 = JSON.parseObject(studentPauseInfo1.getCoursesJson(), Map.class);
 			Integer[] teachModeSequence1=JSON.parseArray(courseInfo1.get("teaChModeSequence").toString(), Integer.class).stream().toArray(Integer[]::new);
 			studentRecoverInfo.setCourseCount(teachModeSequence1.length);
-			List<CourseSchedule> newCourseSchedules = courseScheduleService.createCourses(studentRecoverInfo);
+			List<CourseSchedule> newCourseSchedules = courseScheduleService.createCourses(studentRecoverInfo,false);
 			for(int i=0;i<newCourseSchedules.size();i++){
 				if(newCourseSchedules.get(i).getStartClassTime().before(now)){
 					throw new BizException("排课起始时间不得小于当前时间");