zouxuan 5 년 전
부모
커밋
830758284e

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

@@ -134,5 +134,5 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @param classGroupIds
      * @param newTeacherId
      */
-    void batchUpdateTeacherByClassId(@Param("classGroupIds") List<Integer> classGroupIds, @Param("newTeacherId") Integer newTeacherId);
+    void batchUpdateTeacherByClassId(@Param("classGroupIds") List<Integer> classGroupIds, @Param("oldTeacherId") Integer oldTeacherId, @Param("newTeacherId") Integer newTeacherId);
 }

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

@@ -74,5 +74,5 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
      * @param classGroupIds
      * @param newTeacherId
      */
-    void batchUpdateTeacherByClassId(@Param("classGroupIds") List<Integer> classGroupIds, @Param("newTeacherId") Integer newTeacherId);
+    void batchUpdateTeacherByClassId(List<Integer> classGroupIds, Integer oldTeacherId,Integer newTeacherId);
 }

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

@@ -624,7 +624,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void batchUpdateTeacherByClassId(List<Integer> classGroupIds, Integer newTeacherId) {
-        classGroupTeacherMapperDao.batchUpdateTeacherByClassId(classGroupIds,newTeacherId);
+    public void batchUpdateTeacherByClassId(List<Integer> classGroupIds, Integer oldTeacherId, Integer newTeacherId) {
+        classGroupTeacherMapperDao.batchUpdateTeacherByClassId(classGroupIds,oldTeacherId,newTeacherId);
     }
 }

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

@@ -4258,8 +4258,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			});
 			this.courseAdjust(courseSchedules);
 			//修改关联班级老师
-			List<Integer> collect = courseSchedules.stream().map(e -> e.getClassGroupId()).collect(Collectors.toList());
-			batchUpdateClassTeacher(collect,teacherId,targetTeacherId);
+//			List<Integer> collect = courseSchedules.stream().map(e -> e.getClassGroupId()).collect(Collectors.toList());
+//			batchUpdateClassTeacher(collect,teacherId,targetTeacherId);
 			//修改老师考勤
 			Set<Integer> collect1 = courseSchedules.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
 //			teacherAttendanceDao.deleteByCourseAndTeacherId(collect1,teacherId);
@@ -4300,7 +4300,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		classGroupList.forEach(e->{
 			e.setUserIds(newTeacherId.toString());
 		});
-		classGroupTeacherMapperService.batchUpdateTeacherByClassId(classGroupIds,newTeacherId);
+		classGroupTeacherMapperService.batchUpdateTeacherByClassId(classGroupIds,oldTeacherId,newTeacherId);
 		//旧老师退群,新老师加群
 		if(classGroupList != null && classGroupIds.size() > 0){
 			ImGroupMember[] oldImGroupMembers = {new ImGroupMember(oldTeacherId.toString())};

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

@@ -84,7 +84,7 @@
         WHERE teacher_role_ = 'BISHOP' AND music_group_id_ = #{groupId} AND group_type_ = #{groupType}
     </update>
     <update id="batchUpdateTeacherByClassId">
-      UPDATE class_group_teacher_mapper SET user_id_ = #{newTeacherId},update_time_ = NOW() WHERE class_group_id_ IN
+      UPDATE class_group_teacher_mapper SET user_id_ = #{newTeacherId},update_time_ = NOW() WHERE user_id_ = #{oldTeacherId} AND class_group_id_ IN
         <foreach collection="classGroupIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>