3.4.0 update

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

@@ -1770,6 +1770,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             map.put("paperJson", examTaskPaperData.getPaperJson());
             map.put("answerJson", examTaskPaperData.getAnswerJson());
             map.put("attachmentId", String.valueOf(examTaskPaperData.getPaperPdfAttachmentId()));
+            map.put("paperUrl", examTaskPaperData.getPaperPdfAttachmentId() != null ? fileUploadService.filePreview(examTaskPaperData.getPaperPdfAttachmentId()) : null);
             return map;
         } catch (Exception e) {
             throw ExceptionResultEnum.ERROR.exception(e.getMessage());

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

@@ -852,10 +852,6 @@ public class PrintCommonServiceImpl implements PrintCommonService {
         // 校验命题任务是否提交
         ExamTask examTask = examTaskService.getByExamIdAndCourseIdAndPaperNumber(examId, courseId, paperNumber);
         BasicExam basicExam = basicExamService.getById(examTask.getExamId());
-        if (basicExam != null && ExamModelEnum.MODEL3.equals(basicExam.getExamModel())) {
-            log.info("考试模式为模式3，不生成pdf");
-            return;
-        }
 
         if (examTask != null && !examTask.getEnable()) {
             log.info("命题任务已禁用");

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

@@ -1154,7 +1154,7 @@ public class DownloadLogicServiceImpl implements DownloadLogicService {
 
             String excelLocalPath = zipLocalRootPath + File.separator + "下载清单" + "." + SystemConstant.XLSX;
             FileUtils.copyInputStreamToFile(in, new File(excelLocalPath));
-            // 所有试卷
+            // 所有文件
             JSONObject jsonObject = SystemConstant.createZip(zipFile, zipLocalRootPath, zipDirName);
             tbTask.setResultFilePath(jsonObject.toJSONString());
             map.put("count", examTaskDetailDtoList.size());