From 03f3d70b6770a889c3918d41951c27dfa08a21bf Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期三, 04 八月 2021 17:59:51 +0800
Subject: [PATCH] PAQ 改为python转换pdf
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 961d8e8..029f035 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -767,7 +767,12 @@
setChageWord(fileName, out, textMap, tReportTemplate.getReportType(), templateType, autoTableMap);
out.flush();
changColorIfJAQ(textMap, out, reportName, tReportTemplate.getReportType());
- ShellTool.execLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/");
+ //PAQ閲囩敤鏂扮殑doc杞琾df
+ if(!ReportTypeEnum.PAQ.getCode().equals(reportType)){
+ ShellTool.execLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/");
+ }else{
+ ShellTool.execPythonCommand(1,EssConfig.getProfile() + "/" + reportName);
+ }
zipFilePath = getPdfPath(reportName);
deleteFileStrList.add(EssConfig.getProfile() + "/" + reportName);
@@ -857,7 +862,7 @@
changeTextBox(document, textMap);
//璁剧疆鍥捐〃
- if (Objects.equals(reportType, ReportTypeEnum.SAQ.getCode())) {
+ if (Objects.equals(reportType, ReportTypeEnum.SAQ.getCode()) || Objects.equals(reportType, ReportTypeEnum.PAQ.getCode())) {
SAQChart.changeChart(document, textMap);
}
@@ -868,7 +873,7 @@
changeTable(document, textMap);
//璁剧疆鍥捐〃鎺т欢
- changChar(textMap, document, reportType, templateType);
+ //changChar(textMap, document, reportType, templateType);
document.write(out);
}
private static void changeTextBox(XWPFDocument document, Map<String, Object> textMap) throws DocumentException {
--
Gitblit v1.9.1