Merge remote-tracking branch 'origin/master'

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

@@ -263,7 +263,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<HighClassGroupDto> addHighClassGroup(List<HighClassGroupDto> highClassGroupList) throws Exception {
-        MusicGroup musicGroup = musicGroupDao.get(highClassGroupList.get(0).getMusicGroupId());
+        MusicGroup musicGroup = musicGroupDao.getLocked(highClassGroupList.get(0).getMusicGroupId());
 
         int highClassGroupNum = studentRegistrationDao.findMusicGroupStudentNum(musicGroup.getId()) / 5;
         if (highClassGroupList.size() > highClassGroupNum) {

mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -110,7 +110,7 @@
 	</delete>
 
     <delete id="batchDeleteByCourseSchedules">
-        DELETE FROM teacher_attendance WHERE id_ IN
+        DELETE FROM teacher_attendance WHERE course_schedule_id_ IN
         <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
             #{courseScheduleId}
         </foreach>