From 50b3137d08c6535367bfa9144d18329120dd51bb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 18 十一月 2024 14:40:15 +0800
Subject: [PATCH] 环境试验后面再按照冲水试验和振动试验进行排序
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 41 ++++++++++-------------------------------
1 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index bceb7d0..19fc1ae 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -25,6 +25,7 @@
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+
import javax.annotation.Resource;
import java.io.*;
import java.nio.file.Files;
@@ -1486,22 +1487,13 @@
lable.getAndIncrement();
});
});
- String url;
- try {
- ZipSecureFile.setMinInflateRatio(0.0001);
- InputStream inputStream = this.getClass().getResourceAsStream("/static/word1.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+
+ ZipSecureFile.setMinInflateRatio(0.0001);
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/word1.docx");
+
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
put("title", title);
put("tables", tables);
@@ -1974,8 +1966,7 @@
getWord1(insOrderUser.getTerm(), orderState, insSamples, tables2);
}
}
- }
- else {
+ } else {
//濡傛灉鍙湁鐜璇曢獙娌℃湁鐢佃矾璇曢獙
strings.remove("杩戝満");
strings.remove("杩滃満");
@@ -2090,20 +2081,8 @@
tables4.add(table4);
}
}
-
- String url;
- try {
- ZipSecureFile.setMinInflateRatio(0.0001);
- InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
- File file = File.createTempFile("temp", ".tmp");
- OutputStream outputStream = new FileOutputStream(file);
- IOUtils.copy(inputStream, outputStream);
- url = file.getAbsolutePath();
- } catch (FileNotFoundException e) {
- throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ ZipSecureFile.setMinInflateRatio(0.0001);
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
StringBuilder standardMethod2 = new StringBuilder();
for (String s : standardMethod) {
standardMethod2.append("锛沑n").append(s);
@@ -2181,7 +2160,7 @@
title3 = "杈愬皠鏂瑰悜鍥惧弬鏁�";
}
String finalTitle = title3;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
put("order", insOrder);
put("report", insReport);
--
Gitblit v1.9.3