From 97a1c1235038d6f72c5f0873a92e99a038c2cd61 Mon Sep 17 00:00:00 2001
From: 吴祝攀 <2040239371@qq.com>
Date: 星期四, 29 二月 2024 15:09:46 +0800
Subject: [PATCH] APIFan变更为API_Fan
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 7b702b0..b467420 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.APIFan.chart.APIFanChart;
import com.ots.project.tool.report.CIAQ.chart.CIAQChart;
import com.ots.project.tool.report.LAQ.chart.LAQChart;
import com.ots.project.tool.report.MAQTR.chart.MAQTRChart;
@@ -1181,9 +1182,9 @@
changColorIfJAQ(textMap, out, reportName, tReportTemplate.getReportType());
//}
- //PAQ銆丮AQTR閲囩敤銆丆IAQ鏂扮殑doc杞琾df
+ //PAQ銆丮AQTR閲囩敤銆丆IAQ銆丄PIFan鏂扮殑doc杞琾df
if(ReportTypeEnum.PAQ.getCode().equals(reportType) || ReportTypeEnum.MAQTR.getCode().equals(reportType)
- || ReportTypeEnum.CIAQ.getCode().equals(reportType)){
+ || ReportTypeEnum.CIAQ.getCode().equals(reportType) ||ReportTypeEnum.API_Fan.getCode().equals(reportType)){
PdfUtil.convertPDF(EssConfig.getProfile() + "/" + reportName);
}else if(ReportTypeEnum.LAQ.getCode().equals(reportType)){
PdfUtil.dockerConvertPDF(EssConfig.getProfile(),EssConfig.getDocx2pdfPath(),reportName);
@@ -1290,11 +1291,27 @@
XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage(getTemplateDownLoadPathByUpLoad(fileName)));
- //璁剧疆鏂囨湰
- changeText(document, textMap);
+ if (StringUtils.equals(reportType, ReportTypeEnum.JAQ.getCode())) {
+ //璁剧疆鏂囨湰妗�
+ changeTextBox(document, textMap);
- //璁剧疆鏂囨湰妗�
- changeTextBox(document, textMap);
+ //璁剧疆鏂囨湰
+ changeText(document, textMap);
+ }else {
+ //璁剧疆鏂囨湰
+ changeText(document, textMap);
+
+ //璁剧疆鏂囨湰妗�
+ changeTextBox(document, textMap);
+ }
+
+// //璁剧疆鏂囨湰妗�
+// changeTextBox(document, textMap);
+//
+// //璁剧疆鏂囨湰
+// changeText(document, textMap);
+
+
//鎻掑叆琛ㄦ牸
addTableValue(document, autoTableMap);
@@ -1418,7 +1435,11 @@
CIAQChart.changeChart(document, textMap);
} else if (StringUtils.equals(reportType, ReportTypeEnum.LAQ.getCode())) {
LAQChart.changeChart(document, textMap);
- } else {
+ } else if(StringUtils.equals(reportType, ReportTypeEnum.API_Fan.getCode()))
+ {
+ APIFanChart.changeChart(document,textMap);
+ }
+ else {
return;
}
}catch (Exception e){
--
Gitblit v1.9.1