From 70d30f30d1bec7eb321b7414639ce84dcf442a0f Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Wed, 28 May 2025 16:26:07 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99,=E4=BF=AE=E6=94=B9pdf=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/impl/BusinessAlertServiceImpl.java        | 3 ++-
 dk-modules/business/src/main/resources/templates/pdfAlert.ftl  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
index d00d5eb..587b2e3 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
@@ -968,7 +968,8 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
                 try {
                     MinioUtil.deleteFile(businessAlert.getImages(), MinIOConstants.BUCKET_DKCY);
                 } catch (Exception e) {
-                    throw new RuntimeException(e);
+                    log.error(e.getMessage(),e);
+//                    throw new RuntimeException(e);
                 }
             }
         }
diff --git a/dk-modules/business/src/main/resources/templates/pdfAlert.ftl b/dk-modules/business/src/main/resources/templates/pdfAlert.ftl
index 2e9d77d..e82d10e 100644
--- a/dk-modules/business/src/main/resources/templates/pdfAlert.ftl
+++ b/dk-modules/business/src/main/resources/templates/pdfAlert.ftl
@@ -31,7 +31,7 @@
 <h2>一、报表日期</h2>
 <p>${startTime?if_exists}~${endTime?if_exists}</p>
 <h2>二、数据情况</h2>
-<p>预警信息总计：${total?if_exists}条；未处理：${todo?if_exists}条; 已完结：${finish?if_exists}条; 已忽略：${cancel?if_exists}条。</p>
+<p>预警信息总计：${total?if_exists}条；未处理：${todo?if_exists}条; 已完结：${finish?if_exists}条。</p>
 <p>详情如下</p>
 
 <table>