From 3ac1305cdd8b1f3b6cbde2f3b25db73fb39e2cd6 Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期四, 22 四月 2021 21:11:10 +0800
Subject: [PATCH] 变更
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 6 ++++--
tai-ots-framework.iml | 3 ---
pom.xml | 27 ++++++++++++++++++++++++++-
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 393ee3b..e0bd5d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -367,5 +367,30 @@
</dependency>
</dependencies>
-
+ <!--<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.2</version>
+ <executions>
+ <execution>
+ <id>install-external</id>
+ <phase>clean</phase>
+ <configuration>
+ <file>${project.build.directory}/tai-ots-framework-1.0.jar</file>
+ <repositoryLayout>default</repositoryLayout>
+ <groupId>com.ots</groupId>
+ <artifactId>tai-ots-framework</artifactId>
+ <version>1.0</version>
+ <generatePom>true</generatePom>
+ </configuration>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>-->
</project>
\ No newline at end of file
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 6de620f..368610e 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -837,8 +837,10 @@
XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage(getTemplateDownLoadPathByUpLoad(fileName)));
changeText(document, textMap);
-
- changeTextBox(document, textMap);
+
+ if (Objects.equals(reportType, ReportTypeEnum.MAQV2.getCode())) {
+ changeTextBox(document, textMap);
+ }
addTableValue(document, autoTableMap);
diff --git a/tai-ots-framework.iml b/tai-ots-framework.iml
index 24d0603..04ddbce 100644
--- a/tai-ots-framework.iml
+++ b/tai-ots-framework.iml
@@ -20,9 +20,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
- <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.1.RELEASE" level="project" />
--
Gitblit v1.9.1