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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 3463126..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
@@ -11,6 +11,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.Pictures;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.DateImageUtil;
@@ -61,7 +62,7 @@
* 鍩硅璁″垝 鏈嶅姟瀹炵幇绫�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-10-11 01:11:49
*/
@Service
@@ -118,7 +119,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(training.getApproverId());
- info.setJumpPath("a6-personnel");
+ info.setJumpPath(MenuJumpPathConstants.PERSONNEL);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -178,7 +179,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(training.getApproverId());
- info.setJumpPath("a6-personnel");
+ info.setJumpPath(MenuJumpPathConstants.PERSONNEL);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -287,6 +288,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
@@ -314,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);
@@ -363,6 +367,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
--
Gitblit v1.9.3