调课顶课课程查询，不包含已完整或者正在进行中的调课和顶课

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

@@ -44,12 +44,7 @@
         <if test="dto.classId != null">
             and t5.id = #{dto.classId}
         </if>
-        <if test="exceptCourseList != null">
-            AND t1.id in
-            <foreach item="courseId" collection="exceptCourseList" open="(" separator="," close=")">
-                #{courseId}
-            </foreach>
-        </if>
+
     </select>
     <select id="getAdjustList" parameterType="com.xjrsoft.module.schedule.dto.CourseTableAdjustDto" resultType="com.xjrsoft.module.schedule.vo.CourseListVo">
         SELECT t1.time_period,t4.short_name as time_number,t1.course_name,t2.name AS class_name,t3.name AS classroom_name,t1.id,t2.id as class_id FROM course_table t1
@@ -67,6 +62,12 @@
         <if test="dto.classId != null and dto.classId != ''">
             and t1.class_id = #{dto.classId}
         </if>
+        <if test="exceptCourseList != null">
+            AND t1.id not in
+            <foreach item="courseId" collection="exceptCourseList" open="(" separator="," close=")">
+                #{courseId}
+            </foreach>
+        </if>
     </select>
     <select id="getExceptCourseList" parameterType="java.lang.Long" resultType="com.xjrsoft.module.schedule.entity.WfCourseAdjust">
         SELECT a1.* FROM wf_course_adjust a1