From 132a8ccbae5b3283a855b14bdbe8ae99557050d1 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期一, 07 三月 2022 16:24:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/framework-v8-20220228' into framework-v8-20220228
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ots/common/utils/poi/WordUtil.java b/src/main/java/com/ots/common/utils/poi/WordUtil.java
index 2f7182f..b859c5f 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -859,7 +859,7 @@
changeTable(document, textMap);
//璁剧疆鍥捐〃鎺т欢
- //changChar(textMap, document, reportType, templateType);
+ changChar(textMap, document, reportType, templateType);
document.write(out);
}
private static void changeTextBox(XWPFDocument document, Map<String, Object> textMap) throws DocumentException {
@@ -961,7 +961,7 @@
}
if (StringUtils.equals(reportType, ReportTypeEnum.MAQ.getCode())) {
setMAQCompleteChars(textMap, charts);
- } else if (StringUtils.equals(reportType, ReportTypeEnum.MAQV2.getCode())) {
+ } else if (StringUtils.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || StringUtils.equals(reportType, ReportTypeEnum.MAQIAR.getCode())) {
setMAQ_V2CompleteChars(textMap, charts);
} else if (StringUtils.equals(reportType, ReportTypeEnum.RuiLin.getCode())) {
setRuiLinChar(textMap, charts);
--
Gitblit v1.9.1