|
@@ -48,10 +48,16 @@
|
|
|
INNER JOIN exam_plan t2 ON (t1.exam_plan_id = t2.id OR t2.milexamids LIKE CONCAT('%', t1.milexamid, '%'))
|
|
|
INNER JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
|
|
|
LEFT JOIN base_course_subject t4 ON t1.course_subject_id = t4.id
|
|
|
+ LEFT JOIN base_class t5 ON t3.class_id = t5.id
|
|
|
WHERE t1.delete_mark = 0
|
|
|
AND t1.semester_id = #{dto.semesterId}
|
|
|
AND t2.id = #{dto.examPlanId}
|
|
|
- AND t3.class_id = #{dto.treeId}
|
|
|
+ <if test="dto.treeId != null">
|
|
|
+ AND t3.class_id = #{dto.treeId}
|
|
|
+ </if>
|
|
|
+ <if test="dto.teacherId != null">
|
|
|
+ AND t5.teacher_id = #{dto.teacherId}
|
|
|
+ </if>
|
|
|
order by t4.name
|
|
|
</select>
|
|
|
<select id="getClassStudentScoreList" parameterType="com.xjrsoft.module.xycxedu.dto.ClassStudentScorePageDto" resultType="com.xjrsoft.module.xycxedu.entity.ExamSubjectScore">
|