所选班级不能有未开始的临时合并课程,改为判断课程状态

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -3605,22 +3605,13 @@
         GROUP BY cssp.course_schedule_id_,cs.id_  HAVING COUNT(cssp.id_) = 0
     </select>
     <select id="findNoStartMasterCourseNum" resultType="int">
-        SELECT COUNT(a.course_id_) FROM (
-        SELECT new_course_id_ course_id_ FROM course_schedule
-        WHERE new_course_id_ IN (SELECT id_ FROM course_schedule
+        SELECT COUNT(id_) FROM course_schedule
         WHERE class_group_id_ IN
         <foreach collection="classGroupIds" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>
-        AND CONCAT(class_date_,' ',start_class_time_) > NOW())
-        UNION ALL
-        SELECT id_ course_id_ FROM course_schedule
-        WHERE class_group_id_ IN
-        <foreach collection="classGroupIds" open="(" close=")" separator="," item="item">
-            #{item}
-        </foreach>
-        AND new_course_id_ > 0
-        AND CONCAT(class_date_,' ',start_class_time_) > NOW()) a
+        AND new_course_id_ IS NOT NULL
+        AND status_ = 'NOT_START'
     </select>
     <select id="getLock" resultMap="CourseSchedule">
         SELECT * FROM course_schedule WHERE id_ = #{courseId} FOR UPDATE