From d85aa8fbdb87bead85b8aaba57dc0c6f31542be4 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 31 一月 2024 08:56:07 +0800
Subject: [PATCH] 增加API测试

---
 src/main/java/com/ots/common/utils/poi/WordUtil.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 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 7b702b0..c5010c7 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -1181,9 +1181,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.APIFan.getCode().equals(reportType)){
                 PdfUtil.convertPDF(EssConfig.getProfile() + "/" + reportName);
             }else if(ReportTypeEnum.LAQ.getCode().equals(reportType)){
                 PdfUtil.dockerConvertPDF(EssConfig.getProfile(),EssConfig.getDocx2pdfPath(),reportName);
@@ -1290,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);

--
Gitblit v1.9.1