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 5975ea5..b903016 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 @@ -130,10 +130,11 @@ public class ArchivesQueryExe { ClassDO classDO = classRepository.getByClassId(studentDO.getClassId()); classE = new ClassE(); BeanUtils.copyProperties(classDO, classE); - + StringBuilder sb = new StringBuilder(); + if (qry.getTypeList().contains(1)) { + sb.append("-首页"); + } if (qry.getTypeList().contains(2) || qry.getTypeList().contains(3) || qry.getTypeList().contains(4)) { - - params.put("classId", studentDO.getClassId()); // 课程信息 List curEList = classCurriculumRepository.listAll(params); @@ -141,16 +142,20 @@ public class ArchivesQueryExe { } if (qry.getTypeList().contains(2)) { + sb.append("-学时证明"); // 课件信息 List classChapterList = classCurriculumChapterRepository.listVideoByClassId(classE.getClassId()); classChapterEList = BeanUtil.copyToList(classChapterList, ClassCurriculumChapterE.class); } if (qry.getTypeList().contains(3)) { + sb.append("-学员学习档案"); // 学员人脸记录 StudentDO studentUrl = studentRepository.findFaceUrlByPhone(studentDO.getPhone()); studentE.setUserAvatarUrl(studentUrl.getUserAvatarUrl()); } if (qry.getTypeList().contains(4)) { + + sb.append("-学习记录"); // 签到照片 params.put("studentId", studentDO.getStudentId()); List studentSignList = studentSignRepository.listAllByStudentId(params); @@ -166,6 +171,7 @@ public class ArchivesQueryExe { PersonArchivesDTO personArchivesDTO = new PersonArchivesDTO(); BeanUtils.copyProperties(personArchivesE, personArchivesDTO); if (qry.getTypeList().contains(5)) { + sb.append("-考卷信息"); StudentExamRecordDO studentExamRecordDO = studentExamRecordRepository.getInfoByStudentId(studentDO.getStudentId()); if(studentExamRecordDO != null){ StudentExamRecordCO studentExamRecordCO = new StudentExamRecordCO(); @@ -179,7 +185,7 @@ public class ArchivesQueryExe { } // 新增档案下载记录 ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE(); - archivesPdfFileE.init("student", personArchivesDTO.getStudentId(), 1, AuthContext.getTenantId(), personArchivesDTO.getName()+"-"+personArchivesDTO.getClassName()); + archivesPdfFileE.init("student", personArchivesDTO.getStudentId(), 1, AuthContext.getTenantId(), personArchivesDTO.getClassName()+"一人一档案"+sb.toString()); ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO(); BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); archivesPdfFileRepository.save(archivesPdfFileDO);