|
@@ -280,7 +280,7 @@
|
|
|
</sql>
|
|
|
<sql id="queryTeacherAttendancesCondition">
|
|
|
<where>
|
|
|
- cs.del_flag_ = 0 AND cs.status_ = 'OVER' AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
|
|
|
+ cs.del_flag_ = 0
|
|
|
<if test="search != null and search != ''">
|
|
|
AND (su.id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%'))
|
|
|
</if>
|
|
@@ -317,12 +317,6 @@
|
|
|
<if test="jobNature != null">
|
|
|
AND t.job_nature_ = #{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
</if>
|
|
|
- <if test="attendanceStatus == 'ERR_ATTENDANCE'">
|
|
|
- AND (ta.sign_in_status_ = 0 OR ta.sign_out_status_ = 0) AND (ta.sign_in_time_ IS NOT NULL OR ta.sign_out_time_ IS NOT NULL) AND ta.dispose_content_ IS NULL
|
|
|
- </if>
|
|
|
- <if test="attendanceStatus == 'NO_ATTENDANCE'">
|
|
|
- AND ta.sign_out_time_ IS NULL AND ta.sign_in_time_ IS NULL AND ta.dispose_content_ IS NULL
|
|
|
- </if>
|
|
|
</where>
|
|
|
</sql>
|
|
|
|