From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordTotalServiceImpl.java | 18 ++----------------
1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordTotalServiceImpl.java b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordTotalServiceImpl.java
index 70756d1..5b3fafb 100644
--- a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordTotalServiceImpl.java
+++ b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordTotalServiceImpl.java
@@ -123,18 +123,7 @@
private String recordTotaldeal(Integer id,String signatureUrl){
List<ManageRecordVerify> manageRecordVerifies = manageRecordVerifyMapper.selectList(Wrappers.<ManageRecordVerify>lambdaQuery().eq(ManageRecordVerify::getManageRecordTotalId,id));
- String url;
- try {
- InputStream inputStream = this.getClass().getResourceAsStream("/static/verify-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/verify-deal.docx");
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
@@ -366,16 +355,13 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("verify", tableRenderData);
- table.put("index1", index1);
verifyList.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("verifyList", verifyList);
- put("size", finalIndex);
put("submitDate", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
put("submitDateEn", monthNames[LocalDate.now().getMonthValue() - 1] + " " + LocalDate.now().getDayOfMonth() + ", " + LocalDate.now().getYear());
put("ratifyDate", "{{ratifyDate}}");
--
Gitblit v1.9.3