|
@@ -256,22 +256,22 @@
|
|
|
(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
|
|
|
AND CONCAT(cs.class_date_," ",cs.start_class_time_) < NOW()
|
|
|
<if test="studentId!=null">
|
|
|
- and cssp.user_id_ = #{studentId}
|
|
|
+ AND cssp.user_id_ = #{studentId}
|
|
|
</if>
|
|
|
<if test="classGroupType!=null">
|
|
|
- and cg.type_ = #{classGroupType}
|
|
|
+ AND cg.type_ = #{classGroupType}
|
|
|
</if>
|
|
|
<if test="attendanceStatus != null and attendanceStatus != 'TRUANT'">
|
|
|
- and sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
+ AND sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
</if>
|
|
|
<if test="attendanceStatus != null and attendanceStatus == '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)
|
|
|
</if>
|
|
|
<if test="classGroupName!=null">
|
|
|
- and cg.name_ like CONCAT("%",#{classGroupName},"%")
|
|
|
+ AND (cg.name_ LIKE CONCAT("%",#{classGroupName},"%") OR cs.name_ LIKE CONCAT("%",#{classGroupName},"%"))
|
|
|
</if>
|
|
|
<if test="teacherName!=null">
|
|
|
- and su.real_name_ like CONCAT("%",#{teacherName},"%")
|
|
|
+ AND su.real_name_ LIKE CONCAT("%",#{teacherName},"%")
|
|
|
</if>
|
|
|
</where>
|
|
|
</sql>
|