瀏覽代碼

美术阅卷10月新增需求-试评BUG修复

wangliang 5 年之前
父節點
當前提交
e40faee1f2

+ 2 - 2
stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/service/DataUploadService.java

@@ -251,7 +251,7 @@ public class DataUploadService {
                     Student student = studentRepo.findByWorkIdAndExamNumber(workId, dto.getExamNumber());
                     Student student = studentRepo.findByWorkIdAndExamNumber(workId, dto.getExamNumber());
                     if (student == null && !isAbsent) {
                     if (student == null && !isAbsent) {
                         student = new Student(dto.getName(), dto.getExamNumber(), dto.getAreaName(), dto.getAreaCode(),
                         student = new Student(dto.getName(), dto.getExamNumber(), dto.getAreaName(), dto.getAreaCode(),
-                                workId, dto.getExamRoom(), dto.getSourceName());
+                                workId, dto.getExamRoom(), dto.getSourceName(), String.valueOf(TrialEnum.DEFAULT.getId()));
                         if (!checkObjFieldIsNotNull(student)) {
                         if (!checkObjFieldIsNotNull(student)) {
                             throw new RuntimeException("考生信息缺失");
                             throw new RuntimeException("考生信息缺失");
                         }
                         }
@@ -495,7 +495,7 @@ public class DataUploadService {
      */
      */
     private boolean checkObjFieldIsNotNull(Object obj) {
     private boolean checkObjFieldIsNotNull(Object obj) {
         for (Field field : obj.getClass().getDeclaredFields()) {
         for (Field field : obj.getClass().getDeclaredFields()) {
-            if (Objects.equals("id", field.getName())) {
+            if (Objects.equals("id", field.getName()) || Objects.equals("test", field.getName())) {
                 continue;
                 continue;
             }
             }
             field.setAccessible(true);
             field.setAccessible(true);

+ 2 - 1
stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/Student.java

@@ -60,7 +60,7 @@ public class Student implements Serializable {
         this.test = test;
         this.test = test;
     }
     }
 
 
-    public Student(String name, String examNumber, String areaName, String areaCode, Long workId, String examRoom, String sourceName) {
+    public Student(String name, String examNumber, String areaName, String areaCode, Long workId, String examRoom, String sourceName, String test) {
         this.name = name;
         this.name = name;
         this.examNumber = examNumber;
         this.examNumber = examNumber;
         this.areaName = areaName;
         this.areaName = areaName;
@@ -68,6 +68,7 @@ public class Student implements Serializable {
         this.workId = workId;
         this.workId = workId;
         this.examRoom = examRoom;
         this.examRoom = examRoom;
         this.sourceName = sourceName;
         this.sourceName = sourceName;
+        this.test = test;
     }
     }
 
 
     public Student() {
     public Student() {