update

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

@@ -3687,6 +3687,20 @@ 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());
         }
+		PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(practiceGroupId));
+		if(Objects.nonNull(subjectId)&&!subjectId.equals(practiceGroup.getSubjectId())){
+			Subject subject = subjectDao.get(subjectId);
+			String groupName = practiceGroup.getName();
+			groupName=groupName.substring(groupName.indexOf("•"));
+			groupName=subject.getName()+groupName;
+			practiceGroup.setName(groupName);
+			practiceGroup.setSubjectId(subjectId);
+			practiceGroupDao.update(practiceGroup);
+			ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(practiceGroupId, GroupType.PRACTICE.getCode());
+			classGroup.setName(groupName);
+			classGroupDao.update(classGroup);
+			courseScheduleDao.updateCourseNameByGroup(practiceGroupId,GroupType.PRACTICE,groupName);
+		}
         classGroupTeacherMapperService.updateTeacher(practiceGroupId,teacherId,GroupType.PRACTICE.getCode());
         classGroupTeacherSalaryDao.updateTeacher(practiceGroupId,teacherId,GroupType.PRACTICE.getCode());
         practiceGroupDao.updateUserId(practiceGroupId,teacherId);
@@ -3715,8 +3729,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         courseScheduleDao.batchUpdate(courseSchedules);
         Set<Long> courseScheduleIds = courseSchedules.stream().map(e -> e.getId()).collect(Collectors.toSet());
 
-        PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(practiceGroupId));
-
         if(Objects.nonNull(practiceGroup.getBuyMonths())){
             List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaries = teacherDefaultPracticeGroupSalaryDao.queryByUserId(teacherId);
             if(teacherDefaultPracticeGroupSalaries == null || teacherDefaultPracticeGroupSalaries.size() == 0){
@@ -3740,20 +3752,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         teacherAttendanceDao.batchUpdateTeacher(courseScheduleIds,teacherId);
         courseScheduleModifyLogDao.batchInsert(scheduleModifyLogs);
 
-        if(Objects.nonNull(subjectId)&&!subjectId.equals(practiceGroup.getSubjectId())){
-            Subject subject = subjectDao.get(subjectId);
-            String groupName = practiceGroup.getName();
-            groupName=groupName.substring(groupName.indexOf("•"));
-            groupName=subject.getName()+groupName;
-            practiceGroup.setName(groupName);
-            practiceGroup.setSubjectId(subjectId);
-            practiceGroupDao.update(practiceGroup);
-            ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(practiceGroupId, GroupType.PRACTICE.getCode());
-            classGroup.setName(groupName);
-            classGroupDao.update(classGroup);
-            courseScheduleDao.updateCourseNameByGroup(practiceGroupId,GroupType.PRACTICE,groupName);
-        }
-
         if (teacherIdMap != null && teacherIdMap.size() > 0) {
             sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_COURSE_SCHEDULE_CHANGE_RESULT,
                     teacherIdMap, null, 0, "7","TEACHER");

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

@@ -398,8 +398,7 @@
 	</update>
     <update id="batchUpdateTeacher">
 		UPDATE course_schedule_teacher_salary csts SET csts.user_id_ = #{teacherId},csts.update_time_ = NOW(),
-		csts.expect_salary_ =
-		(SELECT main_teacher_salary_ FROM teacher_default_practice_group_salary WHERE user_id_ = #{teacherId} LIMIT 1)
+		csts.expect_salary_ = (SELECT main_teacher_salary_ FROM teacher_default_practice_group_salary WHERE user_id_ = #{teacherId} LIMIT 1)
 		WHERE csts.course_schedule_id_ IN
 		<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
 			#{courseScheduleId}

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

@@ -61,6 +61,9 @@
 			<if test="memo!=null">
 				memo_=#{memo},
 			</if>
+			<if test="name!=null">
+				name_=#{name},
+			</if>
 			<if test="groupStatus!=null">
 				group_status_=#{groupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>