美术阅卷11月新增需求-修复BUG

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/UserApi.java

@@ -61,6 +61,9 @@ public class UserApi {
         domain.setName(user.getName());
         domain.setMarkRight(user.getMarkRight());
         domain.setWeight(user.getWeight());
+        domain.setOneClickLevel(user.getOneClickLevel());
+        domain.setStandardVolume(user.getStandardVolume());
+        domain.setLevelCallback(user.getLevelCallback());
         markUserRepo.save(domain);
     }
 

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

@@ -339,6 +339,24 @@ public class DataUploadService {
             public ExcelError handle(Object obj) throws Exception {
                 try {
                     StudentDTO dto = (StudentDTO) obj;
+                    //复制学生给试评用
+                    Student studentNew = null;
+                    Student student = studentRepo.findByWorkIdAndExamNumberAndTest(workId, dto.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
+                    if (student == null) {
+                        throw new Exception("没有学生" + student.getName() + "信息");
+                    }
+                    if (!student.getUploadStatus().contains(subject + ":1")) {
+                        throw new Exception("学生" + student.getName() + "未上传完试卷");
+                    }
+
+                    //复制paper
+                    Paper paper = paperRepo.findByWorkIdAndSubjectAndExamNumberAndAreaCodeAndTest(workId, subject, student.getExamNumber(), dto.getAreaCode(), TrialEnum.DEFAULT.getId());
+                    if (Objects.isNull(paper)) {
+                        paper = paperRepo.findByWorkIdAndSubjectAndExamNumberAndAreaCodeAndTest(workId, subject, student.getExamNumber(), dto.getAreaCode(), TrialEnum.START_FORMAL.getId());
+                    }
+                    if (paper.getIsMissing()) {
+                        return null;
+                    }
 
                     String examNumber = dto.getExamNumber();
                     //如果没有设置区域代码，用准考证前2位作为区域代码
@@ -365,29 +383,13 @@ public class DataUploadService {
                             BeanUtils.copyProperties(questionTemp, questionNew);
                         }
                     }
-                    //复制学生给试评用
-                    Student studentNew = null;
-                    Student student = studentRepo.findByWorkIdAndExamNumberAndTest(workId, dto.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
-                    if (student == null) {
-                        throw new Exception("没有学生" + student.getName() + "信息");
-                    } else {
-                        if (!student.getUploadStatus().contains(subject + ":1")) {
-                            throw new Exception("学生" + student.getName() + "未上传完试卷");
-                        }
-                        studentNew = new Student();
-                        BeanUtils.copyProperties(student, studentNew);
-                        studentNew.setId(null);
-                        studentNew.setTest(jsonObject.toJSONString());
-                        studentRepo.save(studentNew);
-                    }
-                    //复制paper
-                    Paper paper = paperRepo.findByWorkIdAndSubjectAndExamNumberAndAreaCodeAndTest(workId, subject, student.getExamNumber(), dto.getAreaCode(), TrialEnum.DEFAULT.getId());
-                    if (Objects.isNull(paper)) {
-                        paper = paperRepo.findByWorkIdAndSubjectAndExamNumberAndAreaCodeAndTest(workId, subject, student.getExamNumber(), dto.getAreaCode(), TrialEnum.START_FORMAL.getId());
-                    }
-                    if (paper.getIsMissing()) {
-                        throw new Exception("学生" + student.getName() + "试卷已标记为缺考");
-                    }
+
+                    studentNew = new Student();
+                    BeanUtils.copyProperties(student, studentNew);
+                    studentNew.setId(null);
+                    studentNew.setTest(jsonObject.toJSONString());
+                    studentRepo.save(studentNew);
+
                     Paper paperNew = new Paper();
                     BeanUtils.copyProperties(paper, paperNew);
                     paperNew.setId(null);