From 9ee387782515b2733c6ba6c9deba6ac99b76d94e Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 10 Mar 2026 14:32:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(archives):=20=E6=B7=BB=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=BA=BA=E4=B8=80=E6=A1=A3PDF=E7=94=9F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=9A=84=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/edu/command/query/archives/ArchivesQueryExe.java | 4 +++- .../com/zcloud/edu/service/archives/ArchivesServiceImpl.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java index d12d616..e0653fb 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java @@ -350,7 +350,6 @@ public class ArchivesQueryExe { byteArrayList.add(execteExamRecord(params)); System.out.println("5-------------------------------------------------------------"); } - log.info("execteGeneratePdfList,开始转换pdf{}", JSONUtil.toJsonStr(byteArrayList)); byte[] pdf = WordToPdfUtil.mergeWordToPdf(byteArrayList); Files.write(Paths.get(tempDir+"/"+params.getClassName()+"-一人一档-"+DateUtil.getSdfTimes()+".pdf"), pdf); @@ -462,6 +461,9 @@ public class ArchivesQueryExe { } public byte[] execteExamRecord(PersonArchivesDTO params){ try { + if(params.getStudentExamRecord() == null){ + return null; + } Map workItem = BeanUtil.beanToMap(params.getStudentExamRecord()); ArrayList workList = CollUtil.newArrayList(); AtomicInteger atomicIndex = new AtomicInteger(1); diff --git a/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java b/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java index 27f17f8..961b8d2 100644 --- a/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java @@ -61,7 +61,6 @@ public class ArchivesServiceImpl implements ArchivesServiceI { @Override public void downloadPersonArchivesList(ArchivesQry qry) { List personArchivesDTOList = archivesQueryExe.downloadPersonArchivesList(qry); - log.info("downloadPersonArchivesList,开始一人一档异步下载{}", JSONUtil.toJsonStr(personArchivesDTOList)); archivesQueryExe.execteGeneratePdfList(qry,personArchivesDTOList); }