浏览代码

1.在新增考生或者导入考生信息时默认将违纪字段设置为false;
2.优化“将违纪考生调整正常考生”的逻辑

nikang 6 年之前
父节点
当前提交
62b1c5a920

+ 4 - 2
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/parameter/ExamStudentController.java

@@ -191,6 +191,7 @@ public class ExamStudentController extends BaseParameterController {
                 student.setSchoolId(exam.getSchoolId());
                 student.setSubjectName(subject.getName());
                 student.setAbsent(false);
+                student.setBreach(false);
                 student.setUpload(false);
                 student.setException(false);
                 student.setSliceCount(0);
@@ -270,6 +271,7 @@ public class ExamStudentController extends BaseParameterController {
                 student.setSheetCount(0);
                 student.setObjectiveScore(0d);
                 student.setSubjectiveScore(0d);
+                student.setBreach(false);
 
                 if (checkExamNumber(student, current, saveMap)) {
                     saveList.add(student);
@@ -327,7 +329,7 @@ public class ExamStudentController extends BaseParameterController {
             addMessage(redirectAttributes, "已成功导入 " + successNum + " 条用户");
         } catch (Exception e) {
             log.error("Batch import BreachStudent error!", e);
-            addMessage(redirectAttributes, "导入考生失败!失败信息:" + e.getMessage());
+            addMessage(redirectAttributes, "导入违纪考生失败!失败信息:" + e.getMessage());
         }
         return "redirect:" + "/admin/exam-param/student";
     }
@@ -340,8 +342,8 @@ public class ExamStudentController extends BaseParameterController {
         ExamStudent student = studentService.findById(id);
         student.setBreach(false);
         try {
-            student = studentService.save(student);
             saveMarkLibrary(student);
+            student = studentService.save(student);
             if (student != null) {
                 result.accumulate("message", "重置成功!");
                 result.accumulate("success", true);