From 84270b39cbc8ffd14d8ebc1316e4ebeed0729c40 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 10 Mar 2026 10:42:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(archives):=20=E5=AE=9E=E7=8E=B0=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E6=A1=A3=E6=A1=88=E4=B8=8B=E8=BD=BD=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../command/query/archives/ArchivesQueryExe.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java
index b903016..723fe17 100644
--- a/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java
@@ -380,7 +380,10 @@ public class ArchivesQueryExe {
         ClassE classE = new ClassE();
         BeanUtils.copyProperties(classDO, classE);
         // 教材会审表
+        // 档案类型 1-首页  2-学时证明 3-学员学习档案 4-学习记录 5-考卷信息
+        StringBuilder sb = new StringBuilder();
         if (qry.getTypeList().contains(1)){
+            sb.append("-安全培训教材会审表");
             // 查询所有教材会审表
             List<ArchivesReviewDO> reviewList = archivesReviewRepository.listAll(params);
             String reviewIds = reviewList.stream()
@@ -405,6 +408,7 @@ public class ArchivesQueryExe {
 
         // 安全培训教材或课程讲义
         if (qry.getTypeList().contains(2)){
+            sb.append("-安全培训教材或课程讲义");
             List<ClassCurriculumDO> curList = classCurriculumRepository.listAll(params);
             List<String> classCurriculumIds = curList.stream().map(ClassCurriculumDO::getClassCurriculumId).collect(Collectors.toList());
             List<ClassCurriculumChapterDO> chapterList = classCurriculumChapterRepository.listByClassCurriculumIds(classCurriculumIds);
@@ -447,6 +451,15 @@ public class ArchivesQueryExe {
             }
 
         }
+        if (qry.getTypeList().contains(3)){
+            sb.append("-安全培训教育记录及签字表");
+        }
+        if (qry.getTypeList().contains(4)){
+            sb.append("-培训影像资料");
+        }
+        if (qry.getTypeList().contains(6)){
+            sb.append("-学员考核成绩统计表");
+        }
 //        if (qry.getTypeList().contains(4)){
 //
 //            ClassDO classDO = classRepository.getByClassId(qry.getClassId());
@@ -456,6 +469,7 @@ public class ArchivesQueryExe {
 //            classArchivesDTO.setSignList(BeanUtil.copyToList(studentSignList, StudentSignCO.class));
 //        }
         if(qry.getTypeList().contains(5)){
+            sb.append("-培训考核试卷");
             ClassExamPaperDO classExamPaperDO = classExamPaperRepository.findByClassId(qry.getClassId());
             List<QuestionDO> questionDOList = questionRepository.getInfoByExamPaperId(classExamPaperDO.getExamPaperId());
             List<QuestionCO> questionCOList = BeanUtil.copyToList(questionDOList, QuestionCO.class);
@@ -479,7 +493,7 @@ public class ArchivesQueryExe {
 
         // 新增档案下载记录
         ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE();
-        archivesPdfFileE.init("class", classArchivesDTO.getClassId(), 2, AuthContext.getTenantId(), classArchivesDTO.getClassName());
+        archivesPdfFileE.init("class", classArchivesDTO.getClassId(), 2, AuthContext.getTenantId(), classArchivesDTO.getClassName()+"-一期一档"+sb.toString());
         ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO();
         BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO);
         archivesPdfFileRepository.save(archivesPdfFileDO);