From 0f877d7ba62205f94e615eb0ab1950b3350c1436 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期二, 10 十月 2023 17:06:23 +0800
Subject: [PATCH] LAQ支持
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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..4d7ec5d 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -18,6 +18,7 @@
import com.ots.project.tool.exam.ImageUtil;
import com.ots.project.tool.exam.ZipUtil;
import com.ots.project.tool.libreoffice.LibreOfficeUtil;
+import com.ots.project.tool.report.CIAQ.chart.CIAQChart;
import com.ots.project.tool.report.MAQTR.chart.MAQTRChart;
import com.ots.project.tool.report.PAQ.chart.PAQChart;
import org.apache.commons.collections.map.HashedMap;
@@ -903,9 +904,8 @@
if (checkText(runValue)) {
runValue = runValue.replaceAll("%.*%", "");
- runValue = runValue.replaceAll("N/A NONE", "");
-
}
+ runValue = runValue.replaceAll("N/A NONE", "");
return runValue;
}
@@ -1179,8 +1179,9 @@
changColorIfJAQ(textMap, out, reportName, tReportTemplate.getReportType());
//}
- //PAQ銆丮AQTR閲囩敤鏂扮殑doc杞琾df
- if(ReportTypeEnum.PAQ.getCode().equals(reportType) || ReportTypeEnum.MAQTR.getCode().equals(reportType)){
+ //PAQ銆丮AQTR閲囩敤銆丆IAQ鏂扮殑doc杞琾df
+ 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 +1349,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 {
@@ -1408,6 +1409,8 @@
PAQChart.changeChart(document, textMap);
} else if (StringUtils.equals(reportType, ReportTypeEnum.MAQTR.getCode())) {
MAQTRChart.changeMAQTRChart(document, dataPath);
+ } else if (StringUtils.equals(reportType, ReportTypeEnum.CIAQ.getCode())) {
+ CIAQChart.changeChart(document, textMap);
} else {
return;
}
--
Gitblit v1.9.1