|
|
@@ -1560,7 +1560,7 @@
|
|
|
<!-- 查找班级未开始的课程 -->
|
|
|
<select id="findCoursesByClassGroupId" resultMap="CourseSchedule">
|
|
|
SELECT * FROM course_schedule
|
|
|
- WHERE class_group_id_ = #{classGroupId}
|
|
|
+ WHERE class_group_id_ = #{classGroupId} and (new_course_id_ is null or new_course_id_ = 0)
|
|
|
<if test="status != null">
|
|
|
and status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
</if>
|
|
|
@@ -3338,7 +3338,7 @@
|
|
|
SELECT a.course_type_,SUM(remain_minutes_) remain_minutes_ FROM
|
|
|
(SELECT cs.type_ course_type_,SUM(TIMESTAMPDIFF(MINUTE,STR_TO_DATE(concat(cs.class_date_,' ',cs.start_class_time_),'%Y-%m-%d %H:%i:%s'),
|
|
|
STR_TO_DATE(concat(cs.class_date_,' ',cs.end_class_time_),'%Y-%m-%d %H:%i:%s'))) remain_minutes_
|
|
|
- from course_schedule cs where FIND_IN_SET(cs.class_group_id_,#{classgroupId}) and cs.status_ = 'NOT_START' group by cs.type_
|
|
|
+ from course_schedule cs where FIND_IN_SET(cs.class_group_id_,#{classgroupId}) and cs.status_ = 'NOT_START' and (cs.new_course_id_ is null or cs.new_course_id_ = 0) group by cs.type_
|
|
|
UNION
|
|
|
SELECT ncs.type_ course_type_,SUM(TIMESTAMPDIFF(MINUTE,STR_TO_DATE(concat(ncs.class_date_,' ',ncs.start_class_time_),'%Y-%m-%d %H:%i:%s'),
|
|
|
STR_TO_DATE(concat(ncs.class_date_,' ',ncs.end_class_time_),'%Y-%m-%d %H:%i:%s'))) remain_minutes_ FROM course_schedule cs LEFT JOIN course_schedule ncs ON ncs.id_ = cs.new_course_id_
|
yonge