Browse Source

班级考核数据,排除作废的数据

dzx 11 months ago
parent
commit
c08ab9be85

+ 3 - 5
src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -9,9 +9,7 @@
         SELECT NAME FROM base_class
         WHERE id = t.class_ids
         ) AS assessment_class_names,
-        (
-        (LENGTH(personal_student_user_ids) - LENGTH(REPLACE(personal_student_user_ids, ',', '')))
-        ) + 1 AS student_count,t.enabled_mark,t.assessment_type
+        (SELECT COUNT(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id = t.id AND delete_mark = 0 AND enabled_mark = 1) AS student_count,t.enabled_mark,t.assessment_type
         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)
@@ -51,7 +49,7 @@
     <select id="getInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo">
         select t.id,t.score,t.score_type,t.assessment_date,t.reason,t1.name as assessment_category_name,t2.name as assessment_project_name,
         t3.name as semester_name,t4.name as grade_name,t5.name as assessment_user_name,t6.name as score_type_cn,t.file_id,t7.name as create_user_name
-        ,t.total_score
+        ,(t.score * IF(personal_student_user_ids IS NULL, 1, (SELECT COUNT(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id = t.id AND delete_mark = 0 AND enabled_mark = 1))) as total_score
         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)
@@ -110,7 +108,7 @@
         left join xjr_user t6 on t1.assessment_user_id = t6.id
         left join xjr_user t7 on t1.create_user_id = t7.id
         left join xjr_user t9 on t1.modify_user_id = t9.id
-        where t.id = #{id} and t.enabled_mark = 1 and t1.enabled_mark = 1;
+        where t.id = #{id} and t1.enabled_mark = 1;
     </select>
 
     <select id="getStudentIndividualBehaviorExcelVoList" parameterType="com.xjrsoft.module.student.dto.QuantitativeAssessmentExcelDto" resultType="com.xjrsoft.module.student.vo.QuantitativeAssessmentSubTableExcelVo">