Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1658,7 +1658,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroup.setName(classGroup4MixDtos.get(0).getClassGroupName());
         classGroup.setExpectStudentNum(studentList.size());
         classGroup.setStudentNum(studentList.size());
-        classGroup.setExpectStudentNum(classGroup4MixDtos.get(0).getExpectStudentNum());
         classGroup.setType(classGroup4MixDtos.get(0).getType());
         classGroup.setDelFlag(0);
         classGroup.setGroupType(GroupType.MUSIC);

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

@@ -384,15 +384,22 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         addStudentIds = allStudentIds.stream().filter(id -> !repeatStudentIds.contains(id)).collect(Collectors.toSet());
         removeStudentIds = oldNormalStudentIds.stream().filter(id -> !repeatStudentIds.contains(id)).collect(Collectors.toSet());
 
+        List<ClassGroupStudentMapper> needUpdateClassGroupStudents = new ArrayList<>();
+
         for (ClassGroupStudentMapper classGroupStudent : classGroupStudents) {
-            if(addStudentIds.contains(classGroupStudent.getUserId())){
+            if(addStudentIds.contains(classGroupStudent.getUserId())&&!classGroupStudent.getStatus().equals(ClassGroupStudentStatusEnum.NORMAL)){
                 classGroupStudent.setStatus(ClassGroupStudentStatusEnum.NORMAL);
-            }else if(removeStudentIds.contains(classGroupStudent.getUserId())){
+            }else if(removeStudentIds.contains(classGroupStudent.getUserId())&&!classGroupStudent.getStatus().equals(ClassGroupStudentStatusEnum.QUIT)){
                 classGroupStudent.setStatus(ClassGroupStudentStatusEnum.QUIT);
+            }else{
+                continue;
             }
+            needUpdateClassGroupStudents.add(classGroupStudent);
         }
 
-        classGroupStudentMapperDao.batchUpdate(classGroupStudents);
+        if(!CollectionUtils.isEmpty(needUpdateClassGroupStudents)){
+            classGroupStudentMapperDao.batchUpdate(needUpdateClassGroupStudents);
+        }
 
         Date now = new Date();
         List<ClassGroupStudentMapper> classGroupStudentMappers = new ArrayList<>();