3.3.0 fix

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -563,7 +563,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             //合并（试卷+备用试卷）
             String dirNamePaper = createPdfUtil.mergeA3Pdf(fileTempList, paperPdfList, backupPaperPdfList);
             //合并A4（签到表+卷袋贴+登记表）
-            String dirNameA4 = createPdfUtil.mergeA4Pdf(fileTempList, variablePdfList, ordinaryPdfList);
+//            String dirNameA4 = createPdfUtil.mergeA4Pdf(fileTempList, variablePdfList, ordinaryPdfList);
             //合并A3（题卡+备用题卡）
             String dirNameCardA3 = createPdfUtil.mergeA3Pdf(fileTempList, examStudentPdfList, backupCardPdfList);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -114,7 +114,7 @@ public class CreatePdfUtil {
             String filePath = (String) jsonObject.get(SystemConstant.PATH);
             UploadFileEnum uploadFileEnum = UploadFileEnum.valueOf((String) jsonObject.get(SystemConstant.UPLOAD_TYPE));
 
-            PrintPathVo printPathVo = new PrintPathVo(ClassifyEnum.CHECK_IN, uploadFileEnum, SystemConstant.LOCAL,filePath, basicAttachment.getMd5(), null, null);
+            PrintPathVo printPathVo = new PrintPathVo(ClassifyEnum.CHECK_IN, uploadFileEnum, SystemConstant.LOCAL, filePath, basicAttachment.getMd5(), null, null);
             examDetail.setAttachmentPath(printCommonService.parseAttachmentPath(examDetail.getAttachmentPath(), printPathVo));
 
             for (int i = 0; i < printCount; i++) {
@@ -1222,6 +1222,7 @@ public class CreatePdfUtil {
         if (StringUtils.isNotBlank(dirNamePaper)) {
             dirNamePaper = FileUtil.replaceSplit(dirNamePaper);
             localPaperPdfFile = new File(dirNamePaper);
+            examDetail.setPaperPages(PdfUtil.getPdfPages(localPaperPdfFile));
             basicAttachment = basicAttachmentService.saveAttachmentPdf(dirNamePaper, userId);
             if (StringUtils.isBlank(tbTask.getImportFileName())) {
                 tbTask.setImportFileName(basicAttachment.getName());
@@ -1234,6 +1235,7 @@ public class CreatePdfUtil {
         // 题卡
         if (StringUtils.isNotBlank(dirNameCardA3)) {
             localA3PdfCardFile = new File(FileUtil.replaceSplit(dirNameCardA3));
+            examDetail.setCardPages(PdfUtil.getPdfPages(localA3PdfCardFile));
             basicAttachment = basicAttachmentService.saveAttachmentPdf(dirNameCardA3, userId);
             if (StringUtils.isBlank(tbTask.getImportFileName())) {
                 tbTask.setImportFileName(basicAttachment.getName());
@@ -1243,14 +1245,13 @@ public class CreatePdfUtil {
             }
             examDetail.setCardAttachmentId(basicAttachment.getId());
         }
-        examDetail.setPaperPages(PdfUtil.getPdfPages(localPaperPdfFile));
-        examDetail.setCardPages(PdfUtil.getPdfPages(localA3PdfCardFile));
-        examDetail.setPagesA4(PdfUtil.getPdfPages(localA4PdfFile));
+//        examDetail.setPagesA4(PdfUtil.getPdfPages(localA4PdfFile));
         if (PrintMethodEnum.AUTO == basicPrintConfig.getPrintMethod()) {
             examDetail.setStatus(ExamDetailStatusEnum.WAITING);
         } else {
             examDetail.setStatus(ExamDetailStatusEnum.READY);
         }
+        examDetail.setNormal(true);
         detailService.saveOrUpdate(examDetail);
         return basicAttachment;
     }

distributed-print/install/mysql/init/teachcloud_db.sql

@@ -1477,8 +1477,8 @@ CREATE TABLE IF NOT EXISTS `mark_question` (
         `objective_policy` varchar(16) DEFAULT NULL COMMENT '客观题判分策略',
         `question_type` varchar(2) DEFAULT NULL COMMENT '题型',
         `name` varchar(128) DEFAULT NULL,
-        `paper_index` int NOT NULL,
-        `page_index` int NOT NULL,
+        `paper_index` int DEFAULT NULL,
+        `page_index` int DEFAULT NULL,
         PRIMARY KEY (`id`) USING BTREE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='小题信息表';
 

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

@@ -18,6 +18,7 @@ import com.qmth.teachcloud.mark.params.MarkQuestionParams;
 import com.qmth.teachcloud.mark.service.MarkGroupService;
 import com.qmth.teachcloud.mark.service.MarkPaperService;
 import com.qmth.teachcloud.mark.service.MarkQuestionService;
+import jdk.nashorn.internal.runtime.QuotedStringTokenizer;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -93,7 +94,7 @@ public class MarkQuestionServiceImpl extends ServiceImpl<MarkQuestionMapper, Mar
                 if (question.getTotalScore() <= 0) {
                     throw ExceptionResultEnum.ERROR.exception("小题满分必须大于0");
                 }
-                if (question.getIntervalScore() <= 0) {
+                if (!question.getObjective() && (question.getIntervalScore() == null || question.getIntervalScore() <= 0)) {
                     throw ExceptionResultEnum.ERROR.exception("间隔分必须大于0");
                 }
                 question.setExamId(examId);