From 4281f6c90e4a17845a5721ab51b3bc5c5409ab45 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期三, 07 一月 2026 23:27:04 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
index 710af70..43f5975 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
@@ -176,6 +176,8 @@
list = documentMaterialsService.selectDocumentMaterialsList(documentMaterials);
}
+
+
ExcelUtil<DocumentMaterials> util = new ExcelUtil<DocumentMaterials>(DocumentMaterials.class);
util.exportExcel(response, list, "鐢靛瓙鏂囦欢鐩綍");
}
@@ -479,9 +481,14 @@
String compName = "骞垮窞鐩堝妗ｆ绠＄悊鏈夐檺鍏徃";
String li_person = "浠囩縺";
String sh_person = "鏇剧憺鑾�";
+
ArchiveRecords archiveRecords = iArchiveRecordsService.selectArchiveRecordsById(id);
if(!StringUtils.isEmpty(archiveRecords.getLiPerson()))
li_person = archiveRecords.getLiPerson();
+ String note_remark = "";
+ if(!StringUtils.isEmpty(archiveRecords.getNoteRemark()))
+ note_remark = "锛�"+archiveRecords.getNoteRemark();
+ System.out.println(note_remark+"{{{{");
ArchiveProjectName tmp = new ArchiveProjectName();
tmp.setName(archiveRecords.getProjectName());
List<ArchiveProjectName> projectName = iArchiveProjectNameService.selectArchiveProjectNameList(tmp);
@@ -534,6 +541,7 @@
hs.put("company", compName);
hs.put("liPerson", li_person);
hs.put("shPerson", sh_person);
+ hs.put("noteRemark", note_remark);
hs.put("time", cdt);
if (!getLicense()) {
@@ -702,7 +710,9 @@
// 鏍规嵁椤靛彿鎷垮埌妗堝嵎鐨勮缁嗕俊鎭�
DocumentMaterials doc = documentMaterialsService.selectByPageNumber(nam, Math.toIntExact(recordId));
if (doc != null) {
- if (doc.getSecurityLevel() != null && doc.getSecurityLevel().equals("璇ラ〉鍙﹀瓨")) {
+ if (doc.getSecurityLevel() != null && (doc.getSecurityLevel().equals("璇ラ〉鍙﹀瓨")||
+ doc.getSecurityLevel().equals("绉樺瘑")||doc.getSecurityLevel().equals("鍐呴儴鐢ㄩ��")||
+ doc.getSecurityLevel().equals("鍐呴儴鐢ㄥ浘"))) {
// 鏇挎崲涓轰簡鍑嗗濂界殑鍥惧儚
String fp = filePath + "\\glc.jpg";
Path path = Paths.get(fp);
--
Gitblit v1.9.1