From 3c05c87ea32fb48e24e5f0bd45b839121b6594a0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 24 Jan 2024 16:46:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080016=09=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2-=E5=90=84=E9=83=A8=E9=97=A8=E4=B8=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8A=E6=8A=A5=EF=BC=9A=E5=AF=BC=E5=85=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=8C=89=E7=85=A7=E6=A8=A1=E6=9D=BF=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E4=B8=80=E7=9B=B4=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualInitServiceImpl.java          | 4 ++--
 .../service/impl/ProcessEsAnnualReportServiceImpl.java        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index e9dc416f..c14e1e04 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -458,7 +458,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         try {
             headers = ExcelUtils.getHeaderFromExcel(file.getInputStream(), 0);
         } catch (Exception e) {
-            errorMsgs.add("导入模板错误。");
+            errorMsgs.add("模板错误，请按照系统模板导入！");
             resultMap.put("msg", errorMsgs);
             resultMap.put("flag", YesOrNoEnum.NO.getValue());
             log.error(e.getMessage(), e);
@@ -468,7 +468,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         // 使用静态方法验证header
         boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(ProcessEsAnnualInit.class));
         if (!isMatched) {
-            errorMsgs.add("导入模板错误。");
+            errorMsgs.add("模板错误，请按照系统模板导入！");
             resultMap.put("msg", errorMsgs);
             resultMap.put("flag", YesOrNoEnum.NO.getValue());
             return resultMap; // 返回错误信息
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 9d9b68e2..7eac21e2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -339,7 +339,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         try {
             headers = ExcelUtils.getHeaderFromExcel(file.getInputStream(), 0);
         } catch (Exception e) {
-            errorMsgs.add("导入模板错误。");
+            errorMsgs.add("模板错误，请按照系统模板导入！");
             resultMap.put("msg", errorMsgs);
             resultMap.put("flag", YesOrNoEnum.NO.getValue());
             log.error(e.getMessage(), e);
@@ -349,7 +349,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         // 使用静态方法验证header
         boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(ProcessEsAnnualReport.class));
         if (!isMatched) {
-            errorMsgs.add("导入模板错误。");
+            errorMsgs.add("模板错误，请按照系统模板导入！");
             resultMap.put("msg", errorMsgs);
             resultMap.put("flag", YesOrNoEnum.NO.getValue());
             return resultMap; // 返回错误信息