|
|
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
left join t_staffmgr s on s.staffid = d.staff_id
|
|
|
left join t_trainingbcc t on t.id = d.regular_id and t.DEL_FLAG = 0
|
|
|
<where>
|
|
|
- <if test="staffId != null and staffId != ''"> and d.staff_id = #{staffId} and ((ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) > t.course_startdate and t.course_enddate >= SYSDATE) or (d.supplementary = 1 and d.exam_state = 0)) </if>
|
|
|
+ <if test="staffId != null and staffId != ''"> and d.staff_id = #{staffId} and d.exam_state != 1 and ((ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) > t.course_startdate and t.course_enddate >= SYSDATE) or (d.supplementary = 1 and d.exam_state = 0)) </if>
|
|
|
<if test="regularId != null "> and d.regular_id = #{regularId}</if>
|
|
|
<if test="startDate != null "> and d.start_date = #{startDate}</if>
|
|
|
<if test="remarks != null and remarks != ''"> and d.remarks = #{remarks}</if>
|
