调课顶课规则调整

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

@@ -43,6 +43,8 @@ import com.xjrsoft.module.courseTable.mapper.ClassTimeMapper;
 import com.xjrsoft.module.courseTable.mapper.CourseTableMapper;
 import com.xjrsoft.module.courseTable.service.ICourseTableService;
 import com.xjrsoft.module.courseTable.vo.ClassListVo;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.schedule.dto.ClassOptionDto;
 import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
 import com.xjrsoft.module.schedule.dto.CourseTableDto;
@@ -119,6 +121,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
     private final BaseSemesterMapper baseSemesterMapper;
     private final IBaseStudentSchoolRollService baseStudentSchoolRollService;
     private final CourseTableBakMapper courseTableBakMapper;
+    private final IUserService userService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -472,9 +475,14 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                 for (String courseId : courseIds) {
                     CourseTable courseTable = courseTableMapper.selectById(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/resources/mapper/courseTable/CourseTable.xml

@@ -68,6 +68,7 @@
                 #{courseId}
             </foreach>
         </if>
+        order by t4.number asc
     </select>
     <select id="getExceptCourseList" parameterType="java.lang.Long" resultType="com.xjrsoft.module.schedule.entity.WfCourseAdjust">
         SELECT a1.* FROM wf_course_adjust a1