zouxuan 5 năm trước cách đây
mục cha
commit
eca8de328f

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

@@ -2377,7 +2377,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         oldCourseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(),practiceCourseMinutes));
         List<CourseSchedule> courseSchedules=new ArrayList<>();
         courseSchedules.add(oldCourseSchedule);
+        courseSchedules.forEach(e->{
+            e.setId(null);
+        });
         checkNewCourseSchedules(courseSchedules,false);
+        oldCourseSchedule.setId(courseSchedule.getId());
         courseScheduleDao.update(oldCourseSchedule);
     }
 
@@ -2403,9 +2407,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         oldCourseSchedule.setActualTeacherId(teacherId);
         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);
-        Set<Long> courseScheduleIds = courseSchedules.stream().map(e -> e.getId()).collect(Collectors.toSet());
         courseScheduleTeacherSalaryDao.batchUpdateTeacher(courseScheduleIds,teacherId);
         Map<Integer, String> map = new HashMap<>(2);
         map.put(teacherId,teacherId.toString());
@@ -2434,15 +2442,18 @@ 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);
+            e.setId(null);
         });
         checkNewCourseSchedules(courseSchedules,false);
-        Set<Long> courseScheduleIds = courseSchedules.stream().map(e -> e.getId()).collect(Collectors.toSet());
-        courseScheduleDao.batchUpdate(courseSchedules);
+        courseScheduleDao.batchUpdate(copyCourseSchedules);
+        Set<Long> courseScheduleIds = copyCourseSchedules.stream().map(e -> e.getId()).collect(Collectors.toSet());
         courseScheduleTeacherSalaryDao.batchUpdateTeacher(courseScheduleIds,teacherId);
-        Set<Integer> classGroupIds = courseSchedules.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
+        Set<Integer> classGroupIds = copyCourseSchedules.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
         classGroupTeacherMapperService.updateTeacher(classGroupIds,teacherId);
         classGroupTeacherSalaryDao.updateTeacher(classGroupIds,teacherId);
         practiceGroupDao.updateUserId(practiceGroupId,teacherId);