|
|
@@ -120,7 +120,7 @@
|
|
|
LEFT JOIN base_student_school_roll t3 ON t1.student_user_id = t3.user_id
|
|
|
LEFT JOIN base_class t4 ON t3.class_id = t4.id
|
|
|
WHERE t1.delete_mark = 0 AND t1.assessment_template_plan_id = #{dto.assessmentTemplatePlanId}
|
|
|
- and t1.submit_status = 1
|
|
|
+ and t1.submit_status = 1 and t3.archives_status = 'FB2901'
|
|
|
<if test="dto.keyword != null and dto.keyword != ''">
|
|
|
and (t2.name like concat('%', #{dto.keyword}, '%') or t4.name like concat('%', #{dto.keyword}, '%'))
|
|
|
</if>
|
|
|
@@ -150,7 +150,7 @@
|
|
|
<if test="dto.submitStatus != null and dto.submitStatus == 1">
|
|
|
and t1.submit_status = 1
|
|
|
</if>
|
|
|
-
|
|
|
+ and t3.archives_status = 'FB2901'
|
|
|
<if test="dto.keyword != null and dto.keyword != ''">
|
|
|
and (t2.name like concat('%', #{dto.keyword}, '%') or t4.name like concat('%', #{dto.keyword}, '%'))
|
|
|
</if>
|