diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 6c2e290..7422613 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -23,9 +23,9 @@ //技术文件用逗号隔开 String technologyFiles = ((String) map.get("technologyFile")); if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains("[")) { - technologyFiles = technologyFiles.substring(1, technologyFiles.length() - 1); + technologyFiles = technologyFiles.substring(2, technologyFiles.length() - 2); } - map.put("technologyFileList", StringUtils.isEmpty(technologyFiles) ? "" : technologyFiles); + map.put("technologyFile", technologyFiles); } map.put("surveyor","{{@surveyor}}"); map.put("auditor","{{@auditor}}"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 6c2e290..7422613 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -23,9 +23,9 @@ //技术文件用逗号隔开 String technologyFiles = ((String) map.get("technologyFile")); if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains("[")) { - technologyFiles = technologyFiles.substring(1, technologyFiles.length() - 1); + technologyFiles = technologyFiles.substring(2, technologyFiles.length() - 2); } - map.put("technologyFileList", StringUtils.isEmpty(technologyFiles) ? "" : technologyFiles); + map.put("technologyFile", technologyFiles); } map.put("surveyor","{{@surveyor}}"); map.put("auditor","{{@auditor}}"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index d7ca374..484be24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -146,7 +146,7 @@ Paragraph footerParagraph = footer.addParagraph(); recordNo = StringUtils.isEmpty(recordNo) ? "" : recordNo; footerParagraph.appendText(" 证书号:" + recordNo); - footerParagraph.appendText(" "); + footerParagraph.appendText(" "); footerParagraph.appendText(" 第 "); footerParagraph.appendField("第 " + "page number" + "页", FieldType.Field_Page); footerParagraph.appendText(" 页 共"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 6c2e290..7422613 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -23,9 +23,9 @@ //技术文件用逗号隔开 String technologyFiles = ((String) map.get("technologyFile")); if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains("[")) { - technologyFiles = technologyFiles.substring(1, technologyFiles.length() - 1); + technologyFiles = technologyFiles.substring(2, technologyFiles.length() - 2); } - map.put("technologyFileList", StringUtils.isEmpty(technologyFiles) ? "" : technologyFiles); + map.put("technologyFile", technologyFiles); } map.put("surveyor","{{@surveyor}}"); map.put("auditor","{{@auditor}}"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index d7ca374..484be24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -146,7 +146,7 @@ Paragraph footerParagraph = footer.addParagraph(); recordNo = StringUtils.isEmpty(recordNo) ? "" : recordNo; footerParagraph.appendText(" 证书号:" + recordNo); - footerParagraph.appendText(" "); + footerParagraph.appendText(" "); footerParagraph.appendText(" 第 "); footerParagraph.appendField("第 " + "page number" + "页", FieldType.Field_Page); footerParagraph.appendText(" 页 共"); 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 76c7309..738de0b 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 @@ -99,7 +99,7 @@ String[] pdfUrl = filePrintRegister.getFileNames().get(0).split("_"); String pdfNewUrl = pdfUrl[0] + ".pdf"; String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl; - FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl); + FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl); DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl); return filePrintRegister.getTemDir() + pdfNewUrl; } @@ -379,7 +379,6 @@ String filePath = ""; FileOutputStream fos = null; try { - //执行文件填充 ParseWord07 parseWord07 = new ParseWord07(); XWPFDocument doc = parseWord07.parseWord(temDir + fileName, params, mergeColNames); @@ -391,9 +390,8 @@ fos.flush(); //增加对固定文本框的文字填充的处理一般的poi不支持,需要调用poi-tl执行文件打印操作 ConfigureBuilder builder = Configure.builder(); - XWPFTemplate compile = XWPFTemplate.compile(temDir + customFileName, builder.build()); + XWPFTemplate compile = XWPFTemplate.compile(filePath, builder.build()); compile.render(params); - filePath = temDir + customFileName; compile.writeToFile(filePath); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 6c2e290..7422613 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -23,9 +23,9 @@ //技术文件用逗号隔开 String technologyFiles = ((String) map.get("technologyFile")); if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains("[")) { - technologyFiles = technologyFiles.substring(1, technologyFiles.length() - 1); + technologyFiles = technologyFiles.substring(2, technologyFiles.length() - 2); } - map.put("technologyFileList", StringUtils.isEmpty(technologyFiles) ? "" : technologyFiles); + map.put("technologyFile", technologyFiles); } map.put("surveyor","{{@surveyor}}"); map.put("auditor","{{@auditor}}"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index d7ca374..484be24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -146,7 +146,7 @@ Paragraph footerParagraph = footer.addParagraph(); recordNo = StringUtils.isEmpty(recordNo) ? "" : recordNo; footerParagraph.appendText(" 证书号:" + recordNo); - footerParagraph.appendText(" "); + footerParagraph.appendText(" "); footerParagraph.appendText(" 第 "); footerParagraph.appendField("第 " + "page number" + "页", FieldType.Field_Page); footerParagraph.appendText(" 页 共"); 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 76c7309..738de0b 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 @@ -99,7 +99,7 @@ String[] pdfUrl = filePrintRegister.getFileNames().get(0).split("_"); String pdfNewUrl = pdfUrl[0] + ".pdf"; String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl; - FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl); + FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl); DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl); return filePrintRegister.getTemDir() + pdfNewUrl; } @@ -379,7 +379,6 @@ String filePath = ""; FileOutputStream fos = null; try { - //执行文件填充 ParseWord07 parseWord07 = new ParseWord07(); XWPFDocument doc = parseWord07.parseWord(temDir + fileName, params, mergeColNames); @@ -391,9 +390,8 @@ fos.flush(); //增加对固定文本框的文字填充的处理一般的poi不支持,需要调用poi-tl执行文件打印操作 ConfigureBuilder builder = Configure.builder(); - XWPFTemplate compile = XWPFTemplate.compile(temDir + customFileName, builder.build()); + XWPFTemplate compile = XWPFTemplate.compile(filePath, builder.build()); compile.render(params); - filePath = temDir + customFileName; compile.writeToFile(filePath); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ElectronicSignTemplate.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ElectronicSignTemplate.java index ff4a4b4..613e7e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ElectronicSignTemplate.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ElectronicSignTemplate.java @@ -86,7 +86,7 @@ .keyWord(keyWord) .vertical(-10f) .horizontal(0f) - .stampHeight(30f) + .stampHeight(20f) .stampWidth(40f) .diaphaneity(0f) .build();