临时拆合班增加课程类型

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

@@ -186,14 +186,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             classGroupIdList.add(classGroup.getId());
         }
 
-        List<ImGroupMember> imGroupMemberList = new ArrayList<>();
-        List<ClassGroupStudentMapper> classGroupStudentMappers = classGroupStudentMapperDao.findByClassGroups(classGroupIdList);
-
-        for (ClassGroupStudentMapper classGroupStudentMapper : classGroupStudentMappers) {
-            if (classGroupStudentMapper.getStatus().equals(ClassGroupStudentStatusEnum.QUIT)) continue;
-            imGroupMemberList.add(new ImGroupMember(classGroupStudentMapper.getUserId().toString()));
-        }
-
         //1、插入班级
         ClassGroup classGroup = new ClassGroup();
         classGroup.setMusicGroupId(musicGroupId);
@@ -206,6 +198,25 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroup.setUpdateTime(date);
         insert(classGroup);
 
+        List<ImGroupMember> imGroupMemberList = new ArrayList<>();
+        List<ClassGroupStudentMapper> mixClassGroupStudentMappers = new ArrayList<>();
+        List<ClassGroupStudentMapper> classGroupStudentMappers = classGroupStudentMapperDao.findByClassGroups(classGroupIdList);
+
+        for (ClassGroupStudentMapper classGroupStudentMapper : classGroupStudentMappers) {
+            ClassGroupStudentMapper mixClassGroupStudentMapper = new ClassGroupStudentMapper();
+            if (classGroupStudentMapper.getStatus().equals(ClassGroupStudentStatusEnum.QUIT)) continue;
+            mixClassGroupStudentMapper.setMusicGroupId(musicGroupId);
+            mixClassGroupStudentMapper.setClassGroupId(classGroup.getId());
+            mixClassGroupStudentMapper.setUserId(classGroupStudentMapper.getUserId());
+            mixClassGroupStudentMapper.setCreateTime(date);
+            mixClassGroupStudentMapper.setStatus(ClassGroupStudentStatusEnum.NORMAL);
+            mixClassGroupStudentMappers.add(mixClassGroupStudentMapper);
+
+            imGroupMemberList.add(new ImGroupMember(classGroupStudentMapper.getUserId().toString()));
+        }
+        //插入学生关联关系
+        classGroupStudentMapperDao.classGroupStudentsInsert(mixClassGroupStudentMappers);
+
         //2、插入班级关联关系
         List<ClassGroupRelation> classGroupRelationList = new ArrayList<>();
         for (ClassGroup cGroup : classGroups) {