From 7299b1b4e0730fecb92021c4ae95e2ac1a13ea3d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 26 五月 2025 00:26:27 +0800
Subject: [PATCH] 人员培训修改成电子签

---
 cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
index a573627..6d32a41 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
@@ -288,6 +288,7 @@
             template.write(os);
             os.flush();
             os.close();
+            inputStream.close();
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("瀵煎嚭澶辫触");
@@ -315,13 +316,15 @@
         for (PersonTrainingRecordDto recordDto : recordDtos) {
             switch (count) {
                 case 0:
-                    exportDto.setUserName1(recordDto.getUserName());
+                    exportDto.setUserNameRender1(StringUtils.isNotBlank(recordDto.getSignatureUrl())
+                            ? Pictures.ofLocal(imgUrl + "/" + recordDto.getSignatureUrl()).create() : null);
                     exportDto.setDepartment1(recordDto.getDepartment());
                     exportDto.setExaminationResults1(recordDto.getExaminationResults());
                     count ++;
                     break;
                 case 1:
-                    exportDto.setUserName2(recordDto.getUserName());
+                    exportDto.setUserNameRender2(StringUtils.isNotBlank(recordDto.getSignatureUrl())
+                            ? Pictures.ofLocal(imgUrl + "/" + recordDto.getSignatureUrl()).create() : null);
                     exportDto.setDepartment2(recordDto.getDepartment());
                     exportDto.setExaminationResults2(recordDto.getExaminationResults());
                     exportDtoList.add(exportDto);
@@ -364,6 +367,7 @@
             template.write(os);
             os.flush();
             os.close();
+            inputStream.close();
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("瀵煎嚭澶辫触");

--
Gitblit v1.9.3