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

src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -159,6 +159,7 @@ public class BaseStudentAssessmentInspectionController {
 
         BaseStudentAssessmentInspection inspection = inspectionService.getById(relation.getBaseStudentAssessmentInspectionId());
         inspection.setModifyDate(new Date());
+        inspection.setModifyUserId(StpUtil.getLoginIdAsLong());
         inspectionService.updateById(inspection);
         return RT.ok(update);
     }

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, t1.modify_date
+        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
         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)
@@ -110,6 +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
+        left join xjr_user t10 on t.modify_user_id = t10.id
         where t.id = #{id} and t1.enabled_mark = 1;
     </select>