From 0183c9be7ee7c2125bdd0491a9ba406de6abc621 Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期六, 15 四月 2023 17:20:40 +0800
Subject: [PATCH] CIAQ完善
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
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 c3b47de..aa23e48 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -903,9 +903,8 @@
if (checkText(runValue)) {
runValue = runValue.replaceAll("%.*%", "");
- runValue = runValue.replaceAll("N/A NONE", "");
-
}
+ runValue = runValue.replaceAll("N/A NONE", "");
return runValue;
}
@@ -1180,7 +1179,8 @@
//}
//PAQ銆丮AQTR閲囩敤鏂扮殑doc杞琾df
- if(ReportTypeEnum.PAQ.getCode().equals(reportType) || ReportTypeEnum.MAQTR.getCode().equals(reportType)){
+ if(ReportTypeEnum.PAQ.getCode().equals(reportType) || ReportTypeEnum.MAQTR.getCode().equals(reportType)
+ || ReportTypeEnum.CIAQ.getCode().equals(reportType)){
PdfUtil.convertPDF(EssConfig.getProfile() + "/" + reportName);
}else{
ShellTool.execLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/");
@@ -1348,9 +1348,9 @@
repText = repText.replaceAll("<BoldText>", "");
repText = repText.replaceAll("</BoldText>", "");
}
- if (repText.indexOf("N/A NONE") != -1) {
+/* if (repText.indexOf("N/A NONE") != -1) {
repText = repText.replaceAll("N/A NONE", "");
- }
+ }*/
return repText;
}
public static void changTableColor(String fileName, OutputStream out, List<JAQTableStyle> jaqTableStyleList) throws IOException {
--
Gitblit v1.9.1