|
@@ -462,13 +462,13 @@ public class CreatePdfUtil {
|
|
|
List<PdfDto> mergePdfA3List = new ArrayList<>();
|
|
|
List<PdfDto> mergePdfA4List = new ArrayList<>();
|
|
|
// AtomicInteger pageA4Count = new AtomicInteger(0);
|
|
|
- AtomicInteger pageA3Count = new AtomicInteger(0);
|
|
|
+// AtomicInteger pageA3Count = new AtomicInteger(0);
|
|
|
for (int i = 0; i < list.length; i++) {
|
|
|
if (list[i].size() > 0 && list[i].get(0).getPageSize() == PageSizeEnum.A4) {
|
|
|
// pageA4Count.addAndGet(list[i].stream().mapToInt(PdfDto::getPageCount).sum());
|
|
|
mergePdfA4List.addAll(list[i]);
|
|
|
} else if (list[i].size() > 0 && list[i].get(0).getPageSize() == PageSizeEnum.A3) {
|
|
|
- pageA3Count.addAndGet(list[i].stream().mapToInt(PdfDto::getPageCount).sum());
|
|
|
+// pageA3Count.addAndGet(list[i].stream().mapToInt(PdfDto::getPageCount).sum());
|
|
|
mergePdfA3List.addAll(list[i]);
|
|
|
}
|
|
|
}
|
|
@@ -487,7 +487,7 @@ public class CreatePdfUtil {
|
|
|
examDetail.setAttachmentId(basicAttachment.getId());
|
|
|
examDetail.setPagesA3(PdfUtil.getPdfPages(localA3PdfFile));
|
|
|
examDetail.setPagesA4(PdfUtil.getPdfPages(localA4PdfFile));
|
|
|
- log.info("pageA3Count:{},examDetail:{}", pageA3Count.get(), JacksonUtil.parseJson(examDetail));
|
|
|
+// log.info("pageA3Count:{},examDetail:{}", pageA3Count.get(), JacksonUtil.parseJson(examDetail));
|
|
|
examDetail.setStatus(PrintMethodEnum.AUTO == basicExamRule.getPrintMethod() ? ExamDetailStatusEnum.WAITING : ExamDetailStatusEnum.READY);
|
|
|
detailService.saveOrUpdate(examDetail);
|
|
|
ossUtil.ossUpload(dirNameA3, localA3PdfFile, DigestUtils.md5Hex(new FileInputStream(localA3PdfFile)));
|