|
@@ -466,7 +466,10 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
|
List<PdfDto> mergePdfDeleteList = new ArrayList<>();
|
|
|
mergePdfDeleteList.addAll(examStudentPdfList);
|
|
|
mergePdfDeleteList.addAll(cardPdfList);
|
|
|
- basicAttachmentList.add(createPdfUtil.mergePdfSaveDb(dirNameA4, dirNameA3, tbTask, sysUser.getId(), examDetail, basicExamRule, mergePdfDeleteList));
|
|
|
+ BasicAttachment attachment = createPdfUtil.mergePdfSaveDb(dirNameA4, dirNameA3, tbTask, sysUser.getId(), examDetail, basicExamRule, mergePdfDeleteList);
|
|
|
+ if (basicAttachmentList != null) {
|
|
|
+ basicAttachmentList.add(attachment);
|
|
|
+ }
|
|
|
}
|
|
|
updateExamPrintPlan(basicExamRule, examPrintPlan);
|
|
|
map.computeIfAbsent("size", v -> examDetailList.size());
|