From 8ad863082097ffdcab4a8e7f426d344a1fe6f892 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 07 十一月 2026 00:27:02 +0800
Subject: [PATCH] 修复人员管理接口校验与导出，完善设备保养计划与文件受控功能
---
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java
index 74a57c4..5f3c1f7 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java
@@ -149,14 +149,35 @@
if (ObjectUtils.isNotEmpty(manageDocumentIssueRecycle.getRecycleUser())){
/*鏂板8.3鐨勫彂鏀句笌鍥炴敹璁板綍*/
ManageRecordIssueRecycle manageRecordIssueRecycle = manageRecordIssueRecycleMapper.selectOne(Wrappers.<ManageRecordIssueRecycle>lambdaQuery()
- .eq(ManageRecordIssueRecycle::getDocumentCode, documentIssueRecycle.getDocumentCode())
- .eq(ManageRecordIssueRecycle::getDocumentName, documentIssueRecycle.getName())
- .eq(ManageRecordIssueRecycle::getDocumentVersion, documentIssueRecycle.getVersion())
- .eq(ManageRecordIssueRecycle::getReceiveUser, documentIssueRecycle.getIssueUser())
- .eq(ManageRecordIssueRecycle::getReceiveDate, documentIssueRecycle.getIssueDate()));
- manageRecordIssueRecycle.setSignedUser(manageDocumentIssueRecycle.getRecycleUser());
- manageRecordIssueRecycle.setSignedDate(manageDocumentIssueRecycle.getRecycleDate());
- manageRecordIssueRecycleMapper.updateById(manageRecordIssueRecycle);
+ .eq(ObjectUtils.isNotEmpty(documentIssueRecycle.getDocumentCode()), ManageRecordIssueRecycle::getDocumentCode, documentIssueRecycle.getDocumentCode())
+ .eq(ObjectUtils.isNotEmpty(documentIssueRecycle.getName()), ManageRecordIssueRecycle::getDocumentName, documentIssueRecycle.getName())
+ .eq(ObjectUtils.isNotEmpty(documentIssueRecycle.getVersion()), ManageRecordIssueRecycle::getDocumentVersion, documentIssueRecycle.getVersion())
+ .eq(ObjectUtils.isNotEmpty(documentIssueRecycle.getIssueUser()), ManageRecordIssueRecycle::getReceiveUser, documentIssueRecycle.getIssueUser())
+ .eq(ObjectUtils.isNotEmpty(documentIssueRecycle.getIssueDate()), ManageRecordIssueRecycle::getReceiveDate, documentIssueRecycle.getIssueDate())
+ .orderByDesc(ManageRecordIssueRecycle::getId)
+ .last("limit 1"));
+ if (manageRecordIssueRecycle == null) {
+ // 鍘嗗彶鍙戞斁璁板綍鍦ㄥ彴璐﹂噷鍙兘娌℃湁瀵瑰簲琛岋紝鍥炴敹鏃惰ˉ寤猴紝淇濊瘉涓や釜椤甸潰濮嬬粓鑳藉涓�
+ manageRecordIssueRecycle = new ManageRecordIssueRecycle();
+ manageRecordIssueRecycle.setDocumentCode(documentIssueRecycle.getDocumentCode());
+ manageRecordIssueRecycle.setDocumentName(documentIssueRecycle.getName());
+ manageRecordIssueRecycle.setDocumentVersion(documentIssueRecycle.getVersion());
+ manageRecordIssueRecycle.setReceiveUser(documentIssueRecycle.getIssueUser());
+ manageRecordIssueRecycle.setReceiveDate(documentIssueRecycle.getIssueDate());
+ manageRecordIssueRecycle.setSignedUser(manageDocumentIssueRecycle.getRecycleUser());
+ manageRecordIssueRecycle.setSignedDate(manageDocumentIssueRecycle.getRecycleDate());
+ manageRecordIssueRecycleMapper.insert(manageRecordIssueRecycle);
+ } else {
+ // 鍙戞斁淇℃伅璺熺潃鍙樻洿锛屽洖鏀朵俊鎭洖鍐欑鏀朵汉/绛炬敹鏃ユ湡
+ manageRecordIssueRecycle.setDocumentCode(manageDocumentIssueRecycle.getDocumentCode());
+ manageRecordIssueRecycle.setDocumentName(manageDocumentIssueRecycle.getName());
+ manageRecordIssueRecycle.setDocumentVersion(manageDocumentIssueRecycle.getVersion());
+ manageRecordIssueRecycle.setReceiveUser(manageDocumentIssueRecycle.getIssueUser());
+ manageRecordIssueRecycle.setReceiveDate(manageDocumentIssueRecycle.getIssueDate());
+ manageRecordIssueRecycle.setSignedUser(manageDocumentIssueRecycle.getRecycleUser());
+ manageRecordIssueRecycle.setSignedDate(manageDocumentIssueRecycle.getRecycleDate());
+ manageRecordIssueRecycleMapper.updateById(manageRecordIssueRecycle);
+ }
}
if (ObjectUtils.isNotEmpty(manageDocumentIssueRecycle.getFile())) {
if (ObjectUtils.isNotEmpty(documentIssueRecycle.getUrl())) {
--
Gitblit v1.9.3