课程转换

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
 import com.ym.mec.biz.dal.dto.ClassGroupTeachersDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupDto;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.common.service.BaseService;
@@ -90,12 +91,12 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
 
     /**
     * @description: 添加班级老师关联
-     * @param classGroup
+     * @param groupDto
     * @return java.util.List<java.lang.Integer>
     * @author zx
     * @date 2022/9/23 11:30
     */
-    List<Integer> addMapper(ClassGroup classGroup);
+    List<Integer> addMapper(ClassGroupDto groupDto);
 
     /**
     * @description: 校验老师是否冲突

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

@@ -379,18 +379,17 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<Integer> addMapper(ClassGroup classGroup) {
-        List<ClassGroupTeacherMapper> teacherMapperList = classGroup.getTeacherMapperList();
+    public List<Integer> addMapper(ClassGroupDto groupDto) {
+        List<ClassGroupTeacherMapper> teacherMapperList = groupDto.getClassGroupTeacherMapperList();
         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());
+            tm.setClassGroupId(groupDto.getClassGroupId());
+            tm.setMusicGroupId(groupDto.getMusicGroupId());
+            tm.setGroupType(groupDto.getGroupType());
+            tm.setTenantId(groupDto.getTenantId());
             teacherIdList.add(tm.getUserId());
         }
         classGroupTeacherMapperDao.classGroupTeachersInsert(teacherMapperList);

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

@@ -103,7 +103,7 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
             classGroupService.insert(classGroup);
             groupDto.setClassGroupId(classGroup.getId());
             //设置班级上的老师
-            classGroupTeacherMapperService.addMapper(classGroup);
+            classGroupTeacherMapperService.addMapper(groupDto);
             //2、插入班级学生关联关系
             classGroupStudentMapperService.addMapper(classGroup,userIdStrSet);
             //排课