|
|
@@ -230,6 +230,7 @@
|
|
|
t.class_ids as class_id,
|
|
|
SUM(t.score * (LENGTH(personal_student_user_ids) - LENGTH(REPLACE(personal_student_user_ids, ',', '')) + 1)) AS sumScore
|
|
|
from base_student_assessment_inspection t
|
|
|
+ inner join base_student_assessment_category t1 on t1.id = t.base_student_assessment_category_id
|
|
|
where t.delete_mark = 0
|
|
|
<if test="dto.classIdList != null and !dto.classIdList.isEmpty()">
|
|
|
and t.class_ids in
|
|
|
@@ -241,7 +242,7 @@
|
|
|
and t.base_student_assessment_category_id = #{dto.baseStudentAssessmentCategoryId}
|
|
|
</if>
|
|
|
<if test="dto.categoryCode != null and dto.categoryCode != ''">
|
|
|
- and t.code = #{dto.categoryCode}
|
|
|
+ and t1.code = #{dto.categoryCode}
|
|
|
</if>
|
|
|
<if test="dto.baseSemesterId != null and dto.baseSemesterId > 0">
|
|
|
and t.base_semester_id > #{dto.baseSemesterId}
|
|
|
@@ -329,6 +330,5 @@
|
|
|
LEFT JOIN xjr_dictionary_detail t6 ON t3.nation = t6.code
|
|
|
LEFT JOIN xjr_dictionary_detail t7 ON t2.gender = t7.code
|
|
|
WHERE t1.base_student_assessment_inspection_id = #{id}
|
|
|
- and t1.delete_mark = 0
|
|
|
</select>
|
|
|
</mapper>
|