From 79e4810ef897ce5ebedf732b86550b6f2ed8c38d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 1 Sep 2023 11:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java   | 6 ++++--
 .../main/java/com/jero/modules/report/util/WordUtil.java    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
index 877e7d373..8ce919190 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
@@ -634,8 +634,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		String memoriesChapterContentCn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-CN.docx";
 		String memoriesChapterContentEn = path + File.separator +"蔚来汽车法规月报-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx";
 //		String memoriesChapterContentEn = path + File.separator +"Weilai Automobile Regulations Monthly Report-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-EN.docx";
-		String titleCN = "蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth();
-		String titleEN = "NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth();
+//		String titleCN = "蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0);
+//		String titleEN = "NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth();
+		String titleCN = "蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth().replace("-","");
+		String titleEN = "NIO Monthly Regulation Report";
 
 		File wordFile = new File(memoriesChapterCN);
 		File wordFileEn = new File(memoriesChapterEN);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
index 55fe92bc8..15a9f3f33 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
@@ -580,7 +580,7 @@ public class WordUtil {
             }
 
             if (org.apache.commons.lang3.StringUtils.isNotBlank(sb)) {
-                technologyTerritoryName = sb.substring(0, sb.length());
+                technologyTerritoryName = sb.substring(0, sb.length()-1);
             }
         }
         //适用车型中文名