3.3.0 fix

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java

@@ -622,7 +622,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                         }
                         AnswerPageVo pageVo = new AnswerPageVo();
                         pageVo.setIndex(p.getPageIndex());
-                        pageVo.setSheetUri(p.getSheetPath());
+                        pageVo.setSheetUri(teachcloudCommonService.filePreview(p.getSheetPath()));
                         if (query.getWithOmrDetail() != null && query.getWithOmrDetail()) {
                             pageVo.setAbsent(p.getAbsent());
                             pageVo.setBreach(p.getBreach());

teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/impl/PrintFinishServiceImpl.java

@@ -160,7 +160,6 @@ public class PrintFinishServiceImpl implements PrintFinishService {
             String rootPath = tempFile.getParent();
             String jsonPath = rootPath + File.separator + paperInfoVo.getCardId() + SystemConstant.JSON_PREFIX;
 
-
             InputStream inputStream = null;
             File jsonFile = null;
             try {
@@ -170,7 +169,7 @@ public class PrintFinishServiceImpl implements PrintFinishService {
                 if (jsonFile.exists()) {
                     inputStream = new FileInputStream(jsonFile);
                     String md5 = DigestUtils.md5Hex(new FileInputStream(jsonFile));
-                    Integer number = scanAnswerCardService.findMaxCardNumberByExamId(dto.getExamId());
+                    Integer number = scanAnswerCardService.findMaxCardNumberByExamId(dto.getExamId()) + 1;
                     String path = markFileService.getAnswerCardUri(dto.getExamId(), dto.getCoursePaperId(), number);
                     String uploadPath = fileStoreUtils.uploadFile(inputStream, md5, UploadFileEnum.CARD, path);
 
@@ -181,7 +180,7 @@ public class PrintFinishServiceImpl implements PrintFinishService {
                     scanAnswerCard.setCoursePaperId(dto.getCoursePaperId());
                     scanAnswerCard.setPaperType(dto.getPaperType());
                     scanAnswerCard.setCardId(paperInfoVo.getCardId());
-                    scanAnswerCard.setNumber(number + 1);
+                    scanAnswerCard.setNumber(number);
                     scanAnswerCard.setSource(CardSource.WEB);
                     scanAnswerCard.setUri(uploadPath);
                     scanAnswerCard.setMd5(md5);