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

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

@@ -175,8 +175,8 @@ public class DataUploadService {
                 sheetIn = new FileInputStream(savePath + File.separator + student.getExamNumber() + ".jpg");
                 slicein = new FileInputStream(thumbFileName);
             }
-            Paper exist = paperRepo.findByWorkIdAndSubjectAndExamNumber(student.getWorkId(), subject,
-                    student.getExamNumber());
+            Paper exist = paperRepo.findByWorkIdAndSubjectAndExamNumberAndTest(student.getWorkId(), subject,
+                    student.getExamNumber(), TrialEnum.DEFAULT.getId());
             String sheetMD5 = DigestUtils.md5Hex(sheetIn);
             String sliceMD5 = DigestUtils.md5Hex(slicein);
             sheetIn.close();
@@ -188,8 +188,8 @@ public class DataUploadService {
                 exist.setSliceMD5(sliceMD5);
                 paperRepo.save(exist);
             } else {
-                ExamQuestion examQuestion = examQuestionRepo.findByWorkIdAndSubjectAndAreaCode(student.getWorkId(), subject,
-                        student.getAreaCode());
+                ExamQuestion examQuestion = examQuestionRepo.findByWorkIdAndSubjectAndAreaCodeAndTest(student.getWorkId(), subject,
+                        student.getAreaCode(), TrialEnum.DEFAULT.getId());
                 Long random = getRandom(student.getWorkId(), student.getExamNumber());
                 Paper paper = new Paper(student.getWorkId(), null, subject, examQuestion, student, false, random);
                 paper.setSheetMD5(sheetMD5);
@@ -252,7 +252,7 @@ public class DataUploadService {
                             examQuestionRepo.save(question);
                         }
                     }
-                    Student student = studentRepo.findByWorkIdAndExamNumber(workId, dto.getExamNumber());
+                    Student student = studentRepo.findByWorkIdAndExamNumberAndTest(workId, dto.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
                     if (student == null && !isAbsent) {
                         student = new Student(dto.getName(), dto.getExamNumber(), dto.getAreaName(), dto.getAreaCode(),
                                 workId, dto.getExamRoom(), dto.getSourceName(), String.valueOf(TrialEnum.DEFAULT.getId()));
@@ -440,8 +440,8 @@ public class DataUploadService {
 
     @Transactional
     public Paper savePaper(Student student, Subject subject, boolean isManual) throws Exception {
-        ExamQuestion examQuestion = examQuestionRepo.findByWorkIdAndSubjectAndAreaCode(student.getWorkId(), subject, student.getAreaCode());
-        Paper paper = paperRepo.findByWorkIdAndSubjectAndExamNumber(student.getWorkId(), subject, student.getExamNumber());
+        ExamQuestion examQuestion = examQuestionRepo.findByWorkIdAndSubjectAndAreaCodeAndTest(student.getWorkId(), subject, student.getAreaCode(), TrialEnum.DEFAULT.getId());
+        Paper paper = paperRepo.findByWorkIdAndSubjectAndExamNumberAndTest(student.getWorkId(), subject, student.getExamNumber(), TrialEnum.DEFAULT.getId());
         if (paper == null) {
             Long random = getRandom(student.getWorkId(), student.getExamNumber());
             paper = new Paper(student.getWorkId(), null, subject, examQuestion, student, isManual, random);

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/api/CollectApi.java

@@ -115,7 +115,7 @@ public class CollectApi {
         loginDTO.setSubjects(collectSubjectDTOs);
 //        }
         //采集用户登录，生成随机数
-        if(Objects.equals(Role.COLLECTOR, markUser.getRole())){
+        if (Objects.equals(Role.COLLECTOR, markUser.getRole())) {
             RandomUtil.getRandom(activeWork.getId(), false);
         }
         return loginDTO;
@@ -159,7 +159,7 @@ public class CollectApi {
         List<CollectStuDTO> list = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss");
         for (CollectStuDTO dto : uploadStudentArray) {
-            Student student = studentRepo.findByWorkIdAndExamNumber(activeWork.getId(), dto.getExamNumber());
+            Student student = studentRepo.findByWorkIdAndExamNumberAndTest(activeWork.getId(), dto.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
             if (!dto.isAbsent()) {
                 dataUploadService.savePaper(student, subject, dto.isManual());
             }
@@ -192,7 +192,7 @@ public class CollectApi {
         try {
             inputStream = request.getInputStream();
 //            inputStream = new FileInputStream(srcFile);
-            Student student = studentRepo.findByWorkIdAndExamNumber(workId, fileName);
+            Student student = studentRepo.findByWorkIdAndExamNumberAndTest(workId, fileName, String.valueOf(TrialEnum.DEFAULT.getId()));
             Subject subject = Subject.values()[subjectId - 1];
 
             //保存原图
@@ -263,7 +263,7 @@ public class CollectApi {
         try {
             InputStream inputStream = request.getInputStream();
 //            inputStream = new FileInputStream(srcFile);
-            Student student = studentRepo.findByWorkIdAndExamNumber(workId, fileName);
+            Student student = studentRepo.findByWorkIdAndExamNumberAndTest(workId, fileName, String.valueOf(TrialEnum.DEFAULT.getId()));
             Subject subject = Subject.values()[subjectId - 1];
             //保存裁切原图+文件名加密
             String imageDir = systemConfig.getImageDir() + File.separator + workId + File.separator + subject
@@ -429,7 +429,7 @@ public class CollectApi {
                        @PathVariable String fileName,
                        HttpServletRequest request, HttpServletResponse response) throws Exception {
         InputStream inputStream = request.getInputStream();
-        Student student = studentRepo.findByWorkIdAndExamNumber(workId, fileName);
+        Student student = studentRepo.findByWorkIdAndExamNumberAndTest(workId, fileName, String.valueOf(TrialEnum.DEFAULT.getId()));
         Subject subject = Subject.values()[subjectId - 1];
         //保存遮盖图
         String savePath = systemConfig.getImageDir() + File.separator + workId + File.separator + subject
@@ -482,7 +482,7 @@ public class CollectApi {
     public void uploadsheet(@PathVariable Long workId, @PathVariable Integer subjectId,
                             @PathVariable String fileName,
                             HttpServletRequest request, HttpServletResponse response) throws Exception {
-        Student student = studentRepo.findByWorkIdAndExamNumber(workId, fileName);
+        Student student = studentRepo.findByWorkIdAndExamNumberAndTest(workId, fileName, String.valueOf(TrialEnum.DEFAULT.getId()));
         Subject subject = Subject.values()[subjectId - 1];
         InputStream inputStream = request.getInputStream();
         //保存原图图

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/PaperRepo.java

@@ -198,6 +198,8 @@ public interface PaperRepo extends JpaRepository<Paper, Long>, JpaSpecificationE
      */
     List<Paper> findByWorkIdAndExamNumber(Long workId, String examNumber);
 
+    List<Paper> findByWorkIdAndExamNumberAndTest(Long workId, String examNumber, String test);
+
     /**
      * @param workId
      * @param secretNumber

stmms-ms-main/src/main/resources/application-dev.properties

@@ -29,7 +29,7 @@ spring.jpa.hibernate.ddl-auto=update
 
 spring.http.multipart.max-file-size=10Mb
 
-app.config.deviation=4
+app.config.deviation=2
 app.config.majority=true
 #超级管理员账号
 app.admin.loginName=admin-cy