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/ManageRecordIssueRecycleServiceImpl.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIssueRecycleServiceImpl.java b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIssueRecycleServiceImpl.java
index 741324f..77285d6 100644
--- a/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIssueRecycleServiceImpl.java
+++ b/cnas-manage/src/main/java/com/yuanchu/mom/service/impl/ManageRecordIssueRecycleServiceImpl.java
@@ -467,15 +467,12 @@
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("recycle", tableRenderData);
- table.put("index1", index1);
recycleList.add(table);
index1++;
}
}
- Integer finalIndex = index1;
XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
- put("size", finalIndex);
put("recycleList", recycleList);
}});
String name = UUID.randomUUID() + "_鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�" + ".docx";
@@ -646,7 +643,6 @@
} catch (Exception e) {
manageRecordIssueRecycle.setSignedDate(null);
}
-
ManageRecordIssueRecycle issueRecycle = manageRecordIssueRecycleMapper.selectOne(Wrappers.<ManageRecordIssueRecycle>lambdaQuery()
.eq(ManageRecordIssueRecycle::getDocumentCode, manageRecordIssueRecycle.getDocumentCode())
.eq(ManageRecordIssueRecycle::getDocumentName, manageRecordIssueRecycle.getDocumentName())
--
Gitblit v1.9.3