批量修改

src/main/java/com/xjrsoft/module/base/controller/BaseClassCourseController.java

@@ -105,7 +105,11 @@ public class BaseClassCourseController {
     @ApiOperation(value="更新增加课程教材")
     @SaCheckPermission("baseclasscourse:detail")
     public RT updateAddCoursesAndTextbooks(@Valid ClassCourseTextbook list) {
-        baseClassCourseService.updateAddCourseBook(list.getClassId(), list.getCourseId(), list.getTextbookId());
+        for (Long classId : list.getClassId()){
+            for (Long i = 0L ;i < list.getCourseId().length; i++){
+                baseClassCourseService.updateAddCourseBook(classId, list.getCourseId()[Math.toIntExact(i)], list.getTextbookId()[Math.toIntExact(i)]);
+            }
+        }
         return RT.ok();
     }
 
@@ -113,7 +117,11 @@ public class BaseClassCourseController {
     @ApiOperation(value="更新减少课程教材")
     @SaCheckPermission("baseclasscourse:detail")
     public RT updateRemoveCoursesAndTextbooks(@Valid ClassCourseTextbook list) {
-        baseClassCourseService.updateRemoveCourseBook(list.getClassId(), list.getCourseId(), list.getTextbookId());
+        for (Long classId : list.getClassId()){
+            for (Long i = 0L ;i < list.getCourseId().length; i++){
+                baseClassCourseService.updateRemoveCourseBook(classId, list.getCourseId()[Math.toIntExact(i)], list.getTextbookId()[Math.toIntExact(i)]);
+            }
+        }
         return RT.ok();
     }
 

src/main/java/com/xjrsoft/module/base/entity/ClassCourseTextbook.java

@@ -7,11 +7,11 @@ import lombok.Data;
 @Data
 public class ClassCourseTextbook {
     @ApiModelProperty("班级id")
-    private Long classId;
+    private Long[] classId;
 
     @ApiModelProperty("课程id")
-    private Long courseId;
+    private Long[] courseId;
 
     @ApiModelProperty("教材id")
-    private Long textbookId;
+    private Long[] textbookId;
 }

src/main/java/com/xjrsoft/module/base/entity/CourseTextbookPair.java

@@ -0,0 +1,30 @@
+package com.xjrsoft.module.base.entity;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CourseTextbookPair {
+
+
+        private Long courseId;
+        private Long textbookId;
+
+        public CourseTextbookPair( Long courseId, Long textbookId) {
+
+            this.courseId = courseId;
+            this.textbookId = textbookId;
+        }
+
+
+
+        public Long getCourseId() {
+            return courseId;
+        }
+
+        public Long getTextbookId() {
+            return textbookId;
+        }
+
+}

src/main/resources/mapper/base/BaseClassCourse.xml

@@ -8,11 +8,24 @@
         (SELECT GROUP_CONCAT(DISTINCT t6.name SEPARATOR '、')
             FROM base_class_course t5
             LEFT JOIN base_course_subject t6 ON t6.id = t5.course_id
-            WHERE t5.class_id = t.id AND t5.delete_mark = 0) AS course_name,
+            WHERE t5.class_id = t.id
+            AND t5.delete_mark = 0
+            <if test="dto.semester != null">
+                AND EXISTS (
+                SELECT 1
+                FROM textbook tb
+                WHERE tb.id = t5.textbook_id
+                AND tb.base_semester_id = #{dto.semester}
+                )
+            </if>) AS course_name,
         (SELECT GROUP_CONCAT(DISTINCT t7.book_name SEPARATOR '、')
             FROM base_class_course t5
             LEFT JOIN textbook t7 ON t7.id = t5.textbook_id
-            WHERE t5.class_id = t.id AND t5.delete_mark = 0) AS textbook_name
+            WHERE t5.class_id = t.id
+            AND t5.delete_mark = 0
+            <if test="dto.semester != null">
+                AND t7.base_semester_id = #{dto.semester}
+            </if>) AS textbook_name
         FROM base_class t
         LEFT JOIN xjr_user t1 ON t1.id = t.teacher_id
         LEFT JOIN base_class_major_set t2 ON t2.class_id = t.id
@@ -25,7 +38,7 @@
         <if test="dto.deptId != null">
             and t4.id = #{dto.deptId}
         </if>
-<!--  关联学期      <if test="dto.semester != null">-->
+<!--        <if test="dto.semester != null">-->
 <!--            AND EXISTS (-->
 <!--            SELECT 1-->
 <!--            FROM base_class_course bcc-->