|
|
@@ -15,11 +15,11 @@
|
|
|
FROM base_student_assessment_inspection t
|
|
|
LEFT JOIN base_student_assessment_category t1 ON (t1.id = t.base_student_assessment_category_id)
|
|
|
LEFT JOIN base_student_assessment_project t2 ON (t2.id = t.base_student_assessment_project_id)
|
|
|
- LEFT JOIN base_semester t3 ON t.base_semester_id = t3.id
|
|
|
+ LEFT JOIN base_semester t3 ON t.base_semester_id = t3.id AND t3.delete_mark = 0
|
|
|
LEFT JOIN base_grade t4 ON t.grade_id = t4.id
|
|
|
LEFT JOIN xjr_user t5 ON t.assessment_user_id = t5.id
|
|
|
LEFT JOIN xjr_dictionary_detail t6 ON t6.code= t.score_type
|
|
|
- WHERE t.delete_mark = 0 AND t1.delete_mark = 0 AND t2.delete_mark = 0 AND t3.delete_mark = 0
|
|
|
+ WHERE t.delete_mark = 0 AND t1.delete_mark = 0 AND t2.delete_mark = 0
|
|
|
<if test="dto.projectIds != null">
|
|
|
and t.base_student_assessment_category_id = #{dto.projectIds}
|
|
|
</if>
|
