调课顶课接口调整

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

@@ -199,17 +199,24 @@ public class ScheduleController {
     public RT<String> preCheck(CourseTablePreCheckDto dto) throws Exception {
         if(dto.getPreCheckType() != null){
             if(dto.getPreCheckType() == 1){
-                CourseTable courseTable = courseTableService.getById(dto.getCourseId());
-                CourseTable swapCourseTable = courseTableService.getById(dto.getSwapCourseId());
-                JsonObject preCheck = getExtendPreCheck(dto, courseTable, swapCourseTable);
-                if(preCheck.get("code").getAsInt() != 0){
-                   return RT.error(preCheck.get("msg").getAsString());
+                for (int i = 0; i < dto.getCourseIds().size(); i ++){
+                    Long courseId = dto.getCourseIds().get(i);
+                    Long swapCourseId = dto.getSwapCourseIds().get(i);
+                    CourseTable courseTable = courseTableService.getById(courseId);
+                    CourseTable swapCourseTable = courseTableService.getById(swapCourseId);
+                    JsonObject preCheck = getExtendPreCheck(dto, courseTable, swapCourseTable);
+                    if(preCheck.get("code").getAsInt() != 0){
+                        return RT.error(preCheck.get("msg").getAsString());
+                    }
                 }
+
             }else if(dto.getPreCheckType() == 2){
-                CourseTable courseTable = courseTableService.getById(dto.getCourseId());
-                JsonObject jsonObject = substitutePreTestin(dto, courseTable);
-                if(jsonObject.get("code").getAsInt() != 0){
-                    return RT.error(jsonObject.get("msg").getAsString());
+                for (Long courseId : dto.getCourseIds()) {
+                    CourseTable courseTable = courseTableService.getById(courseId);
+                    JsonObject jsonObject = substitutePreTestin(dto, courseTable);
+                    if(jsonObject.get("code").getAsInt() != 0){
+                        return RT.error(jsonObject.get("msg").getAsString());
+                    }
                 }
             }
         }

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
@@ -22,10 +23,10 @@ public class CourseTablePreCheckDto implements Serializable {
     private Integer preCheckType;
 
     @ApiModelProperty("需要调课的课程id")
-    private Long courseId;
+    private List<Long> courseIds;
 
     @ApiModelProperty("被对调的课程id(调课时使用)")
-    private Long swapCourseId;
+    private List<Long> swapCourseIds;
 
     @ApiModelProperty("被对调的日期(调课时使用)")
     private LocalDateTime swapDate;