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

src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.student.mapper.BaseStudentAssessmentInspectionMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo">
-        SELECT t.id,t.score,t.total_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,
+        SELECT t.id,t.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,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,
         (
         SELECT NAME FROM base_class
         WHERE id = t.class_ids
@@ -65,11 +65,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.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
-        ) AS student_count,t1.assessment_type,
+        assessment_class_name,t1.reason,(t1.score * IF(personal_student_user_ids IS NULL, 1, (SELECT COUNT(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id = t1.id AND delete_mark = 0 AND enabled_mark = 1))) 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
@@ -114,7 +110,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};
+        where t.id = #{id} and t.enabled_mark = 1 and t1.enabled_mark = 1;
     </select>
 
     <select id="getStudentIndividualBehaviorExcelVoList" parameterType="com.xjrsoft.module.student.dto.QuantitativeAssessmentExcelDto" resultType="com.xjrsoft.module.student.vo.QuantitativeAssessmentSubTableExcelVo">
@@ -337,6 +333,6 @@
         INNER JOIN base_major_set t5 ON t4.major_set_id = t5.id
         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}
+        WHERE t1.base_student_assessment_inspection_id = #{id} and t1.enabled_mark = 1
     </select>
 </mapper>