调课顶课规则调整

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -425,9 +425,14 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                 for (String courseId : courseIds) {
                     CourseTable courseTable = courseMap.get(bakKeyInfoMap.get(Long.parseLong(courseId)));
 
+                    User applyUser = userService.getById(courseAdjust.getUserId());//申请人
+                    User exchangeUser = userService.getById(courseAdjust.getExchangeTeacherId());//顶课人
+
                     String teacherId = courseTable.getTeacherId().replace(courseAdjust.getUserId().toString(), courseAdjust.getExchangeTeacherId().toString());
+                    String teacherName = courseTable.getTeacherName().replace(applyUser.getName(), exchangeUser.getName());
                     courseTable.setAdjustType(courseAdjust.getAdjustType());
                     courseTable.setTeacherId(teacherId);
+                    courseTable.setTeacherName(teacherName);
                     courseTableMapper.updateById(courseTable);
                 }
 

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -28,7 +28,6 @@ import com.xjrsoft.module.schedule.dto.ScheduleWeekDto;
 import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
 import com.xjrsoft.module.schedule.dto.WfCourseAdjustDto;
 import com.xjrsoft.module.schedule.entity.CourseReceiveMsg;
-import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
 import com.xjrsoft.module.schedule.service.ICourseReceiveMsgService;
 import com.xjrsoft.module.schedule.service.IWfCourseAdjustService;
 import com.xjrsoft.module.schedule.util.ScheduleUtil;