From c2b90c7ff59d36e7e81dc9654032cd0f657b0ca1 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 28 Sep 2022 15:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F,?=
 =?UTF-8?q?=E6=AF=8F=E8=A1=8C=E7=BC=A9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsMonthlyReportWriteEOServiceImpl.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 bb694f82a..789ae882b 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
@@ -736,9 +736,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 			content = "Content";
 		}
 		String moth = lawsMonthlyReportWriteEOS.get(0).getMonth().replaceAll("-", "年") + "月";
-		//单独设置每页右侧的时间
-		WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18,
+		//标题
+		WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 14,
 				false, false, "Blue Sky Noto Regular",null,null);
+		//主要内容
 		WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12,
 				false, true, "Blue Sky Noto Regular",null,null);
 		//生成页脚
@@ -780,7 +781,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 				}
 				if(StringUtils.isNotBlank(twoTitle)){
 					WordUtil.exportWord(document, twoNumber+" "+twoTitle, null, ParagraphAlignment.LEFT,
-							0, 12, false, true, "Blue Sky Noto Regular","1","二级标题");
+							2, 12, false, true, "Blue Sky Noto Regular","1","二级标题");
 					twoCount++;
 				}
 
@@ -794,7 +795,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 					}
 					if(org.apache.commons.lang3.StringUtils.isNotBlank(reportTitle)){
 						WordUtil.exportWord(document, reportCount+". "+reportTitle, null, ParagraphAlignment.LEFT,
-								0, 12, false, false, "Blue Sky Noto Regular","2","三级标题");
+								4, 12, false, false, "Blue Sky Noto Regular","2","三级标题");
 						reportCount++;
 					}
 				}