Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
This commit is contained in:
+14
-4
@@ -38,6 +38,7 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
|
||||
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
|
||||
import com.jero.modules.system.util.StringUtils;
|
||||
import org.apache.poi.hssf.usermodel.HeaderFooter;
|
||||
import org.apache.poi.xwpf.usermodel.BreakType;
|
||||
import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
|
||||
import org.apache.poi.xwpf.usermodel.TOC;
|
||||
import org.apache.poi.xwpf.usermodel.XWPFDocument;
|
||||
@@ -735,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);
|
||||
//生成页脚
|
||||
@@ -779,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++;
|
||||
}
|
||||
|
||||
@@ -793,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++;
|
||||
}
|
||||
}
|
||||
@@ -916,6 +918,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
|
||||
}else{
|
||||
oneTitle = lawsMonthlyReportTitleTemplateEO.getTitleEn();
|
||||
}
|
||||
//每个一级目录单独占一页
|
||||
if(oneCount > 1){
|
||||
document.createParagraph().createRun().addBreak(BreakType.PAGE);
|
||||
}
|
||||
if(StringUtils.isNotBlank(oneTitle)){
|
||||
WordUtil.exportWord(document, oneNumber+" "+oneTitle, null, ParagraphAlignment.LEFT,
|
||||
0, 14, false, true, "Blue Sky Noto Regular","0","一级标题");
|
||||
@@ -939,6 +945,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
|
||||
}else{
|
||||
twoTitle = monthlyReportTitleTemplateEO.getTitleEn();
|
||||
}
|
||||
//每个二级目录单独占一页
|
||||
if(twoCount > 1){
|
||||
document.createParagraph().createRun().addBreak(BreakType.PAGE);
|
||||
}
|
||||
if(StringUtils.isNotBlank(twoTitle)){
|
||||
WordUtil.exportWord(document, twoNumber+" "+twoTitle, null, ParagraphAlignment.LEFT,
|
||||
0, 12, false, true, "Blue Sky Noto Regular","1","二级标题");
|
||||
|
||||
Reference in New Issue
Block a user