|
@@ -1801,6 +1801,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
//3、将老师加入关联关系
|
|
|
List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroup4MixDtos.get(0).getClassGroupTeacherMapperList();
|
|
|
|
|
|
+ Set<Integer> noRepeatTeacherIds = classGroupTeacherMapperList.stream().map(ClassGroupTeacherMapper::getUserId).collect(Collectors.toSet());
|
|
|
+ if(noRepeatTeacherIds.size()!=classGroupTeacherMapperList.size()){
|
|
|
+ throw new BizException("主教与助教存在冲突");
|
|
|
+ }
|
|
|
+
|
|
|
Integer teacherId = null;
|
|
|
for (ClassGroupTeacherMapper groupTeacherMapper : classGroupTeacherMapperList) {
|
|
|
groupTeacherMapper.setGroupType(classGroup.getGroupType());
|
|
@@ -2098,6 +2103,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
//1、更新班级关联老师信息
|
|
|
List<ClassGroupTeacherMapper> newClassGroupTeacherMapperList = classGroup4MixDtos.get(0).getClassGroupTeacherMapperList();
|
|
|
+
|
|
|
+ Set<Integer> noRepeatTeacherIds = newClassGroupTeacherMapperList.stream().map(ClassGroupTeacherMapper::getUserId).collect(Collectors.toSet());
|
|
|
+ if(noRepeatTeacherIds.size()!=newClassGroupTeacherMapperList.size()){
|
|
|
+ throw new BizException("主教与助教存在冲突");
|
|
|
+ }
|
|
|
+
|
|
|
Integer teacherId = null;
|
|
|
for (ClassGroupTeacherMapper groupTeacherMapper : newClassGroupTeacherMapperList) {
|
|
|
groupTeacherMapper.setGroupType(classGroup.getGroupType());
|
|
@@ -2410,6 +2421,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
//3、将老师加入关联关系
|
|
|
List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroup4MixDtos.get(0).getClassGroupTeacherMapperList();
|
|
|
|
|
|
+ Set<Integer> noRepeatTeacherIds = classGroupTeacherMapperList.stream().map(ClassGroupTeacherMapper::getUserId).collect(Collectors.toSet());
|
|
|
+ if(noRepeatTeacherIds.size()!=classGroupTeacherMapperList.size()){
|
|
|
+ throw new BizException("主教与助教存在冲突");
|
|
|
+ }
|
|
|
+
|
|
|
Integer teacherId = null;
|
|
|
for (ClassGroupTeacherMapper groupTeacherMapper : classGroupTeacherMapperList) {
|
|
|
groupTeacherMapper.setGroupType(classGroup.getGroupType());
|