From 7448455ac0568cbc5aca6b633f6eb4d82efac668 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 07 十一月 2023 09:17:10 +0800
Subject: [PATCH] 优化系统登录的信息
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 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 18156be..2912bf1 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -19,6 +19,7 @@
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.LAQ.chart.LAQChart;
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;
@@ -1185,7 +1186,7 @@
|| ReportTypeEnum.CIAQ.getCode().equals(reportType)){
PdfUtil.convertPDF(EssConfig.getProfile() + "/" + reportName);
}else if(ReportTypeEnum.LAQ.getCode().equals(reportType)){
- PdfUtil.convertPythonPDF(EssConfig.getDocx2pdf(),EssConfig.getProfile() + "/" + reportName);
+ PdfUtil.dockerConvertPDF(EssConfig.getProfile(),EssConfig.getDocx2pdfPath(),reportName);
}else{
ShellTool.execLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/");
// ShellTool shellTool = ShellTool.builder();
@@ -1289,11 +1290,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);
@@ -1415,6 +1432,8 @@
MAQTRChart.changeMAQTRChart(document, dataPath);
} else if (StringUtils.equals(reportType, ReportTypeEnum.CIAQ.getCode())) {
CIAQChart.changeChart(document, textMap);
+ } else if (StringUtils.equals(reportType, ReportTypeEnum.LAQ.getCode())) {
+ LAQChart.changeChart(document, textMap);
} else {
return;
}
--
Gitblit v1.9.1