From af78fd1c2f4dc258a0d5bbd800662f9fa41d9e9e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sun, 9 Oct 2022 14:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88=E5=AF=BC=E5=87=BA--=E9=A1=B5?=
 =?UTF-8?q?=E7=9C=89=E9=A1=B5=E8=84=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsMonthlyReportWriteEOServiceImpl.java |  8 ++++----
 .../com/jero/modules/report/util/WordUtil.java    | 15 +++++++++++----
 2 files changed, 15 insertions(+), 8 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 c309c19a3..a34563275 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
@@ -884,8 +884,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		titleCN = "\r\n\r\n" + titleCN + "\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n";
 		WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18,
 				false, false, "Blue Sky Noto Regular",null,null,flag);
-		WordUtil.exportWord(document, moth+"\r\n", null, ParagraphAlignment.CENTER, 0, 12,
-				false, true, "Blue Sky Noto Regular",null,null,flag);
+		WordUtil.exportWord(document, moth, null, ParagraphAlignment.CENTER, 0, 12,
+				false, false, "Blue Sky Noto Regular",null,null,flag);
 		//添加下一页
 		document.createParagraph().createRun().addBreak(BreakType.PAGE);
 	}
@@ -900,8 +900,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		titleCN = "\r\n\r\n" + titleCN + "\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n";
 		WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18,
 				false, false, "Blue Sky Noto Regular",null,null,flag);
-		WordUtil.exportWord(document, moth+"\r\n", null, ParagraphAlignment.CENTER, 0, 12,
-				false, true, "Blue Sky Noto Regular",null,null,flag);
+		WordUtil.exportWord(document, moth, null, ParagraphAlignment.CENTER, 0, 12,
+				false, false, "Blue Sky Noto Regular",null,null,flag);
 		//添加下一页
 		document.createParagraph().createRun().addBreak(BreakType.PAGE);
 	}
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 b74545fc0..848032435 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
@@ -266,12 +266,15 @@ public class WordUtil {
             picture.getCTPicture().getBlipFill().getBlip().setEmbed(blipID);
             run.addTab();
             is.close();
+            run.setText("                                             "+month);
+            run.setFontSize(11);
+            run.setFontFamily("Blue Sky Noto Regular");
         }
         //页眉第二个段落展示日期------------------------------------------------------------
         XWPFParagraph paragraph = header.createParagraph();//创建新的段落
-        paragraph.setAlignment(ParagraphAlignment.RIGHT);//段落文本的对齐方式
+//        paragraph.setAlignment(ParagraphAlignment.RIGHT);//段落文本的对齐方式
         XWPFRun run = paragraph.createRun();
-        run.setText(month);
+//        run.setText(month);
 
         //页脚(三个段落分别展示3个内容)-----------------------------------------------------
         XWPFFooter footer = headerFooterPolicy.createFooter(XWPFHeaderFooterPolicy.DEFAULT);
@@ -280,11 +283,15 @@ public class WordUtil {
         paragraph.setAlignment(ParagraphAlignment.CENTER);
         run = paragraph.createRun();
         run.setText("NIO Internal");
+        run.setFontSize(11);
+        run.setFontFamily("Blue Sky Standard Regular");
 
         paragraph = footer.createParagraph();
         paragraph.setAlignment(ParagraphAlignment.LEFT);
         run = paragraph.createRun();
         run.setText("NIO.com");
+        run.setFontSize(11);
+        run.setFontFamily("Blue Sky Noto Regular");
 
         //生成页码---------------------------------------------------------------------
         paragraph = footer.createParagraph();
@@ -317,8 +324,8 @@ public class WordUtil {
         pageMar.setTop(BigInteger.valueOf(1440)); //页眉高度
         pageMar.setBottom(BigInteger.valueOf(1440));//页脚高度
 
-        pageMar.setHeader(BigInteger.valueOf(500)); //页眉上边框到顶部的距离
-        pageMar.setFooter(BigInteger.valueOf(800)); //页脚下边框到底部的距离
+        pageMar.setHeader(BigInteger.valueOf(720)); //页眉上边框到顶部的距离
+        pageMar.setFooter(BigInteger.valueOf(720)); //页脚下边框到底部的距离
     }
 
     /**