|
@@ -943,11 +943,18 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
|
zipLocalRootPath = dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + time;
|
|
|
sourceFileList = new ArrayList<>(examDetailList.size() * 5);
|
|
|
for (ExamDetailPdfDownloadDto e : examDetailList) {
|
|
|
- String dirPath = time + File.separator + e.getSemesterName() + File.separator + e.getExamName() + File.separator + e.getCourseNameCode() + File.separator + e.getPackageCode() + File.separator + e.getCourseNameCode() + "-" + e.getPaperNumber() + "-";
|
|
|
+ StringJoiner dirPath = new StringJoiner("")
|
|
|
+ .add(String.valueOf(time)).add(File.separator)
|
|
|
+ .add(e.getSemesterName()).add(File.separator)
|
|
|
+ .add(e.getExamName()).add(File.separator)
|
|
|
+ .add(e.getCourseNameCode()).add(File.separator)
|
|
|
+ .add(e.getPackageCode()).add(File.separator)
|
|
|
+ .add(e.getCourseNameCode()).add("-")
|
|
|
+ .add(e.getPaperNumber()).add("-");
|
|
|
//试卷合并文件
|
|
|
if (Objects.nonNull(e.getAttachmentId())) {
|
|
|
BasicAttachment attachment = basicAttachmentService.getById(e.getAttachmentId());
|
|
|
- File paperFile = getAttachmentFile(attachment, dirPath + PdfTypeEnum.PAPER.getTitle() + SystemConstant.PDF_PREFIX);
|
|
|
+ File paperFile = getAttachmentFile(attachment, dirPath.toString() + PdfTypeEnum.PAPER.getTitle() + SystemConstant.PDF_PREFIX);
|
|
|
if (Objects.nonNull(paperFile)) {
|
|
|
sourceFileList.add(paperFile);
|
|
|
}
|
|
@@ -956,7 +963,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
|
//题卡合并文件
|
|
|
if (Objects.nonNull(e.getCardAttachmentId())) {
|
|
|
BasicAttachment cardAttachment = basicAttachmentService.getById(e.getCardAttachmentId());
|
|
|
- File cardFile = getAttachmentFile(cardAttachment, dirPath + PdfTypeEnum.CARD_A3.getTitle() + SystemConstant.PDF_PREFIX);
|
|
|
+ File cardFile = getAttachmentFile(cardAttachment, dirPath.toString() + PdfTypeEnum.CARD_A3.getTitle() + SystemConstant.PDF_PREFIX);
|
|
|
if (Objects.nonNull(cardFile)) {
|
|
|
sourceFileList.add(cardFile);
|
|
|
}
|
|
@@ -973,7 +980,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
|
case PACKAGE:
|
|
|
case SIGN:
|
|
|
case CHECK_IN:
|
|
|
- File file = getJsonFile(object, dirPath + pdfTypeEnum.getTitle() + SystemConstant.PDF_PREFIX);
|
|
|
+ File file = getJsonFile(object, dirPath.toString() + pdfTypeEnum.getTitle() + SystemConstant.PDF_PREFIX);
|
|
|
if (Objects.nonNull(file)) {
|
|
|
sourceFileList.add(file);
|
|
|
}
|