|
|
@@ -64,7 +64,7 @@
|
|
|
|
|
|
<select id="getMobilePage" parameterType="com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo">
|
|
|
SELECT t.id,t1.assessment_date,t2.name AS assessment_category_name,t3.name AS assessment_project_name,t5.name AS
|
|
|
- assessment_class_name,t1.reason,t1.score,t1.score_type,t4.name AS score_type_cn,
|
|
|
+ assessment_class_name,t1.reason,t1.total_score as score,t1.score_type,t4.name AS score_type_cn,
|
|
|
(
|
|
|
SELECT COUNT(*) FROM base_student_assessment_student_relation WHERE
|
|
|
base_student_assessment_inspection_id = t1.id AND class_id = t.class_id AND delete_mark = 0 and enabled_mark = 1
|
|
|
@@ -231,7 +231,7 @@
|
|
|
<select id="getAssessmentInspectionByClassIdList" parameterType="com.xjrsoft.module.student.dto.QuantitativeAssessmentSingleScoreDto" resultType="com.xjrsoft.module.student.vo.QuantitativeAssessmentSingleScoreVo">
|
|
|
select
|
|
|
t.class_ids as class_id,
|
|
|
- SUM(t.score * (LENGTH(personal_student_user_ids) - LENGTH(REPLACE(personal_student_user_ids, ',', '')) + 1)) AS sumScore
|
|
|
+ SUM(t.score * IF(personal_student_user_ids IS NULL, 1,(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 and t.enabled_mark = 1
|