diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index 42ddef7..9ab6ad3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -197,12 +197,12 @@ * @param pdfNewUrl 存储新PDF文件路径 */ public static void wordToPdf(String wordNewUrl, String pdfNewUrl) { - PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); +// PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); // 将新Word文档转换为PDF文件 -// Document document = new Document(); -// document.loadFromFile(wordNewUrl); -// document.saveToFile(pdfNewUrl, FileFormat.PDF); -// document.dispose(); + Document document = new Document(); + document.loadFromFile(wordNewUrl); + document.saveToFile(pdfNewUrl, FileFormat.PDF); + document.dispose(); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index 42ddef7..9ab6ad3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -197,12 +197,12 @@ * @param pdfNewUrl 存储新PDF文件路径 */ public static void wordToPdf(String wordNewUrl, String pdfNewUrl) { - PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); +// PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); // 将新Word文档转换为PDF文件 -// Document document = new Document(); -// document.loadFromFile(wordNewUrl); -// document.saveToFile(pdfNewUrl, FileFormat.PDF); -// document.dispose(); + Document document = new Document(); + document.loadFromFile(wordNewUrl); + document.saveToFile(pdfNewUrl, FileFormat.PDF); + document.dispose(); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java index fc2c9df..5791a39 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java @@ -398,12 +398,21 @@ } private void parseThisRow(List cells, Map map) throws Exception { - Iterator var3 = cells.iterator(); - while (var3.hasNext()) { - XWPFTableCell cell = (XWPFTableCell) var3.next(); + int cellIndex = 0; + if (cells != null && cells.get(0).getText().contains("{{") && !cells.get(0).getText().contains("}}")) { + for (; cellIndex < cells.size(); cellIndex++) { + if (cells.get(cellIndex).getText().contains("}}")) { + clearParagraphText((cells.get(cellIndex)).getParagraphs()); + break; + } + clearParagraphText((cells.get(cellIndex)).getParagraphs()); + } + } + //去除{{,继续执行此行的处理 + for (; cellIndex < cells.size(); cellIndex++) { + XWPFTableCell cell = cells.get(cellIndex); this.parseAllParagraph(cell.getParagraphs(), map); } - } private void parseThisTable(XWPFTable table, Map map, List mergeColNames) throws Exception { @@ -478,13 +487,11 @@ this.parseThisParagraph((XWPFParagraph) xwpfHeader.getListParagraph().get(i), map); } } - List footerList = doc.getFooterList(); Iterator var9 = footerList.iterator(); while (var9.hasNext()) { XWPFFooter xwpfFooter = (XWPFFooter) var9.next(); - for (int i = 0; i < xwpfFooter.getListParagraph().size(); ++i) { this.parseThisParagraph((XWPFParagraph) xwpfFooter.getListParagraph().get(i), map); }