ソースを参照

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

dzx 11 ヶ月 前
コミット
e84a9f9e87

+ 5 - 0
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -154,7 +154,12 @@ public class BaseStudentAssessmentInspectionController {
     public RT<Boolean>  cancelStudent(@RequestBody CancelStudentDto dto){
         BaseStudentAssessmentStudentRelation relation = studentRelationService.getById(dto.getId());
         relation.setEnabledMark(EnabledMark.DISABLED.getCode());
+        relation.setModifyDate(new Date());
         boolean update = studentRelationService.updateById(relation);
+
+        BaseStudentAssessmentInspection inspection = inspectionService.getById(relation.getBaseStudentAssessmentInspectionId());
+        inspection.setModifyDate(new Date());
+        inspectionService.updateById(inspection);
         return RT.ok(update);
     }
 }

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

@@ -95,7 +95,9 @@
     </select>
 
     <select id="getMobileInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo">
-        select t.id,t.class_id,t.base_student_assessment_inspection_id,t1.score,t5.name as assessment_class_name,t2.name as assessment_category_name,t3.name as assessment_project_name,t1.assessment_date,t1.reason,
+        select t.id,t.class_id,t.base_student_assessment_inspection_id,
+        (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
         from base_student_assessment_class_relation t