From 34fadc1ddf887fc772f62b46476e752b624ea06c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 18 Aug 2022 14:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA--=E8=B5=84=E8=AE=AF=E8=A1=8C=E4=B8=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/report/entity/LawsMonthlyReportWriteEO.java    | 3 ++-
 .../report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml   | 3 ++-
 .../main/java/com/jero/modules/report/util/WordUtil.java   | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
index 03a7c2498..b76f1b294 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
@@ -196,7 +196,8 @@ public class LawsMonthlyReportWriteEO implements Serializable {
     //新添字段
     private String relatedAreasCn;//相关领域中文
     private String relatedAreasEn;//相关领域英文
-    private String source;//来源
+    private String sourceCn;//来源中文
+    private String sourceEn;//来源英文
     private String time;//日期
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
index 6b2ef20e5..699e217ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
@@ -31,7 +31,8 @@
         <result column="export_state" property="exportState" />
         <result column="related_areas_cn" property="relatedAreasCn" />
         <result column="related_areas_en" property="relatedAreasEn" />
-        <result column="source" property="source" />
+        <result column="source_cn" property="sourceCn" />
+        <result column="source_en" property="sourceEn" />
         <result column="time" property="time" />
     </resultMap>
 </mapper>
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 6cb4f2bcf..6ecc9ce43 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
@@ -519,7 +519,8 @@ public class WordUtil {
                                               String cut) {
         String relatedAreasCn = lawsMonthlyReportWriteEO.getRelatedAreasCn();//相关领域中文
         String relatedAreasEn = lawsMonthlyReportWriteEO.getRelatedAreasEn();//相关领域英文
-        String source = lawsMonthlyReportWriteEO.getSource();//来源
+        String sourceCn = lawsMonthlyReportWriteEO.getSourceCn();//来源
+        String sourceEn = lawsMonthlyReportWriteEO.getSourceEn();
         String time = lawsMonthlyReportWriteEO.getTime();//日期
         String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文
         String contentEn = lawsMonthlyReportWriteEO.getContentEn();//主要内容英文
@@ -545,7 +546,7 @@ public class WordUtil {
             //第1行
             setCell(table, 0, "相关领域",relatedAreasCn);
             //第2行
-            setCell(table,1, "来源",source);
+            setCell(table,1, "来源",sourceCn);
             //第3行
             setCell(table,2, "日期",time);
             //第4行
@@ -556,7 +557,7 @@ public class WordUtil {
             //第1行
             setCell(table,0, "Related Areas",relatedAreasEn);
             //第2行
-            setCell(table,1,"source",source);
+            setCell(table,1,"Source",sourceEn);
             //第3行
             setCell(table,2,"Date",time);
             //第4行