Merge remote-tracking branch 'origin/master'

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

@@ -1402,7 +1402,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Transactional(rollbackFor = Exception.class)
     public ClassGroup classGroupUpdate(ClassGroup4MixDto classGroup4MixDto) throws Exception {
         Date date = new Date();
-        ClassGroup classGroup = classGroupDao.get(classGroup4MixDto.getClassGroupId());
+        Integer classGroupId = classGroup4MixDto.getClassGroupId();
+        ClassGroup classGroup = classGroupDao.get(classGroupId);
         if (classGroup == null) {
             throw new BizException("班级不存在");
         }
@@ -1423,6 +1424,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 teacherAttendanceDao.batchDeleteByCourseSchedules(courseScheduleIds);
                 courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
             }
+        }else if(classGroup4MixDto.getCourseAddType().equals("onlyUpdateTeacher")){
+        	//更新班级老师
+        	
+        	return classGroup;
         }
 
         classGroupService.updateTotalClassTimes(classGroup.getId().longValue(),courseTimes);

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

@@ -2430,13 +2430,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             courseSchedules = courseSchedules.stream().filter(courseSchedule -> !courseSchedule.getActualTeacherId().equals(teacherId)).collect(Collectors.toList());
         }
         if(courseSchedules == null || courseSchedules.size() == 0){
-            throw new BizException("没有可调整课程");
-        }
-        Integer oldTeacherId = courseSchedules.stream().map(e -> e.getActualTeacherId()).findFirst().get();
-        if(teacherId.equals(oldTeacherId)){
-            throw new BizException("请选择不同的老师");
+            throw new BizException("没有可调整的课程");
         }
+        Map<Integer, String> teacherIdMap = new HashMap<>(10);
+        teacherIdMap.put(teacherId,teacherId.toString());
         courseSchedules.forEach(e->{
+            teacherIdMap.put(e.getActualTeacherId(),e.getActualTeacherId().toString());
             e.setActualTeacherId(teacherId);
         });
         checkNewCourseSchedules(courseSchedules,false);
@@ -2447,12 +2446,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         classGroupTeacherMapperService.updateTeacher(classGroupIds,teacherId);
         classGroupTeacherSalaryDao.updateTeacher(classGroupIds,teacherId);
         practiceGroupDao.updateUserId(practiceGroupId,teacherId);
-        Map<Integer, String> map = new HashMap<>(2);
-        map.put(teacherId,teacherId.toString());
-        map.put(oldTeacherId,oldTeacherId.toString());
-        if (map != null && map.size() > 0) {
+        if (teacherIdMap != null && teacherIdMap.size() > 0) {
             sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_COURSE_SCHEDULE_CHANGE_RESULT,
-                    map, null, 0, "7","TEACHER");
+                    teacherIdMap, null, 0, "7","TEACHER");
         }
     }
 }

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

@@ -1919,7 +1919,7 @@
             cs.status_,
             cs.class_date_,
             CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) start_class_time_,
-            cs.end_class_time_,
+            CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) end_class_time_,
             cs.actual_teacher_id_,
             cs.teach_mode_
         FROM