feat:课表列表新增调整

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

@@ -1,9 +1,11 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -24,11 +26,23 @@ public class BatchCourseAdjustDto {
     @ApiModelProperty(value = "是否跳过节假日 true-跳过 false-不跳过", required = true)
     private Boolean isHoliday;
 
-    @ApiModelProperty(value = "开始时间", required = true)
+    @ApiModelProperty(value = "开始日期", required = true)
     private String startDate;
 
-    @ApiModelProperty(value = "排课循环方式", required = true)
-    private List<CourseTimeDto> courseTimeDtoList;
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "课程暂停时间")
+    private String pauseDate;
+
+    @ApiModelProperty(value = "课程恢复时间")
+    private String recoveryDate;
+
+    @ApiModelProperty(value = "老师设置", required = true)
+    private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
+
+    @ApiModelProperty(value = "教学形式")
+    private TeachModeEnum teachMode;
 
     @ApiModelProperty(value = "是否允许0课酬")
     private Boolean allowZeroSalary = false;
@@ -36,6 +50,57 @@ public class BatchCourseAdjustDto {
     @ApiModelProperty(value = "教学点")
     private Integer schoolId;
 
+    @ApiModelProperty(value = "确认生成课程")
+    private Boolean confirmGenerate = false;
+
+    public String getPauseDate() {
+        return pauseDate;
+    }
+
+    public void setPauseDate(String pauseDate) {
+        this.pauseDate = pauseDate;
+    }
+
+    public String getRecoveryDate() {
+        return recoveryDate;
+    }
+
+    public void setRecoveryDate(String recoveryDate) {
+        this.recoveryDate = recoveryDate;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public TeachModeEnum getTeachMode() {
+        return teachMode;
+    }
+
+    public void setTeachMode(TeachModeEnum teachMode) {
+        this.teachMode = teachMode;
+    }
+
+    public List<ClassGroupTeacherMapper> getClassGroupTeacherMapperList() {
+        return classGroupTeacherMapperList;
+    }
+
+    public void setClassGroupTeacherMapperList(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
+        this.classGroupTeacherMapperList = classGroupTeacherMapperList;
+    }
+
+    public Boolean getConfirmGenerate() {
+        return confirmGenerate;
+    }
+
+    public void setConfirmGenerate(Boolean confirmGenerate) {
+        this.confirmGenerate = confirmGenerate;
+    }
+
     public Boolean getChangeMainTeacher() {
         return changeMainTeacher;
     }
@@ -76,14 +141,6 @@ public class BatchCourseAdjustDto {
         this.startDate = startDate;
     }
 
-    public List<CourseTimeDto> getCourseTimeDtoList() {
-        return courseTimeDtoList;
-    }
-
-    public void setCourseTimeDtoList(List<CourseTimeDto> courseTimeDtoList) {
-        this.courseTimeDtoList = courseTimeDtoList;
-    }
-
     public Boolean getAllowZeroSalary() {
         return allowZeroSalary;
     }

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

@@ -2828,13 +2828,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(CollectionUtils.isEmpty(courseAdjustInfo.getCourseScheduleIds())){
 			return BaseController.failed("请指定需要调整的课程");
 		}
-		if(Objects.isNull(courseAdjustInfo.getStartDate())){
-			return BaseController.failed("请指定排课起始时间");
-		}
-		if(CollectionUtils.isEmpty(courseAdjustInfo.getCourseTimeDtoList())){
-			return BaseController.failed("请指定排课循环周期");
-		}
-
 
 		//未更新课程列表
 		List<CourseSchedule> oldCourses = courseScheduleDao.findByCourseScheduleIds(courseAdjustInfo.getCourseScheduleIds());
@@ -2847,16 +2840,26 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 
 		//获取主教编号
-//		Integer mainTeacherId = null;
-//		if(!CollectionUtils.isEmpty(courseAdjustInfo.getClassGroupTeacherMapperList())){
-//			ClassGroupTeacherMapper classGroupTeacherMapper = courseAdjustInfo.getClassGroupTeacherMapperList().stream().filter(c -> TeachTypeEnum.BISHOP.equals(c.getTeacherRole())).findAny().get();
-//			if(Objects.nonNull(classGroupTeacherMapper)){
-//				mainTeacherId = classGroupTeacherMapper.getUserId();
-//			}
-//		}
+		Integer mainTeacherId = null;
+		if(!CollectionUtils.isEmpty(courseAdjustInfo.getClassGroupTeacherMapperList())){
+			ClassGroupTeacherMapper classGroupTeacherMapper = courseAdjustInfo.getClassGroupTeacherMapperList().stream().filter(c -> TeachTypeEnum.BISHOP.equals(c.getTeacherRole())).findAny().get();
+			if(Objects.nonNull(classGroupTeacherMapper)){
+				mainTeacherId = classGroupTeacherMapper.getUserId();
+			}
+		}
 
+		if(Objects.nonNull(courseAdjustInfo.getPauseDate())&&Objects.nonNull(courseAdjustInfo.getPauseDate())){
+			Set<String> holidayDays = new HashSet<>();
+			if (courseAdjustInfo.getHoliday()) {
+				SysConfig holidaySetting = sysConfigService.findByParamName(SysConfigService.HOLIDAY_SETTING);
+				if(Objects.nonNull(holidaySetting)&&StringUtils.isNotBlank(holidaySetting.getParanValue())){
+					holidayDays = new HashSet<>(JSON.parseArray(holidaySetting.getParanValue(), String.class));
+				}
+			}
 
 
+		}
+
 		return BaseController.succeed();
 	}