diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index dd2d8c46c..53f1c01b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -995,6 +995,7 @@ public class WordUtil { * @param cell */ public static void cellPadding(XWPFTableCell cell,String text){ + //1. 设置单元格页边距 CTTc ctTc = cell.getCTTc(); CTTcPr cttcpr =ctTc.isSetTcPr() ? ctTc.getTcPr() : ctTc.addNewTcPr(); CTTcMar ctTcMar = cttcpr.isSetTcMar() ? cttcpr.getTcMar() : cttcpr.addNewTcMar(); @@ -1003,7 +1004,7 @@ public class WordUtil { // (ctTcMar.isSetRight() ? ctTcMar.getRight() : ctTcMar.addNewRight()).setW(BigInteger.valueOf(100)); // (ctTcMar.isSetBottom() ? ctTcMar.getBottom() : ctTcMar.addNewBottom()).setW(BigInteger.valueOf(100)); - //设置文本及文本的字体 + //2. 设置文本及文本的字体 //获取 CTP CTP ctP = (ctTc.sizeOfPArray() == 0) ? ctTc.addNewP() : ctTc.getPArray(0); @@ -1011,7 +1012,19 @@ public class WordUtil { XWPFParagraph par = cell.getParagraph(ctP); //XWPFRun 设置格式 XWPFRun run = par.createRun(); - run.setText(text); + //单元格内容换行 + if(StringUtils.isNotEmpty(text) && text.contains("\n")){ + String[] split = text.split("\n"); + for (int i = 0; i < split.length; i++) { + run.setText(split[i]); + if(i