From 00a803a1fdccb8a93b76b8be3cef34d7fd6d401c Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期一, 24 四月 2023 22:30:58 +0800
Subject: [PATCH] 升级aspose版本
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 937c127..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;
@@ -1178,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() + "/");
@@ -1407,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