Merge remote-tracking branch 'origin/master'

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

@@ -1047,7 +1047,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 if (Objects.nonNull(vipGroup)) {
                     groupName = vipGroup.getName();
                 }
-            } else {
+            }else if(courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.PRACTICE)){
+                PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(courseSchedule.getMusicGroupId()));
+                if (Objects.nonNull(practiceGroup)) {
+                    groupName = practiceGroup.getName();
+                }
+            }else {
                 MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
                 if (Objects.nonNull(musicGroup)) {
                     groupName = musicGroup.getName();
@@ -2561,11 +2566,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         List<CourseSchedule> courseSchedules = new ArrayList<>();
         courseSchedules.add(oldCourseSchedule);
         Set<Long> courseScheduleIds = courseSchedules.stream().map(e -> e.getId()).collect(Collectors.toSet());
-        courseSchedules.forEach(e->{
-            e.setId(null);
-        });
         checkNewCourseSchedules(courseSchedules,false);
-        oldCourseSchedule.setId(courseScheduleId);
         courseScheduleDao.update(oldCourseSchedule);
         courseScheduleTeacherSalaryDao.batchUpdateTeacher(courseScheduleIds,teacherId);
         Map<Integer, String> map = new HashMap<>(2);
@@ -2595,17 +2596,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         }
         Map<Integer, String> teacherIdMap = new HashMap<>(10);
         teacherIdMap.put(teacherId,teacherId.toString());
-
-        List<CourseSchedule> copyCourseSchedules = new ArrayList<>(courseSchedules);
         courseSchedules.forEach(e->{
             teacherIdMap.put(e.getActualTeacherId(),e.getActualTeacherId().toString());
             e.setActualTeacherId(teacherId);
         });
         checkNewCourseSchedules(courseSchedules,false);
-        courseScheduleDao.batchUpdate(copyCourseSchedules);
-        Set<Long> courseScheduleIds = copyCourseSchedules.stream().map(e -> e.getId()).collect(Collectors.toSet());
+        courseScheduleDao.batchUpdate(courseSchedules);
+        Set<Long> courseScheduleIds = courseSchedules.stream().map(e -> e.getId()).collect(Collectors.toSet());
         courseScheduleTeacherSalaryDao.batchUpdateTeacher(courseScheduleIds,teacherId);
-        Set<Integer> classGroupIds = copyCourseSchedules.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
+        Set<Integer> classGroupIds = courseSchedules.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
         classGroupTeacherMapperService.updateTeacher(classGroupIds,teacherId);
         classGroupTeacherSalaryDao.updateTeacher(classGroupIds,teacherId);
         practiceGroupDao.updateUserId(practiceGroupId,teacherId);

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

@@ -306,6 +306,7 @@
         LEFT JOIN sys_user u on ta.teacher_id_ = u.id_
         WHERE ta.sign_out_status_ IS NULL
         AND CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) <= DATE_SUB(now(),INTERVAL #{minutes} MINUTE) AND cs.del_flag_ = 0
+        AND cs.group_type_ = 'MUSIC'
     </select>
     <select id="findTeacherIdByCourseSchedule" resultMap="TeacherAttendance">
         SELECT