可调整接口增加班级id的入参和出参

src/main/java/com/xjrsoft/module/courseTable/service/ICourseTableService.java

@@ -31,7 +31,7 @@ public interface ICourseTableService extends IService<CourseTable> {
 
     CourseTableVo getList(CourseTableDto dto);
 
-    List<CourseListVo> getAdjustList(String teacherId, String adjustDate);
+    List<CourseListVo> getAdjustList(String teacherId, String adjustDate, String classId);
 
     String getPreCheck(String preCheckType, String courseId, String swapCourseId, String swapDate, String subTeacherId);
 

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

@@ -246,7 +246,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
      * 调课顶课查询
      */
     @Override
-    public List<CourseListVo> getAdjustList(String teacherId, String adjustDate) {
+    public List<CourseListVo> getAdjustList(String teacherId, String adjustDate, String classId) {
         CourseTableAdjustDto dto = new CourseTableAdjustDto();
         if(adjustDate != null && !"".equals(adjustDate)){
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -255,6 +255,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             dto.setAdjustDate(adjustDate);
             dto.setWeek(dayOfWeek.getValue());
         }
+        dto.setClassId(classId);
         dto.setTeacherId(Long.parseLong(teacherId));
         List<CourseListVo> list = courseTableMapper.getAdjustList(dto);
         for (CourseListVo courseListVo : list) {

src/main/java/com/xjrsoft/module/schedule/dto/CourseTableAdjustDto.java

@@ -25,4 +25,7 @@ public class CourseTableAdjustDto implements Serializable {
     @ApiModelProperty("周几(后台自动计算)")
     private Integer week;
 
+    @ApiModelProperty("班级id")
+    private String classId;
+
 }

src/main/java/com/xjrsoft/module/schedule/vo/CourseListVo.java

@@ -16,6 +16,9 @@ public class CourseListVo {
     @ApiModelProperty("班级名称（课表类型为teacher时使用）")
     private String className;
 
+    @ApiModelProperty("班级id")
+    private String classId;
+
     @ApiModelProperty("教室名称（课表类型为class时使用）")
     private String classroomName;
 

src/main/resources/mapper/courseTable/CourseTable.xml

@@ -48,5 +48,8 @@
         LEFT JOIN base_classroom t3 ON t1.site_id = t3.id
         WHERE t1.status = 1 AND t1.teacher_id = #{dto.teacherId}
         AND t1.weeks = #{dto.week} AND t1.schedule_date = #{dto.adjustDate}
+        <if test="dto.classId != null and dto.classId != ''">
+            and t1.class_id = #{dto.classId}
+        </if>
     </select>
 </mapper>