From 04e6792f0b3c83fde46a40f9236eaaf92bb6b2e5 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 27 Oct 2022 10:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=201.=20=E4=B8=BB=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9=E8=A1=8C=202.=20=E6=96=B0?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E3=80=80=E5=8F=91=E5=B8=83=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=EF=BC=8C=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=203.=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=AF=B9=E9=BD=90(?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/enums/DictCodeReportEnum.java      |  1 +
 .../LawsMonthlyReportWriteEOServiceImpl.java  |  6 ++---
 .../jero/modules/report/util/WordUtil.java    | 26 +++++++++----------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java
index 5e6d09401..edb196464 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java
@@ -10,6 +10,7 @@ public enum DictCodeReportEnum {
     APPLYCAR("适用车型","car_type"),
     APPLYSCOPE("适用范围","fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2"),
     STATE("状态","state"),
+    STATE_REPORT("状态","fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4"),
     USEMETHOD("用法","yong4_fa3");
 
 
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 d2abd92d2..8da692939 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
@@ -891,9 +891,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		//标题
 		WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 14,
 				false, false, "Blue Sky Noto Regular",null,null,null);
-		//主要内容
-		WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12,
-				false, true, "Blue Sky Noto Regular",null,null,null);
+		//主要内容(新需求中去掉此行)
+//		WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12,
+//				false, true, "Blue Sky Noto Regular",null,null,null);
 		//生成页脚
 		WordUtil.exportHeardAndFootMain(document,moth);
 		int oneCount = 1;
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 dc18a8ca8..7a3d475fa 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
@@ -594,7 +594,7 @@ public class WordUtil {
         //适用车型中文名
         String applyCarName = dictItem(sysDictItems, applyCar,cut, DictCodeReportEnum.APPLYCAR.getValue());
         String applyScopeName = dictItem(sysDictItems, applyScope,cut, DictCodeReportEnum.APPLYSCOPE.getValue());
-        String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE.getValue());
+        String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE_REPORT.getValue());
         String useMethodName = dictItem(sysDictItems, useMethod,cut, DictCodeReportEnum.USEMETHOD.getValue());
 
         XWPFTable table = document.createTable(10, 2);
@@ -629,9 +629,9 @@ public class WordUtil {
             //第6行
 //            setCell(table,4, "实施车型",implementCar);
             //第7行
-            setCell(table,4, "新车型实施日期",newCarImplementTime);
+            setCell(table,4, "发布日期",newCarImplementTime);
             //第8行
-            setCell(table,5, "在产车实施日期",productionCarImplementTime);
+            setCell(table,5, "实施日期",productionCarImplementTime);
             //第9行
             setCell(table,6, "主要内容",contentCn);
             //第10行
@@ -654,9 +654,9 @@ public class WordUtil {
             //第6行
 //            setCell(table,4,"Implementation Model",implementCar);
             //第7行
-            setCell(table,4,"New Type Execution Date",newCarImplementTime);
+            setCell(table,4,"Release Date",newCarImplementTime);
             //第8行
-            setCell(table,5,"New Vehicle Execution Date",productionCarImplementTime);
+            setCell(table,5,"Execution Date",productionCarImplementTime);
             //第9行
             setCell(table,6,"Main Content",contentEn);
             //第10行
@@ -1264,22 +1264,22 @@ public class WordUtil {
         String blank = "";
         switch (value) {
             case "M":
-                blank = "                   ";
+                blank = "                             ";
                 break;
             case "N":
                 blank = "\r\n";
                 break;
             case "企业":
-                blank = "               ";
+                blank = "                         ";
                 break;
             case "整车":
-                blank = "            ";
+                blank = "                     ";
                 break;
             case "系统/零部件":
                 blank = "\r\n";
                 break;
             case "新车型":
-                blank = "           ";
+                blank = "                     ";
                 break;
             case "在产车型`":
                 blank = "";
@@ -1300,10 +1300,10 @@ public class WordUtil {
                 blank = "";
                 break;
             case "草稿":
-                blank = "             ";
+                blank = "                         ";
                 break;
             case "公示稿":
-                blank = "          ";
+                blank = "                 ";
                 break;
             case "发布稿":
                 blank = "";
@@ -1318,10 +1318,10 @@ public class WordUtil {
                 blank = "";
                 break;
             case "强制":
-                blank = "             ";
+                blank = "                         ";
                 break;
             case "推荐":
-                blank = "            ";
+                blank = "                     ";
                 break;
             case "安装需符合":
                 blank = "";