Merge branch 'dev_v3.2.0' into release_v3.2.0

merge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamDetailPdfDownloadDto.java

@@ -3,8 +3,6 @@ package com.qmth.distributed.print.business.bean.dto;
 import com.qmth.distributed.print.business.entity.ExamDetail;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.io.File;
-
 /**
  * @Description: examDetail pdf dto
  * @Param:
@@ -26,61 +24,6 @@ public class ExamDetailPdfDownloadDto extends ExamDetail {
     @ApiModelProperty(value = "试卷编号")
     private String paperNumber;
 
-    @ApiModelProperty(value = "试卷文件")
-    private File paperFile;
-
-    @ApiModelProperty(value = "题卡文件")
-    private File cardFile;
-
-    @ApiModelProperty(value = "卷袋贴文件")
-    private File packageFile;
-
-    @ApiModelProperty(value = "签到表文件")
-    private File signFile;
-
-    @ApiModelProperty(value = "登记表文件")
-    private File checkInFile;
-
-    public File getPaperFile() {
-        return paperFile;
-    }
-
-    public void setPaperFile(File paperFile) {
-        this.paperFile = paperFile;
-    }
-
-    public File getCardFile() {
-        return cardFile;
-    }
-
-    public void setCardFile(File cardFile) {
-        this.cardFile = cardFile;
-    }
-
-    public File getPackageFile() {
-        return packageFile;
-    }
-
-    public void setPackageFile(File packageFile) {
-        this.packageFile = packageFile;
-    }
-
-    public File getSignFile() {
-        return signFile;
-    }
-
-    public void setSignFile(File signFile) {
-        this.signFile = signFile;
-    }
-
-    public File getCheckInFile() {
-        return checkInFile;
-    }
-
-    public void setCheckInFile(File checkInFile) {
-        this.checkInFile = checkInFile;
-    }
-
     public String getSemesterName() {
         return semesterName;
     }

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

@@ -948,7 +948,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                         BasicAttachment attachment = basicAttachmentService.getById(e.getAttachmentId());
                         File paperFile = getAttachmentFile(attachment, time + File.separator + e.getSemesterName() + File.separator + e.getExamName() + File.separator + e.getCourseNameCode() + File.separator + e.getPackageCode() + File.separator + e.getCourseNameCode() + "-" + e.getPaperNumber() + "-" + PdfTypeEnum.PAPER.getTitle() + SystemConstant.PDF_PREFIX);
                         if (Objects.nonNull(paperFile)) {
-                            e.setPaperFile(paperFile);
                             sourceFileList.add(paperFile);
                         }
                     }
@@ -958,7 +957,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                         BasicAttachment cardAttachment = basicAttachmentService.getById(e.getCardAttachmentId());
                         File cardFile = getAttachmentFile(cardAttachment, time + File.separator + e.getSemesterName() + File.separator + e.getExamName() + File.separator + e.getCourseNameCode() + File.separator + e.getPackageCode() + File.separator + e.getCourseNameCode() + "-" + e.getPaperNumber() + "-" + PdfTypeEnum.CARD_A3.getTitle() + SystemConstant.PDF_PREFIX);
                         if (Objects.nonNull(cardFile)) {
-                            e.setCardFile(cardFile);
                             sourceFileList.add(cardFile);
                         }
                     }
@@ -974,17 +972,14 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             switch (pdfTypeEnum) {
                                 case PACKAGE:
                                     file = getJsonFile(object, time + File.separator + e.getSemesterName() + File.separator + e.getExamName() + File.separator + e.getCourseNameCode() + File.separator + e.getPackageCode() + File.separator + e.getCourseNameCode() + "-" + e.getPaperNumber() + "-" + pdfTypeEnum.getTitle() + SystemConstant.PDF_PREFIX);
-                                    e.setPackageFile(file);
                                     sourceFileList.add(file);
                                     break;
                                 case SIGN:
                                     file = getJsonFile(object, time + File.separator + e.getSemesterName() + File.separator + e.getExamName() + File.separator + e.getCourseNameCode() + File.separator + e.getPackageCode() + File.separator + e.getCourseNameCode() + "-" + e.getPaperNumber() + "-" + pdfTypeEnum.getTitle() + SystemConstant.PDF_PREFIX);
-                                    e.setSignFile(file);
                                     sourceFileList.add(file);
                                     break;
                                 case CHECK_IN:
                                     file = getJsonFile(object, time + File.separator + e.getSemesterName() + File.separator + e.getExamName() + File.separator + e.getCourseNameCode() + File.separator + e.getPackageCode() + File.separator + e.getCourseNameCode() + "-" + e.getPaperNumber() + "-" + pdfTypeEnum.getTitle() + SystemConstant.PDF_PREFIX);
-                                    e.setCheckInFile(file);
                                     sourceFileList.add(file);
                                     break;
                                 default: