课程转换

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

@@ -77,7 +77,7 @@ public class ClassGroup4MixDto implements Cloneable{
     private Boolean allowZeroSalary = false;
 
     @ApiModelProperty(value = "确认生成课程")
-    private Boolean confirmGenerate;
+    private Boolean confirmGenerate = false;
 
     @ApiModelProperty(value = "预排课学期编号")
     private Integer musicGroupSchoolTermCourseDetailId;

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

@@ -0,0 +1,75 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+public class CourseConvertClassDto{
+
+    @ApiModelProperty(value = "是否继续提交")
+    private Boolean checkCourseTimesFlag = false;
+
+    @ApiModelProperty(value = "老师设置", required = true)
+    private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
+
+    @ApiModelProperty(value = "排课次数", required = true)
+    private Integer courseTimes;
+
+    @ApiModelProperty(value = "排课循环方式", required = true)
+    private List<CourseTimeDto> courseTimeDtoList;
+
+    @ApiModelProperty(value = "是否允许0课酬")
+    private Boolean allowZeroSalary = false;
+
+    @ApiModelProperty(value = "确认生成课程")
+    private Boolean confirmGenerate = false;
+
+    public Boolean getCheckCourseTimesFlag() {
+        return checkCourseTimesFlag;
+    }
+
+    public void setCheckCourseTimesFlag(Boolean checkCourseTimesFlag) {
+        this.checkCourseTimesFlag = checkCourseTimesFlag;
+    }
+
+    public List<ClassGroupTeacherMapper> getClassGroupTeacherMapperList() {
+        return classGroupTeacherMapperList;
+    }
+
+    public void setClassGroupTeacherMapperList(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
+        this.classGroupTeacherMapperList = classGroupTeacherMapperList;
+    }
+
+    public Integer getCourseTimes() {
+        return courseTimes;
+    }
+
+    public void setCourseTimes(Integer courseTimes) {
+        this.courseTimes = courseTimes;
+    }
+
+    public List<CourseTimeDto> getCourseTimeDtoList() {
+        return courseTimeDtoList;
+    }
+
+    public void setCourseTimeDtoList(List<CourseTimeDto> courseTimeDtoList) {
+        this.courseTimeDtoList = courseTimeDtoList;
+    }
+
+    public Boolean getAllowZeroSalary() {
+        return allowZeroSalary;
+    }
+
+    public void setAllowZeroSalary(Boolean allowZeroSalary) {
+        this.allowZeroSalary = allowZeroSalary;
+    }
+
+    public Boolean getConfirmGenerate() {
+        return confirmGenerate;
+    }
+
+    public void setConfirmGenerate(Boolean confirmGenerate) {
+        this.confirmGenerate = confirmGenerate;
+    }
+}

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

@@ -1,18 +1,18 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupDto;
 
 import java.util.List;
 
 public class CourseConvertDto {
 
-    private List<ClassGroup> classGroups;
+    private List<ClassGroupDto> classGroups;
 
-    public List<ClassGroup> getClassGroups() {
+    public List<ClassGroupDto> getClassGroups() {
         return classGroups;
     }
 
-    public void setClassGroups(List<ClassGroup> classGroups) {
+    public void setClassGroups(List<ClassGroupDto> classGroups) {
         this.classGroups = classGroups;
     }
 }

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

@@ -40,7 +40,7 @@ public class CourseTimeDto {
     @ApiModelProperty(value = "是否跳过节假日 true-跳过 false-不跳过", required = true)
     private Boolean isHoliday = false;
 
-    @ApiModelProperty(value = "老师设置", required = true)
+    @ApiModelProperty(value = "课程老师设置", required = true)
     private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
 
     public int getExpectCourseMinutes() {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupDto.java

@@ -1,18 +1,26 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.dto.CourseTimeDto;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import java.util.ArrayList;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 public class ClassGroupDto extends BaseEntity {
 
+	@ApiModelProperty(value = "班级编号", required = true)
+	private Integer classGroupId;
+
+	@NotNull(message = "课程组类型不能为空")
+	@ApiModelProperty(value = "课程组类型", required = true)
 	private GroupType groupType;
 
+	private Boolean confirmGenerate = false;
+
 	/**  */
 	@ApiModelProperty(value = "乐团编号", required = true)
 	private String musicGroupId;
@@ -21,6 +29,7 @@ public class ClassGroupDto extends BaseEntity {
 	@ApiModelProperty(value = "科目编号(多个,号分割)", required = true)
 	private String subjectIdList;
 
+	@NotBlank(message = "学生编号不能为空")
 	@ApiModelProperty(value = "学生编号(多个,号分割)", required = true)
 	private String userIds;
 
@@ -34,9 +43,29 @@ public class ClassGroupDto extends BaseEntity {
 
 	/** 班级类型(普通班级、合奏班级) */
 	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级、试听课)", required = true)
+	@NotNull(message = "班级类型不能为空")
 	private ClassGroupTypeEnum type;
 
-	private List<ClassGroupTeacherMapper> teacherMapperList = new ArrayList<ClassGroupTeacherMapper>();
+	@ApiModelProperty(value = "班级老师设置", required = true)
+	private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
+
+	private List<CourseTimeDto> courseTimeDtoList;
+
+	public List<ClassGroupTeacherMapper> getClassGroupTeacherMapperList() {
+		return classGroupTeacherMapperList;
+	}
+
+	public void setClassGroupTeacherMapperList(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
+		this.classGroupTeacherMapperList = classGroupTeacherMapperList;
+	}
+
+	public Integer getClassGroupId() {
+		return classGroupId;
+	}
+
+	public void setClassGroupId(Integer classGroupId) {
+		this.classGroupId = classGroupId;
+	}
 
 	public GroupType getGroupType() {
 		return groupType;
@@ -46,6 +75,14 @@ public class ClassGroupDto extends BaseEntity {
 		this.groupType = groupType;
 	}
 
+	public Boolean getConfirmGenerate() {
+		return confirmGenerate;
+	}
+
+	public void setConfirmGenerate(Boolean confirmGenerate) {
+		this.confirmGenerate = confirmGenerate;
+	}
+
 	public String getMusicGroupId() {
 		return musicGroupId;
 	}
@@ -94,11 +131,11 @@ public class ClassGroupDto extends BaseEntity {
 		this.type = type;
 	}
 
-	public List<ClassGroupTeacherMapper> getTeacherMapperList() {
-		return teacherMapperList;
+	public List<CourseTimeDto> getCourseTimeDtoList() {
+		return courseTimeDtoList;
 	}
 
-	public void setTeacherMapperList(List<ClassGroupTeacherMapper> teacherMapperList) {
-		this.teacherMapperList = teacherMapperList;
+	public void setCourseTimeDtoList(List<CourseTimeDto> courseTimeDtoList) {
+		this.courseTimeDtoList = courseTimeDtoList;
 	}
 }

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

@@ -24,6 +24,8 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
     Integer create(ClassGroup classGroup);
 
+    void create1(List<ClassGroupDto> classGroups);
+
     /**
      * 查询老师乐团课课程
      *
@@ -295,7 +297,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param classGroup4MixDtos
      * @return
      */
-    HttpResponseResult classGroupUpdate(List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception;
+    HttpResponseResult<ClassGroup> classGroupUpdate(List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception;
 
     /**
      * 班级预排课

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.ClassGroupTeachersDto;
+import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.common.service.BaseService;
@@ -84,4 +85,13 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
      * @param newTeacherId
      */
     void batchUpdateTeacherByClassId(List<Integer> classGroupIds, Integer oldTeacherId,Integer newTeacherId);
+
+    /**
+    * @description: 添加班级老师关联
+     * @param classGroup
+    * @return java.util.List<java.lang.Integer>
+    * @author zx
+    * @date 2022/9/23 11:30
+    */
+    List<Integer> addMapper(ClassGroup classGroup);
 }

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

@@ -1,8 +1,10 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.CourseConvertDto;
+import com.ym.mec.biz.dal.entity.ClassGroupDto;
 
 import java.util.HashMap;
+import java.util.List;
 
 public interface CourseScheduleConvertService{
 
@@ -23,10 +25,10 @@ public interface CourseScheduleConvertService{
 
     /**
     * @description: 课程转换
-     * @param convertDto
+     * @param classGroups
     * @return java.lang.Boolean
     * @author zx
     * @date 2022/9/21 18:01
     */
-    Boolean action(CourseConvertDto convertDto);
+    Boolean action(List<ClassGroupDto> classGroups);
 }

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

@@ -28,6 +28,7 @@ import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateConvertor;
 import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -96,6 +97,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private ClassGroupTeacherMapperDao classGroupTeacherMapperDao;
     @Autowired
+    private ClassGroupTeacherMapperService classGroupTeacherMapperService;
+    @Autowired
     private CourseScheduleDao courseScheduleDao;
     @Autowired
     private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
@@ -194,6 +197,24 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         return pageInfo;
     }
 
+    //校验主教助教是否冲突
+    private void checkTeachingBishop(List<ClassGroupTeacherMapper> teacherMappers){
+        Set<Integer> collect = teacherMappers.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+        if (teacherMappers.size() != collect.size()) {
+            throw new BizException("主教与助教存在冲突");
+        }
+    }
+
+    private ClassGroup create(ClassGroupDto groupDto){
+        ClassGroup classGroup = new ClassGroup();
+        BeanUtils.copyProperties(groupDto,classGroup);
+        String userIds = classGroup.getUserIds();
+        Set<String> userIdStrSet = new HashSet<>(Arrays.asList(userIds.split(",")));
+        classGroup.setStudentNum(userIdStrSet.size());
+        this.insert(classGroup);
+        return classGroup;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer create(ClassGroup classGroup) {
@@ -203,11 +224,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (classGroup.getGroupType() == null) {
             throw new BizException("课程组类型不能为空");
         }
-        List<ClassGroupTeacherMapper> teacherMappers = classGroup.getTeacherMapperList();
-        Set<Integer> collect = teacherMappers.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
-        if (teacherMappers.size() != collect.size()) {
-            throw new BizException("主教与助教存在冲突");
-        }
+//        校验主教助教是否冲突
+        this.checkTeachingBishop(classGroup.getTeacherMapperList());
 
         //疫情原因去掉这块限制
         //基础技能班和线上基础技能班，可分班原则为声部人数/6向上取整
@@ -304,6 +322,73 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         return classGroup.getId();
     }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void create1(List<ClassGroupDto> classGroups) {
+        //校验主教助教是否冲突
+        classGroups.stream().forEach(e->checkTeachingBishop(e.getClassGroupTeacherMapperList()));
+        Date date = new Date();
+        for (ClassGroupDto groupDto : classGroups) {
+            //创建班级
+            ClassGroup classGroup = this.create(groupDto);
+            //设置班级上的老师
+            List<Integer> teacherIdList = classGroupTeacherMapperService.addMapper(classGroup);
+        }
+
+        //2、插入班级学生关联关系
+        List<Integer> userIdList = new ArrayList<>();
+        List<ClassGroupStudentMapper> classGroupStudentList = new ArrayList<>();
+        for (String userId : userIdStrSet) {
+            ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
+            classGroupStudentMapper.setMusicGroupId(classGroup.getMusicGroupId());
+            classGroupStudentMapper.setClassGroupId(classGroup.getId());
+            classGroupStudentMapper.setUserId(Integer.parseInt(userId));
+            classGroupStudentMapper.setCreateTime(date);
+            classGroupStudentMapper.setStatus(ClassGroupStudentStatusEnum.NORMAL);
+            classGroupStudentMapper.setGroupType(MUSIC);
+            classGroupStudentList.add(classGroupStudentMapper);
+
+            StudentRegistration studentRegistration = new StudentRegistration();
+            studentRegistration.setClassGroupId(classGroup.getId());
+            studentRegistration.setUserId(Integer.parseInt(userId));
+            studentRegistration.setMusicGroupId(classGroup.getMusicGroupId());
+            studentRegistrationDao.updateByUserIdAndMusicGroupId(studentRegistration);
+
+            userIdList.add(Integer.parseInt(userId));
+        }
+        if (classGroupStudentList.size() > 0) {
+            classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentList);
+        }
+
+        // 加入IM群组
+        if (userIdList.size() > 0) {
+            addImGroup(classGroup, userIdList, teacherIdList);
+        } else {
+            MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
+            Map<Integer, String> userRoleMap = new HashMap<>();
+            if (musicGroup.getEducationalTeacherId() != null) {
+                userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
+            }
+            if (musicGroup.getTeamTeacherId() != null) {
+                userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
+            }
+            if (musicGroup.getDirectorUserId() != null) {
+                userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
+            }
+            if (musicGroup.getTransactionTeacherId() != null) {
+                userRoleMap.put(musicGroup.getTransactionTeacherId(), "衔接老师");
+            }
+            if (teacherIdList != null && teacherIdList.size() > 0) {
+                for (Integer teacherId : teacherIdList) {
+                    userRoleMap.put(teacherId, "指导老师");
+                }
+            }
+            imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), musicGroup.getName(),
+                    musicGroup.getName(), musicGroup.getName(), null, "MUSIC", ImGroup.GroupTypeEnum.valueOf(classGroup.getType().getCode()));
+            imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
+        }
+        return classGroup.getId();
+    }
 
     @Override
     public List<ClassGroup> findClassGroup4Teacher(Integer teacherId) {
@@ -2369,11 +2454,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HttpResponseResult classGroupUpdate(List<ClassGroup4MixDto> classGroup4MixDtos) {
+    public HttpResponseResult<ClassGroup> classGroupUpdate(List<ClassGroup4MixDto> classGroup4MixDtos) {
         Date date = new Date();
-        Integer classGroupId = classGroup4MixDtos.get(0).getClassGroupId();
-        String musicGroupId = classGroup4MixDtos.get(0).getMusicGroupId();
-//        Boolean checkCourseTimesFlag = classGroup4MixDtos.get(0).getCheckCourseTimesFlag();
+        ClassGroup4MixDto classGroup4MixDto1 = classGroup4MixDtos.get(0);
+        Integer classGroupId =classGroup4MixDto1.getClassGroupId();
+        String musicGroupId =classGroup4MixDto1.getMusicGroupId();
+//        Boolean checkCourseTimesFlag =classGroup4MixDto1.getCheckCourseTimesFlag();
         ClassGroup classGroup = classGroupDao.get(classGroupId);
         if (classGroup == null) {
             throw new BizException("班级不存在");
@@ -2381,8 +2467,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
 
         Boolean confirmGenerate = false;
-        if (Objects.nonNull(classGroup4MixDtos.get(0).getConfirmGenerate())) {
-            confirmGenerate = classGroup4MixDtos.get(0).getConfirmGenerate();
+        if (Objects.nonNull(classGroup4MixDto1.getConfirmGenerate())) {
+            confirmGenerate =classGroup4MixDto1.getConfirmGenerate();
         }
 
         TeachModeEnum teachMode = TeachModeEnum.OFFLINE;
@@ -2391,9 +2477,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
 
         //1、更新班级关联老师信息
-        if (Objects.nonNull(classGroup4MixDtos.get(0).getCourseAddType()) && classGroup4MixDtos.get(0).getCourseAddType().equals("onlyUpdateTeacher")) {
+        if (Objects.nonNull(classGroup4MixDto1.getCourseAddType()) &&classGroup4MixDto1.getCourseAddType().equals("onlyUpdateTeacher")) {
             List<ClassGroupTeacherMapper> byClassGroup = classGroupTeacherMapperDao.findByClassGroup(classGroupId);
-            List<ClassGroupTeacherMapper> newTeacherMapperList = classGroup4MixDtos.get(0).getClassGroupTeacherMapperList();
+            List<ClassGroupTeacherMapper> newTeacherMapperList =classGroup4MixDto1.getClassGroupTeacherMapperList();
             Set<Integer> collect = newTeacherMapperList.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
             if (newTeacherMapperList.size() != collect.size()) {
                 throw new BizException("主教与助教存在冲突");

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

@@ -376,4 +376,24 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     public void batchUpdateTeacherByClassId(List<Integer> classGroupIds, Integer oldTeacherId, Integer newTeacherId) {
         classGroupTeacherMapperDao.batchUpdateTeacherByClassId(classGroupIds,oldTeacherId,newTeacherId);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<Integer> addMapper(ClassGroup classGroup) {
+        List<ClassGroupTeacherMapper> teacherMapperList = classGroup.getTeacherMapperList();
+        if(CollectionUtils.isEmpty(teacherMapperList)){
+            return new ArrayList<>();
+        }
+        List<Integer> teacherIdList = new ArrayList<>();
+        for (ClassGroupTeacherMapper tm : teacherMapperList) {
+            tm.setClassGroupId(classGroup.getId());
+            tm.setMusicGroupId(classGroup.getMusicGroupId());
+            tm.setGroupType(classGroup.getGroupType());
+            tm.setCreateTime(classGroup.getUpdateTime());
+            tm.setUpdateTime(classGroup.getUpdateTime());
+            teacherIdList.add(tm.getUserId());
+        }
+        classGroupTeacherMapperDao.classGroupTeachersInsert(teacherMapperList);
+        return teacherIdList;
+    }
 }

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

@@ -8,6 +8,8 @@ import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.CourseConvertDto;
 import com.ym.mec.biz.dal.dto.CourseConvertSumDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupDto;
+import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.CourseScheduleConvertService;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.common.exception.BizException;
@@ -27,6 +29,8 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
     private CourseScheduleConvertDao courseScheduleConvertDao;
     @Autowired
     private StudentDao studentDao;
+    @Autowired
+    private ClassGroupService classGroupService;
 
     @Override
     public HashMap<String, Object> queryConvertStudent(String courseIds) {
@@ -47,9 +51,11 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
     }
 
     @Override
-    public Boolean action(CourseConvertDto convertDto) {
-        List<ClassGroup> classGroups = convertDto.getClassGroups();
-
+    public Boolean action(List<ClassGroupDto> classGroups) {
+        //创建班级
+        classGroupService.create1(classGroups);
+        //班级加学员
+        //排课
         return null;
     }
 

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -58,8 +58,7 @@
             <if test="subjectIdList!=null">subject_id_list_,</if>
             <if test="name!=null">name_,</if>
             <if test="studentNum!=null">student_num_,</if>
-            <if test="createTime!=null">create_time_,</if>
-            <if test="updateTime!=null">update_time_,</if>
+            create_time_,update_time_,
             <if test="type!=null">type_,</if>
             <if test="expectStudentNum!=null">expect_student_num_,</if>
             <if test="totalClassTimes!=null">total_class_times_,</if>
@@ -77,8 +76,7 @@
             <if test="subjectIdList!=null">#{subjectIdList},</if>
             <if test="name!=null">#{name},</if>
             <if test="studentNum!=null">#{studentNum},</if>
-            <if test="createTime!=null">#{createTime},</if>
-            <if test="updateTime!=null">NOW(),</if>
+            NOW(),NOW(),
             <if test="type!=null">#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
             <if test="expectStudentNum!=null">#{expectStudentNum},</if>
             <if test="totalClassTimes!=null">#{totalClassTimes},</if>

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -259,7 +259,7 @@ public class ClassGroupController extends BaseController {
     @PostMapping("/classGroupUpdate")
     @PreAuthorize("@pcs.hasPermissions('classGroup/classGroupUpdate')")
     @ApiImplicitParams({@ApiImplicitParam(name = "ClassGroup4MixDto", value = "添加班级结构", required = true, dataType = "String")})
-    public HttpResponseResult classGroupUpdate(@RequestBody List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception {
+    public HttpResponseResult<ClassGroup> classGroupUpdate(@RequestBody List<ClassGroup4MixDto> classGroup4MixDtos) throws Exception {
         return classGroupService.classGroupUpdate(classGroup4MixDtos);
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleConvertController.java

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.CourseConvertDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
+import com.ym.mec.biz.dal.entity.ClassGroupDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.page.UserBasicQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleConvertService;
@@ -48,8 +49,8 @@ public class CourseScheduleConvertController extends BaseController {
     @ApiOperation(value = "课程转换")
     @GetMapping("/action")
     @PreAuthorize("@pcs.hasPermissions('courseScheduleConvert/action')")
-    public HttpResponseResult<Boolean> action(@RequestBody CourseConvertDto convertDto){
-        return succeed(courseScheduleConvertService.action(convertDto));
+    public HttpResponseResult<Boolean> action(@RequestBody List<ClassGroupDto> classGroups){
+        return succeed(courseScheduleConvertService.action(classGroups));
     }