|  | @@ -75,6 +75,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          classGroup.setStudentNum(userIdArr.length);
 |  |          classGroup.setStudentNum(userIdArr.length);
 | 
											
												
													
														|  |          Long classGroupId = this.insert(classGroup);
 |  |          Long classGroupId = this.insert(classGroup);
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +        //2、插入班级学生关联关系
 | 
											
												
													
														|  |          List<ClassGroupStudentMapper> classGroupStudentList = new ArrayList<>();
 |  |          List<ClassGroupStudentMapper> classGroupStudentList = new ArrayList<>();
 | 
											
												
													
														|  |          for (String userId : userIdArr) {
 |  |          for (String userId : userIdArr) {
 | 
											
												
													
														|  |              ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
 |  |              ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
 | 
											
										
											
												
													
														|  | @@ -91,7 +93,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      @Override
 |  |      @Override
 | 
											
												
													
														|  |  	@Transactional(rollbackFor = Exception.class)
 |  |  	@Transactional(rollbackFor = Exception.class)
 | 
											
												
													
														|  | -	public ClassGroup addMixClassGroup(int musicGroupId, String classGroupIds) throws Exception {
 |  | 
 | 
											
												
													
														|  | 
 |  | +	public ClassGroup addMixClassGroup(int musicGroupId,String name, String classGroupIds) throws Exception {
 | 
											
												
													
														|  |          Date date;
 |  |          Date date;
 | 
											
												
													
														|  |          date = new Date();
 |  |          date = new Date();
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -107,7 +109,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
											
												
													
														|  |          ClassGroup classGroup = new ClassGroup();
 |  |          ClassGroup classGroup = new ClassGroup();
 | 
											
												
													
														|  |          classGroup.setMusicGroupId(musicGroupId);
 |  |          classGroup.setMusicGroupId(musicGroupId);
 | 
											
												
													
														|  |          classGroup.setSubjectIdList(subjectIds);
 |  |          classGroup.setSubjectIdList(subjectIds);
 | 
											
												
													
														|  | -        classGroup.setName("合奏班1");
 |  | 
 | 
											
												
													
														|  | 
 |  | +        classGroup.setName(name);
 | 
											
												
													
														|  |          classGroup.setType(ClassGroupTypeEnum.MIX);
 |  |          classGroup.setType(ClassGroupTypeEnum.MIX);
 | 
											
												
													
														|  |          classGroup.setCreateTime(date);
 |  |          classGroup.setCreateTime(date);
 | 
											
												
													
														|  |          classGroup.setUpdateTime(date);
 |  |          classGroup.setUpdateTime(date);
 | 
											
										
											
												
													
														|  | @@ -123,7 +125,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
											
												
													
														|  |              classGroupRelationList.add(classGroupRelation);
 |  |              classGroupRelationList.add(classGroupRelation);
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |  		classGroupRelationService.classGroupRelationsInsert(classGroupRelationList);
 |  |  		classGroupRelationService.classGroupRelationsInsert(classGroupRelationList);
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  |          return classGroup;
 |  |          return classGroup;
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 |