From f8b82c489a661ec6ec2cbbc7ff1c74a17cc035c6 Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期二, 20 九月 2022 09:46:46 +0800
Subject: [PATCH] JAQ自定义公式问题修复
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 15 +++++++++++++--
pom.xml | 4 ++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 74c7c23..53a6423 100644
--- a/pom.xml
+++ b/pom.xml
@@ -380,7 +380,7 @@
</dependency>
</dependencies>
- <!--<build>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -405,5 +405,5 @@
</executions>
</plugin>
</plugins>
- </build>-->
+ </build>
</project>
\ No newline at end of file
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 4363b87..a31f833 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -407,6 +407,9 @@
if(tableEnum == TableEnum.table4){
if(tableNum != null && tableNum != 8){
for (int i = tableNum; i <= tableNum + 4; i++) {
+ if(i+2 > table.getRows().size()){
+ continue;
+ }
XWPFTableRow row = table.getRows().get(i+2);
List<XWPFTableCell> cells = row.getTableCells();
changeText(cells.get(0).getParagraphs().get(0),"#"+(i+1)+".");
@@ -1119,7 +1122,7 @@
if(StringUtils.contains(keyValue, "%table-line-feed%")){
String[] keyValues = keyValue.split("%table-line-feed%");
runValue = delDynList(keyTemp, Arrays.asList(keyValues), paragraph, document,1);
- }else{
+ }else if(StringUtils.contains(keyValue, "%line-feed%")){
String[] keyValues = keyValue.split("%line-feed%");
runValue = delDynList(keyTemp, Arrays.asList(keyValues), paragraph, document,0);
}
@@ -1325,7 +1328,7 @@
String key = "%" + textSet.getKey() + "%";
if (text.indexOf(key) != -1) {
- text = text.replaceAll(key, (String) textMap.get(textSet.getKey()));
+ text = text.replaceAll(key, String.valueOf(textMap.get(textSet.getKey())));
repText = text;
if (checkText(text)) {
continue;
@@ -1773,7 +1776,15 @@
//鏇存敼琛ㄦ牸鐨勫��
textMap.put("sendEmailFileName", "JAQ");
+ textMap.put("SelectUsers",8);
+ //changeTable(document, textMap);
+
+
+ changeText(document, textMap);
+ changeTextBox(document, textMap);
+ addTableValue(document, null);
changeTable(document, textMap);
+ //changChart(textMap, document, reportType, dataPath);
//寤虹珛鏂囦欢瀵硅薄
File file = new File("C:\\Users\\Administrator\\Desktop\\JAQ涓枃鐗�1.docx");
--
Gitblit v1.9.1