update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupTeacherMapperDao.java

@@ -96,10 +96,10 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
     /**
      * 修改老师
      *
-     * @param classGroupIds
+     * @param groupId
      * @param teacherId
      */
-    void updateTeacher(@Param("classGroupIds") Set<Integer> classGroupIds, @Param("teacherId") Integer teacherId);
+    void updateTeacher(@Param("groupId") String groupId, @Param("teacherId") Integer teacherId, @Param("groupType") String groupType);
 
     /**
      * @param groupId:

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupTeacherSalaryDao.java

@@ -42,10 +42,11 @@ public interface ClassGroupTeacherSalaryDao extends BaseDAO<Long, ClassGroupTeac
 
     /**
      * 修改老师
-     * @param classGroupIds
+     * @param groupId
+     * @param groupType
      * @param teacherId
      */
-    void updateTeacher(@Param("classGroupIds") Set<Integer> classGroupIds, @Param("teacherId") Integer teacherId);
+    void updateTeacher(@Param("groupId") String groupId, @Param("teacherId") Integer teacherId, @Param("groupType") String groupType);
 
     /**
      * @describe 根据团体删除班级

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupTeacherMapperService.java

@@ -55,8 +55,9 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
 
     /**
      * 修改班级老师
-     * @param classGroupIds
+     * @param groupId
+     * @param groupType
      * @param teacherId
      */
-    void updateTeacher(Set<Integer> classGroupIds, Integer teacherId);
+    void updateTeacher(String groupId, Integer teacherId,String groupType);
 }

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

@@ -557,7 +557,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     }
 
     @Override
-    public void updateTeacher(Set<Integer> classGroupIds, Integer teacherId) {
-        classGroupTeacherMapperDao.updateTeacher(classGroupIds,teacherId);
+    public void updateTeacher(String groupId, Integer teacherId,String groupType) {
+        classGroupTeacherMapperDao.updateTeacher(groupId,teacherId,groupType);
     }
 }

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

@@ -3103,8 +3103,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if(courseSchedules != null && courseSchedules.size() > 0){
             courseSchedules = courseSchedules.stream().filter(courseSchedule -> !courseSchedule.getActualTeacherId().equals(teacherId)).collect(Collectors.toList());
         }
+        classGroupTeacherMapperService.updateTeacher(practiceGroupId,teacherId,GroupType.PRACTICE.getCode());
+        classGroupTeacherSalaryDao.updateTeacher(practiceGroupId,teacherId,GroupType.PRACTICE.getCode());
+        practiceGroupDao.updateUserId(practiceGroupId,teacherId);
         if(courseSchedules == null || courseSchedules.size() == 0){
-            throw new BizException("没有可调整的课程");
+            return;
         }
 
         Map<Integer, String> teacherIdMap = new HashMap<>(10);
@@ -3128,10 +3131,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         courseScheduleDao.batchUpdate(courseSchedules);
         Set<Long> courseScheduleIds = courseSchedules.stream().map(e -> e.getId()).collect(Collectors.toSet());
         courseScheduleTeacherSalaryDao.batchUpdateTeacher(courseScheduleIds,teacherId);
-        Set<Integer> classGroupIds = courseSchedules.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
-        classGroupTeacherMapperService.updateTeacher(classGroupIds,teacherId);
-        classGroupTeacherSalaryDao.updateTeacher(classGroupIds,teacherId);
-        practiceGroupDao.updateUserId(practiceGroupId,teacherId);
+
         teacherAttendanceDao.batchUpdateTeacher(courseScheduleIds,teacherId);
         courseScheduleModifyLogDao.batchInsert(scheduleModifyLogs);
 

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

@@ -81,10 +81,7 @@
 
     <update id="updateTeacher">
         UPDATE class_group_teacher_mapper SET user_id_ = #{teacherId},update_time_ = NOW()
-        WHERE teacher_role_ = 'BISHOP' AND class_group_id_ IN
-        <foreach collection="classGroupIds" item="item" index="index" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
+        WHERE teacher_role_ = 'BISHOP' AND music_group_id_ = #{groupId} AND group_type_ = #{groupType}
     </update>
 
     <!-- 根据主键删除一条记录 -->

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

@@ -115,10 +115,7 @@
   </update>
     <update id="updateTeacher">
       UPDATE class_group_teacher_salary SET user_id_ = #{teacherId},update_time_ = NOW()
-      WHERE teacher_role_ = 'BISHOP' AND class_group_id_ IN
-      <foreach collection="classGroupIds" item="item" index="index" open="(" close=")" separator=",">
-        #{item}
-      </foreach>
+      WHERE teacher_role_ = 'BISHOP' AND music_group_id_ = #{groupId} AND group_type_ = #{groupType}
     </update>
     <!-- 分页查询 -->
   <select id="queryPage" resultMap="ClassGroupTeacherSalary" parameterType="map">