update

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

@@ -1675,16 +1675,24 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             throw new BizException("未找到对应课程");
         }
 
+        if(!courseSchedule1.getType().equals(courseSchedule2.getGroupType())
+            ||!courseSchedule1.getMusicGroupId().equals(courseSchedule2.getMusicGroupId())){
+            throw new BizException("不能跨乐团进行课时交换");
+        }
+
+        int course1CourseMinutes = DateUtil.minutesBetween(courseSchedule1.getStartClassTime(), courseSchedule1.getEndClassTime());
+        int course2CourseMinutes = DateUtil.minutesBetween(courseSchedule2.getStartClassTime(), courseSchedule2.getEndClassTime());
+
         CourseSchedule temp=new CourseSchedule();
         BeanUtils.copyProperties(courseSchedule1, temp);
 
         courseSchedule1.setClassDate(courseSchedule2.getClassDate());
         courseSchedule1.setStartClassTime(courseSchedule2.getStartClassTime());
-        courseSchedule1.setEndClassTime(courseSchedule2.getStartClassTime());
+        courseSchedule1.setEndClassTime(DateUtil.addMinutes(courseSchedule1.getStartClassTime(),course1CourseMinutes));
 
         courseSchedule2.setClassDate(temp.getClassDate());
         courseSchedule2.setStartClassTime(temp.getStartClassTime());
-        courseSchedule2.setEndClassTime(temp.getStartClassTime());
+        courseSchedule2.setEndClassTime(DateUtil.addMinutes(courseSchedule2.getStartClassTime(),course1CourseMinutes));
 
         List<CourseSchedule> courseSchedules = new ArrayList<>();
         courseSchedules.add(courseSchedule1);