班级考核数据学生作废功能调整

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

@@ -99,7 +99,7 @@
         (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
         ,t5.name as assessment_class_name,t2.name as assessment_category_name,t3.name as assessment_project_name,t1.assessment_date,t1.reason,
         t6.name as assessment_user_name,t7.name as create_user_name,t1.create_date,t1.file_id,t1.score_type,t4.name as score_type_cn,t1.assessment_type,
-        t8.name as assessment_item_name,t9.name as modify_user_name, if(t.modify_date > t1.modify_date, t.modify_date, t1.modify_date) as modify_date
+        t8.name as assessment_item_name,t9.name as modify_user_name, t1.modify_date
         from base_student_assessment_class_relation t
         left join base_student_assessment_inspection t1 on t1.id=t.base_student_assessment_inspection_id
         left join base_student_assessment_category t2 on (t2.id = t1.base_student_assessment_category_id)

src/main/resources/sqlScript/视图信息.sql

@@ -64,11 +64,12 @@ LEFT JOIN xjr_dictionary_detail t42 ON t3.highest_education = t42.code
 LEFT JOIN xjr_user t43 ON t43.id = t7.teacher_id
 LEFT JOIN room_bed t44 ON t44.student_user_id = t1.id
 LEFT JOIN room t45 ON t45.id = t44.room_id
-WHERE t1.delete_mark = 0 
-AND t1.delete_mark = 0 
-AND t2.delete_mark = 0 
-AND t3.delete_mark = 0 
-AND t3.archives_status = 'FB2901';
+WHERE t1.delete_mark = 0
+AND t1.delete_mark = 0
+AND t2.delete_mark = 0
+AND t3.delete_mark = 0 AND t5.delete_mark = 0
+AND t3.archives_status = 'FB2901'
+ORDER BY t8.name DESC,t7.name
 
 
 -- 添加学生数据的数据源