From 1486a2ce86eb63d51e5a61a8364df42e7585a8fc Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 16 八月 2023 11:55:23 +0800
Subject: [PATCH] xn commit
---
src/main/java/com/product/print/util/DynamicTableRenderPolicy.java | 8 +++++---
src/main/java/com/product/print/util/PrintPoiUtil.java | 2 --
src/main/java/com/product/print/service/PrintRealizeService.java | 3 ---
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/product/print/service/PrintRealizeService.java b/src/main/java/com/product/print/service/PrintRealizeService.java
index 4687f24..9f3353b 100644
--- a/src/main/java/com/product/print/service/PrintRealizeService.java
+++ b/src/main/java/com/product/print/service/PrintRealizeService.java
@@ -11,7 +11,6 @@
import com.deepoove.poi.data.TextRenderData;
import com.deepoove.poi.data.style.Style;
import com.deepoove.poi.render.RenderContext;
-import com.deepoove.poi.util.RegexUtils;
import com.product.common.lang.StringUtils;
import com.product.core.cache.DataPoolCacheImpl;
import com.product.core.config.Global;
@@ -38,8 +37,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import java.util.stream.Collectors;
diff --git a/src/main/java/com/product/print/util/DynamicTableRenderPolicy.java b/src/main/java/com/product/print/util/DynamicTableRenderPolicy.java
index daa0044..5150161 100644
--- a/src/main/java/com/product/print/util/DynamicTableRenderPolicy.java
+++ b/src/main/java/com/product/print/util/DynamicTableRenderPolicy.java
@@ -32,13 +32,12 @@
private final String indexKey = "~index~";
- public DynamicTableRenderPolicy(String replaceKey) {
+ public DynamicTableRenderPolicy(String replaceKey) {
this.replaceKey = replaceKey;
}
private List<MetaTemplate> metaTemplateList;
-
@Override
@@ -134,8 +133,9 @@
if (i == 0) {
row = fieldRow;
} else {
+ int fieldRowIndex = xwpfTable.getRows().indexOf(fieldRow);
//鍒涘缓涓�琛屽湪fieldRowIndex涓嬮潰
- row = xwpfTable.insertNewTableRow(xwpfTable.getRows().size());
+ row = xwpfTable.insertNewTableRow(fieldRowIndex + i);
PrintPoiUtil.copyTableRow(row, fieldRow);
}
//閬嶅巻瀛楁姣忎釜瀛楁鍒涘缓涓�涓崟鍏冩牸
@@ -146,6 +146,8 @@
XWPFParagraph xwpfParagraph = cell.addParagraph();
int index = cell.getParagraphs().indexOf(xwpfParagraph);
PrintPoiUtil.copyParagraph(xwpfParagraph, cell.getParagraphs().get(0));
+ //璁剧疆娈佃惤鏂囧瓧瀵归綈鏂瑰紡
+ xwpfParagraph.setAlignment(cell.getParagraphs().get(0).getAlignment());
//鍒犻櫎鎵�鏈夌殑run
for (int k = xwpfParagraph.getRuns().size() - 1; k >= 0; k--) {
xwpfParagraph.removeRun(k);
diff --git a/src/main/java/com/product/print/util/PrintPoiUtil.java b/src/main/java/com/product/print/util/PrintPoiUtil.java
index 2dac1cd..d1fd751 100644
--- a/src/main/java/com/product/print/util/PrintPoiUtil.java
+++ b/src/main/java/com/product/print/util/PrintPoiUtil.java
@@ -132,7 +132,5 @@
e.printStackTrace();
}
}
- System.out.println(source.getColor());
- System.out.println(target.getColor());
}
}
--
Gitblit v1.9.2