From b511a20216dff73808f5baec0548be4c2daa2101 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 27 Oct 2022 14:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA=E4=B8=8E?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A8=A1=E6=9D=BF=E9=A1=BA=E5=BA=8F=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsMonthlyReportWriteEOServiceImpl.java  | 28 +++++++++++++------
 .../jero/modules/report/util/WordUtil.java    |  2 +-
 2 files changed, 20 insertions(+), 10 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 2e6fb60b0..cd0701450 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
@@ -611,10 +611,11 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 
 
 	/**
-	 *创建word文件
+	 *
 	 * @param path
-	 * @param lawsMonthlyReportWriteEOS 列表数据
-	 * @param lawsMonthlyReportTitleTemplateEOS 章节目录
+	 * @param lawsMonthlyReportWriteEOS  所有月报
+	 * @param lawsMonthlyReportTitleTemplateEOS   二级目录(没有排序)
+	 * @param loginUserList
 	 */
 	private void createWord(String path,
 							List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS,
@@ -763,7 +764,15 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 //	}
 
 
-
+	/**
+	 *
+	 * @param lawsMonthlyReportWriteEOS 月报
+	 * @param lawsMonthlyReportTitleTemplateEOS 二级目录(参数传过来时没有排序)
+	 * @param reportTitleOneList 一级目录(参数传过来时已经进行正序排序)
+	 * @param titleCN
+	 * @param document
+	 * @param cut
+	 */
 	private void word(List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS,
 					  List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS,
 					  List<LawsMonthlyReportTitleTemplateEO> reportTitleOneList,
@@ -799,12 +808,13 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 			}
 			if(StringUtils.isNotBlank(oneTitle)){
 				WordUtil.exportWord(document, oneNumber+" "+oneTitle, null, ParagraphAlignment.LEFT,
-						0, 12, false, true, "Blue Sky Noto Regular","0","一级标题",null);
+						0, 11, false, true, "Blue Sky Noto Regular","0","一级标题",null);
 				oneCount++;
 			}
 
 			List<LawsMonthlyReportTitleTemplateEO> reportTitleTwoList = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> e.getParentId().equals(lawsMonthlyReportTitleTemplateEO.getId())).collect(Collectors.toList());
-
+			//二级目录按sort正序排序
+			Collections.sort(reportTitleTwoList);//正序排序
 
 			for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : reportTitleTwoList) {
 				int reportCount = 1;
@@ -822,7 +832,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 				}
 				if(StringUtils.isNotBlank(twoTitle)){
 					WordUtil.exportWord(document, twoNumber+" "+twoTitle, null, ParagraphAlignment.LEFT,
-							2, 12, false, true, "Blue Sky Noto Regular","1","二级标题",null);
+							2, 11, false, true, "Blue Sky Noto Regular","1","二级标题",null);
 					twoCount++;
 				}
 
@@ -836,7 +846,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 					}
 					if(org.apache.commons.lang3.StringUtils.isNotBlank(reportTitle)){
 						WordUtil.exportWord(document, reportCount+". "+reportTitle, null, ParagraphAlignment.LEFT,
-								4, 12, false, false, "Blue Sky Noto Regular","2","三级标题",null);
+								4, 11, false, false, "Blue Sky Noto Regular","2","三级标题",null);
 						reportCount++;
 					}
 				}
@@ -1173,7 +1183,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 			}
 
 			List<LawsMonthlyReportTitleTemplateEO> reportTitleTwoList = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> e.getParentId().equals(lawsMonthlyReportTitleTemplateEO.getId())).collect(Collectors.toList());
-
+			Collections.sort(reportTitleTwoList);//正序排序
 
 			for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : reportTitleTwoList) {
 				int reportCount = 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 f4678b253..93fddedfd 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
@@ -406,7 +406,7 @@ public class WordUtil {
         paragraph.setAlignment(ParagraphAlignment.CENTER);
         XWPFRun run = paragraph.createRun();
         run.setText("NIO Internal");
-        run.setFontSize(18);
+        run.setFontSize(12);
         run.setFontFamily("Blue Sky Standard Regular");
 //        run.setFontFamily("Blue Sky Noto Regular");
         run.setBold(true);