|
@@ -273,7 +273,8 @@
|
|
|
AND sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
</if>
|
|
|
<if test="attendanceStatus != null and attendanceStatus == @com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum@TRUANT">
|
|
|
- AND (sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} OR sa.status_ IS NULL)
|
|
|
+ AND (sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
+ OR (sa.status_ IS NULL AND cs.status_!='NOT_START'))
|
|
|
</if>
|
|
|
<if test="classGroupName!=null">
|
|
|
AND (cg.name_ LIKE CONCAT("%",#{classGroupName},"%") OR cs.name_ LIKE CONCAT("%",#{classGroupName},"%"))
|
|
@@ -294,7 +295,7 @@
|
|
|
CONCAT(cs.class_date_," ",cs.end_class_time_) course_end_date_,
|
|
|
cssp.course_schedule_id_,
|
|
|
su.real_name_ teacher_name_,
|
|
|
- IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_,
|
|
|
+ IF(sa.status_ IS NULL AND cs.status_!='NOT_START','TRUANT',sa.status_) status_,
|
|
|
sa.current_class_times_,
|
|
|
cg.total_class_times_,
|
|
|
cs.status_ courseStatus,
|