|
@@ -32,7 +32,7 @@
|
|
|
<if test="userId != null and userId != ''">
|
|
<if test="userId != null and userId != ''">
|
|
|
and tbeiu.user_id = #{userId}
|
|
and tbeiu.user_id = #{userId}
|
|
|
</if>
|
|
</if>
|
|
|
- and tbeiu.exam_id = tees.exam_id
|
|
|
|
|
|
|
+ and tbeiu.exam_id = tees.exam_id and tees.room_code = tbeiu.room_code
|
|
|
)
|
|
)
|
|
|
<if test="examId != null and examId != ''">
|
|
<if test="examId != null and examId != ''">
|
|
|
and tees.exam_id = #{examId}
|
|
and tees.exam_id = #{examId}
|
|
@@ -127,9 +127,6 @@
|
|
|
<if test="applyName != null and applyName !=''">
|
|
<if test="applyName != null and applyName !=''">
|
|
|
and tbu.name like CONCAT('%', #{applyName},'%')
|
|
and tbu.name like CONCAT('%', #{applyName},'%')
|
|
|
</if>
|
|
</if>
|
|
|
- and tee.enable = 1
|
|
|
|
|
- and teea.enable = 1
|
|
|
|
|
- and tees.enable = 1
|
|
|
|
|
and teer.status = 1
|
|
and teer.status = 1
|
|
|
</where>
|
|
</where>
|
|
|
order by tees.room_code
|
|
order by tees.room_code
|
|
@@ -159,9 +156,6 @@
|
|
|
<if test="orgId != null and orgId != ''">
|
|
<if test="orgId != null and orgId != ''">
|
|
|
and tee.org_id = #{orgId}
|
|
and tee.org_id = #{orgId}
|
|
|
</if>
|
|
</if>
|
|
|
- and tee.enable = 1
|
|
|
|
|
- and teea.enable = 1
|
|
|
|
|
- and tees.enable = 1
|
|
|
|
|
and teer.status = 1
|
|
and teer.status = 1
|
|
|
</where>
|
|
</where>
|
|
|
</select>
|
|
</select>
|
|
@@ -198,7 +192,7 @@
|
|
|
tbu.id = teer.create_id
|
|
tbu.id = teer.create_id
|
|
|
left join t_b_user tbu1 on
|
|
left join t_b_user tbu1 on
|
|
|
tbu1.id = teer.auditing_id
|
|
tbu1.id = teer.auditing_id
|
|
|
- <where>
|
|
|
|
|
|
|
+ <where> 1 = 1
|
|
|
<if test="userId != null and userId !=''">
|
|
<if test="userId != null and userId !=''">
|
|
|
and teer.auditing_id = #{userId}
|
|
and teer.auditing_id = #{userId}
|
|
|
</if>
|
|
</if>
|
|
@@ -235,9 +229,6 @@
|
|
|
<if test="applyName != null and applyName !=''">
|
|
<if test="applyName != null and applyName !=''">
|
|
|
and tbu.name like CONCAT('%', #{applyName},'%')
|
|
and tbu.name like CONCAT('%', #{applyName},'%')
|
|
|
</if>
|
|
</if>
|
|
|
- and tee.enable = 1
|
|
|
|
|
- and teea.enable = 1
|
|
|
|
|
- and tees.enable = 1
|
|
|
|
|
and (teer.status = 0 or teer.status = 2)
|
|
and (teer.status = 0 or teer.status = 2)
|
|
|
</where>
|
|
</where>
|
|
|
order by tees.room_code
|
|
order by tees.room_code
|
wangliang