feat:欠费列表新增缴费类型

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
 
@@ -14,12 +15,12 @@ public class BatchCourseAdjustDto {
     @ApiModelProperty(value = "需要调整的课程编号")
     private List<Long> courseScheduleIds;
 
+    @ApiModelProperty(value = "是否修改主教")
+    private Boolean changeMainTeacher = false;
+
     @ApiModelProperty(value = "是否修改助教")
     private Boolean changeTeachingTeacher = true;
 
-    @ApiModelProperty(value = "老师设置", required = true)
-    private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
-
     @ApiModelProperty(value = "是否跳过节假日 true-跳过 false-不跳过", required = true)
     private Boolean isHoliday;
 
@@ -35,20 +36,20 @@ public class BatchCourseAdjustDto {
     @ApiModelProperty(value = "教学点")
     private Integer schoolId;
 
-    public List<Long> getCourseScheduleIds() {
-        return courseScheduleIds;
+    public Boolean getChangeMainTeacher() {
+        return changeMainTeacher;
     }
 
-    public void setCourseScheduleIds(List<Long> courseScheduleIds) {
-        this.courseScheduleIds = courseScheduleIds;
+    public void setChangeMainTeacher(Boolean changeMainTeacher) {
+        this.changeMainTeacher = changeMainTeacher;
     }
 
-    public List<ClassGroupTeacherMapper> getClassGroupTeacherMapperList() {
-        return classGroupTeacherMapperList;
+    public List<Long> getCourseScheduleIds() {
+        return courseScheduleIds;
     }
 
-    public void setClassGroupTeacherMapperList(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
-        this.classGroupTeacherMapperList = classGroupTeacherMapperList;
+    public void setCourseScheduleIds(List<Long> courseScheduleIds) {
+        this.courseScheduleIds = courseScheduleIds;
     }
 
     public Boolean getChangeTeachingTeacher() {

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

@@ -2834,20 +2834,28 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(CollectionUtils.isEmpty(courseAdjustInfo.getCourseTimeDtoList())){
 			return BaseController.failed("请指定排课循环周期");
 		}
+
+
 		//未更新课程列表
 		List<CourseSchedule> oldCourses = courseScheduleDao.findByCourseScheduleIds(courseAdjustInfo.getCourseScheduleIds());
 
-		//删除教师课酬：如果助教不变更，则只更新主教课酬
-		courseScheduleTeacherSalaryDao.deleteWithCourseAndTeachRole(courseAdjustInfo.getCourseScheduleIds(), courseAdjustInfo.getChangeTeachingTeacher()?null:TeachTypeEnum.BISHOP);
+		if(courseAdjustInfo.getChangeMainTeacher()){
+			courseScheduleTeacherSalaryDao.deleteWithCourseAndTeachRole(courseAdjustInfo.getCourseScheduleIds(), TeachTypeEnum.BISHOP);
+		}
+		if(courseAdjustInfo.getChangeMainTeacher()){
+			courseScheduleTeacherSalaryDao.deleteWithCourseAndTeachRole(courseAdjustInfo.getCourseScheduleIds(), TeachTypeEnum.TEACHING);
+		}
 
 		//获取主教编号
-		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();
+//			}
+//		}
+
+
 
 		return BaseController.succeed();
 	}