From 56c8bc18def3992259da50948119259f571d04ee Mon Sep 17 00:00:00 2001
From: zhijie <1003392067@qq.com>
Date: 星期二, 08 六月 2021 23:25:39 +0800
Subject: [PATCH] MAQ简易版泰文支持,SAQ简易版支持
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 ff01e4b..2e97d4a 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -17,6 +17,7 @@
import com.ots.project.tool.report.JAQ.condition.Table2;
import com.ots.project.tool.report.JAQ.condition.Table3;
import com.ots.project.tool.report.JAQ.condition.Table4;
+import com.ots.project.tool.report.SAQ.chart.SAQChart;
import org.apache.commons.collections.map.HashedMap;
import org.apache.poi.ooxml.POIXMLDocument;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -177,6 +178,9 @@
if (run.toString().indexOf("%TTime%") != -1) {
run.setText(textMap.get("reportGenerationDate").toString(), 0);
}
+ if (run.toString().indexOf("%LIBSAQGS0018%") != -1) {
+ run.setText(textMap.get("LIBSAQGS0018").toString(), 0);
+ }
}
}
}
@@ -254,7 +258,7 @@
public static CTAnchor getAnchorWithGraphic(CTGraphicalObject ctGraphicalObject,
String deskFileName, int width, int height,
int leftOffset, int topOffset, boolean behind, int topPosition) {
- long relativeHeight = 251649024l + topPosition;
+ long relativeHeight = 251649024L + topPosition;
String anchorXML =
"<wp:anchor xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" "
+ "simplePos=\"0\" relativeHeight=\"" + relativeHeight + "\" behindDoc=\"" + ((behind) ? 1 : 0) + "\" locked=\"0\" layoutInCell=\"1\" allowOverlap=\"1\">"
@@ -430,7 +434,7 @@
}
public static String changeValue(String runValue, Map<String, Object> textMap, XWPFRun run, XWPFParagraph paragraph, XWPFDocument document, int runPosition) throws IOException, org.apache.poi.openxml4j.exceptions.InvalidFormatException {
-
+ log.debug("changeText:{}",runValue);
Set<Map.Entry<String, Object>> textSets = textMap.entrySet();
for (Map.Entry<String, Object> textSet : textSets) {
@@ -841,17 +845,13 @@
//璁剧疆鏂囨湰
changeText(document, textMap);
- //鏇存敼鏂囨湰妗�
-/* if (Objects.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || Objects.equals(reportType, ReportTypeEnum.JAQ.getCode()) ) {
- changeTextBox(document, textMap);
- }*/
-
+ //璁剧疆鏂囨湰妗�
changeTextBox(document, textMap);
- //CAQ鏇存敼鏂囨湰妗嗭紝wzp娴嬭瘯.2021.4.27
-/* if (Objects.equals(reportType, ReportTypeEnum.CAQ.getCode())) {
- changeTextBox(document, textMap);
- }*/
+ //璁剧疆鍥捐〃
+ if (Objects.equals(reportType, ReportTypeEnum.SAQ.getCode())) {
+ SAQChart.changeChart(document, textMap);
+ }
//鎻掑叆琛ㄦ牸
addTableValue(document, autoTableMap);
@@ -888,6 +888,7 @@
}
}
private static String getValByKey(String text, Map<String, Object> textMap) {
+ log.debug("changeTextBox:{}",text);
if (!checkText(text)) {
return text;
}
--
Gitblit v1.9.1