|
@@ -16,8 +16,8 @@
|
|
mark_paper t
|
|
mark_paper t
|
|
left join basic_exam be on be.id = t.exam_id
|
|
left join basic_exam be on be.id = t.exam_id
|
|
left join basic_semester bs on bs.id = be.semester_id
|
|
left join basic_semester bs on bs.id = be.semester_id
|
|
- left join sys_user su on t.user_id = su.id
|
|
|
|
left join teach_course tc ON tc.exam_id = t.exam_id and tc.course_code = t.course_code
|
|
left join teach_course tc ON tc.exam_id = t.exam_id and tc.course_code = t.course_code
|
|
|
|
+ left join sys_user su on tc.user_id = su.id
|
|
left join sys_user creator ON creator.id = tc.user_id
|
|
left join sys_user creator ON creator.id = tc.user_id
|
|
<where>
|
|
<where>
|
|
<if test="examId != null and examId != ''">
|
|
<if test="examId != null and examId != ''">
|
|
@@ -29,7 +29,7 @@
|
|
AND t.status = 'FINISH'
|
|
AND t.status = 'FINISH'
|
|
<if test="dpr != null">
|
|
<if test="dpr != null">
|
|
<if test="dpr.requestUserId != null">
|
|
<if test="dpr.requestUserId != null">
|
|
- AND t.user_id = #{dpr.requestUserId}
|
|
|
|
|
|
+ AND tc.user_id = #{dpr.requestUserId}
|
|
</if>
|
|
</if>
|
|
<if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
|
|
<if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
|
|
AND su.org_id IN
|
|
AND su.org_id IN
|