From 8bb3c834a4cd0cd23631e2363321cd1e59c96cca Mon Sep 17 00:00:00 2001 From: tangw Date: Thu, 16 Jul 2026 15:41:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/PrintReportService.java | 18 ++++++++++++++---- .../interfaceCommon/utils/ReportUtil.java | 3 ++- .../service/impl/stats/StatsServiceImpl.java | 4 ++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/service/PrintReportService.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/service/PrintReportService.java index b1bc684..58fc3f7 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/service/PrintReportService.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/service/PrintReportService.java @@ -91,6 +91,7 @@ public class PrintReportService { // // 每5份或最后一份推送一次进度，减少消息风暴 // if ((i + 1) % 5 == 0 || i == total - 1) { int currProgress = (i + 1) * 100 / total; + if(currProgress==100)currProgress=99; progressDTO.setProgress(currProgress); progressDTO.setStatus(bg.getFlag()); progressDTO.setDesc("正在生成第" + (i + 1) + "/" + total + "份报告"); @@ -102,11 +103,18 @@ public class PrintReportService { sendPrintWsMsg(clientSid, progressDTO); // } } - + if(mergeBgdhList.size()==0){ + progressDTO.setErrorMsg("任务执行失败："); + progressDTO.setDesc("报告为空,结束打印"); + progressDTO.setProgress(100); + progressDTO.setYbh(null); + sendPrintWsMsg(clientSid, progressDTO); + return ; + } // 全部单份PDF生成完成，开始合并 - progressDTO.setDesc("正在合并全部PDF文件..."); - progressDTO.setProgress(98); - sendPrintWsMsg(clientSid, progressDTO); +// progressDTO.setDesc("正在合并全部PDF文件..."); +// progressDTO.setProgress(99); +// sendPrintWsMsg(clientSid, progressDTO); String pdfName = UUID.randomUUID().toString(); String path = staticPath + pdfName + ".pdf"; @@ -125,6 +133,7 @@ public class PrintReportService { progressDTO.setDesc("批量打印任务完成，成功：" + ok + "份，失败：" + fall + "份"); progressDTO.setPdfBase64(pdfBase64); progressDTO.setErrorMsg(null); + progressDTO.setYbh(null); progressDTO.setSuccCount(ok); progressDTO.setFailCount(fall); sendPrintWsMsg(clientSid, progressDTO); @@ -133,6 +142,7 @@ public class PrintReportService { log.error("批量打印任务异常 taskId:{}", taskId, e); // 推送异常消息 progressDTO.setStatus("error"); + progressDTO.setYbh(null); progressDTO.setErrorMsg("任务执行失败：" + e.getMessage()); progressDTO.setDesc("批量打印出现异常"); sendPrintWsMsg(clientSid, progressDTO); diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java index 57f9654..f7f90e0 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java @@ -134,7 +134,8 @@ public class ReportUtil { try (Connection connection = dataSource.getConnection()) { JasperReportUtil.exportToPdf(templatename, stringObjectMap, connection, outputPath); } catch (Exception e) { - log.error("打印条码失败,参数{}", reportParam, e); + log.error("报告模板生成报告失败,参数{}", reportParam, e); + return new Result("-1", "报告模板生成报告失败！"+e.getMessage()); } String httpPath = getPrintURL(pdfName1); log.info("传给前端的pdf地址：{}", httpPath); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java index c68a1b8..d67f1ed 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java @@ -44,9 +44,9 @@ public class StatsServiceImpl implements StatsService { param.setStatus("0"); List list=comStatsParameterMapper.selectComStatsParameterList(param); if(list==null||list.size()==0)return new Result("-1","未找到该模板参数"); - List columnlist=list.stream().filter(ss->"1".equals(ss.getParamType())||"2".equals(ss.getParamType())||"6".equals(ss.getParamType())).collect(Collectors.toList()); + List columnlist=list.stream().filter(ss->"1".equals(ss.getParamType())||"6".equals(ss.getParamType())).collect(Collectors.toList()); List summarylist=list.stream().filter(ss->"3".equals(ss.getParamType())).collect(Collectors.toList()); - List parameter=list.stream().filter(ss->"0".equals(ss.getParamType())||"2".equals(ss.getParamType())).collect(Collectors.toList()); + List parameter=list.stream().filter(ss->"0".equals(ss.getParamType())).collect(Collectors.toList()); List subquery=list.stream().filter(ss->"4".equals(ss.getParamType())).collect(Collectors.toList()); if(parameter!=null&¶meter.size()>0){ for(ComStatsParameter p:parameter){