From 436b955086030caec4513022c1f5127470ad2b14 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 28 十二月 2025 20:54:21 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
index 56375d6..3c6ef8e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
@@ -579,15 +579,17 @@
String li_person = "浠囩縺";
String sh_person = "鏇剧憺鑾�";
ArchiveRecords archiveRecords1 = iArchiveRecordsService.selectArchiveRecordsById(ids[i]);
+ if(!StringUtils.isEmpty(archiveRecords1.getLiPerson()))
+ li_person = archiveRecords1.getLiPerson();
ArchiveProjectName tmp = new ArchiveProjectName();
tmp.setName(archiveRecords1.getProjectName());
List<ArchiveProjectName> projectName = iArchiveProjectNameService.selectArchiveProjectNameList(tmp);
if(!projectName.isEmpty())
{
- if(StringUtils.isEmpty(projectName.get(0).getCompanyName()))
+ if(!StringUtils.isEmpty(projectName.get(0).getCompanyName()))
compName = projectName.get(0).getCompanyName();
- if(StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
- li_person = projectName.get(0).getCreatePerson();
+ if(!StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
+ sh_person = projectName.get(0).getCreatePerson();
}
allPages = texPages + picPages + patPages;
hs.put("pages", allPages);
@@ -596,7 +598,8 @@
hs.put("texPages", texPages);
hs.put("volumeNumber", aIV.getRecordId());
hs.put("company", compName);
-
+ hs.put("liPerson", li_person);
+ hs.put("shPerson", sh_person);
hs.put("time", cdt);
if (!getLicense()) {
@@ -1130,15 +1133,17 @@
String li_person = "浠囩縺";
String sh_person = "鏇剧憺鑾�";
ArchiveRecords archiveRecords = iArchiveRecordsService.selectArchiveRecordsById(id);
+ if(!StringUtils.isEmpty(archiveRecords.getLiPerson()))
+ li_person = archiveRecords.getLiPerson();
ArchiveProjectName tmp = new ArchiveProjectName();
tmp.setName(archiveRecords.getProjectName());
List<ArchiveProjectName> projectName = iArchiveProjectNameService.selectArchiveProjectNameList(tmp);
if(!projectName.isEmpty())
{
- if(StringUtils.isEmpty(projectName.get(0).getCompanyName()))
+ if(!StringUtils.isEmpty(projectName.get(0).getCompanyName()))
compName = projectName.get(0).getCompanyName();
- if(StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
- li_person = projectName.get(0).getCreatePerson();
+ if(!StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
+ sh_person = projectName.get(0).getCreatePerson();
}
allPages = texPages + picPages + patPages;
@@ -1148,7 +1153,8 @@
hs.put("texPages", texPages);
hs.put("volumeNumber", aIV.getRecordId());
hs.put("company", compName);
-
+ hs.put("liPerson", li_person);
+ hs.put("shPerson", sh_person);
hs.put("time", cdt);
if (!getLicense()) {
--
Gitblit v1.9.1