From 4281f6c90e4a17845a5721ab51b3bc5c5409ab45 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期三, 07 一月 2026 23:27:04 +0800
Subject: [PATCH] 修改了对应代码
---
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
index a483197..8ba1663 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -73,7 +73,7 @@
public AjaxResult selectDataList(DocumentMaterials documentMaterials, Integer pageNum, Integer pageSize) {
LambdaQueryWrapper<DocumentMaterials> lqw = buildCondition(documentMaterials);
-
+ lqw.eq(true, DocumentMaterials::getVisible, 1);
Page<DocumentMaterials> zfClanPage = new Page<>(pageNum, pageSize);
Page<DocumentMaterials> pageResult = page(zfClanPage, lqw);
@@ -113,13 +113,42 @@
public List<DocumentMaterials> selectDocumentMaterialsList(DocumentMaterials documentMaterials) {
LambdaQueryWrapper<DocumentMaterials> lambdaQueryWrapper = buildCondition(documentMaterials);
List<DocumentMaterials> beanRecords = list(lambdaQueryWrapper);
+ int size = beanRecords.size();
+ // 鑾峰彇璇ユ鍗风殑鏈�澶ч〉鍙凤紙鎬婚〉鏁帮級
+ Long totalPages = this.baseMapper.getMaxPageNumber(documentMaterials.getRecordId().intValue());
+
+ // 閬嶅巻鎵�鏈夋潯鐩紝璁剧疆pageNumberFormatted
+ for (int i = 0; i < size; i++) {
+ DocumentMaterials item = beanRecords.get(i);
+ Long pageNumber = item.getPageNumber();
+
+ if (i == size - 1) {
+ // 鏈�鍚庝竴琛岋細鏍煎紡鍖栭〉鍙蜂负"鏈�鍚庝竴椤甸〉鍙�-鎬婚〉鏁�"鐨勫舰寮�
+ item.setPageNumberFormatted(pageNumber + "-" + totalPages);
+ } else {
+ // 鍏朵粬琛岋細鐩存帴浣跨敤pageNumber鐨勫��
+ item.setPageNumberFormatted(pageNumber != null ? pageNumber.toString() : "");
+ }
+ if(item.getSecurityLevel().equals("璇ラ〉鍙﹀瓨"))
+ item.setSecurityLevel("鏅��");
+ }
return beanRecords;
}
@Override
public List<DocumentMaterialsVoLarge> selectDocumentMaterialsAllByRecordId(Long id) {
- return this.baseMapper.getDocumentMaterialsvoLarge(Math.toIntExact(id));
+ List<DocumentMaterialsVoLarge> lists = this.baseMapper.getDocumentMaterialsvoLarge(Math.toIntExact(id));
+ // 閬嶅巻鎵�鏈夋潯鐩紝璁剧疆pageNumberFormatted
+ for (int i = 0; i < lists.size(); i++) {
+ DocumentMaterialsVoLarge item = lists.get(i);
+ Long pageNumber = item.getPageNumber();
+
+
+ if(item.getSecurityLevel().equals("璇ラ〉鍙﹀瓨"))
+ item.setSecurityLevel("鏅��");
+ }
+ return lists;
}
@Override
@@ -170,6 +199,15 @@
}
List<DocumentMaterials> beanRecords = list(lambdaQueryWrapper);
+ // 閬嶅巻鎵�鏈夋潯鐩紝璁剧疆pageNumberFormatted
+ for (int i = 0; i < beanRecords.size(); i++) {
+ DocumentMaterials item = beanRecords.get(i);
+ Long pageNumber = item.getPageNumber();
+
+
+ if(item.getSecurityLevel().equals("璇ラ〉鍙﹀瓨"))
+ item.setSecurityLevel("鏅��");
+ }
return beanRecords;
}
@@ -342,6 +380,16 @@
if (StringUtils.isEmpty(documentMaterials.getIsCanceled())) {
throw new ErrorcodeExceptionextends(400, "鏄惁娉ㄩ攢涓嶈兘涓虹┖");
}
+ // 鎵嬪姩杞崲瀵嗙骇瀛楁
+// if ("绉樺瘑".equals(documentMaterials.getSecurityLevel())) {
+// documentMaterials.setSecurityLevel("璇ラ〉鍙﹀瓨");
+// }
+// if ("鍐呴儴鐢ㄥ浘".equals(documentMaterials.getSecurityLevel())) {
+// documentMaterials.setSecurityLevel("璇ラ〉鍙﹀瓨");
+// }
+// if ("鍐呴儴鐢ㄩ��".equals(documentMaterials.getSecurityLevel())) {
+// documentMaterials.setSecurityLevel("璇ラ〉鍙﹀瓨");
+// }
this.insertDocumentMaterials(documentMaterials);
}
@@ -456,6 +504,8 @@
newRecord.setFileSize(null);
newRecord.setFormat(null);
newRecord.setUrl(null);
+ newRecord.setVisible(0);
+
// 娣诲姞鍒颁腑闂磋褰曞垪琛�
middleRecords.add(newRecord);
}
--
Gitblit v1.9.1