From e776dcaa5aa2416634644c2c7ac333ee95738b95 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 17 三月 2025 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessReportServiceImpl.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessReportServiceImpl.java b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessReportServiceImpl.java
index be47fbe..cb7b12c 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessReportServiceImpl.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/service/impl/ProcessReportServiceImpl.java
@@ -94,18 +94,7 @@
processReport.setSignatoryName(signatoryName);
}
//鐢熸垚妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/report-deal.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);
- }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/report-deal.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
@@ -377,13 +366,11 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("report", tableRenderData);
- table.put("index1", index1);
reportList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
- XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
put("reportList", reportList);
}});
--
Gitblit v1.9.3