feat(archives): 实现个人档案下载记录标题优化功能
parent
c71a8e43be
commit
84270b39cb
|
|
@ -380,7 +380,10 @@ public class ArchivesQueryExe {
|
||||||
ClassE classE = new ClassE();
|
ClassE classE = new ClassE();
|
||||||
BeanUtils.copyProperties(classDO, classE);
|
BeanUtils.copyProperties(classDO, classE);
|
||||||
// 教材会审表
|
// 教材会审表
|
||||||
|
// 档案类型 1-首页 2-学时证明 3-学员学习档案 4-学习记录 5-考卷信息
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
if (qry.getTypeList().contains(1)){
|
if (qry.getTypeList().contains(1)){
|
||||||
|
sb.append("-安全培训教材会审表");
|
||||||
// 查询所有教材会审表
|
// 查询所有教材会审表
|
||||||
List<ArchivesReviewDO> reviewList = archivesReviewRepository.listAll(params);
|
List<ArchivesReviewDO> reviewList = archivesReviewRepository.listAll(params);
|
||||||
String reviewIds = reviewList.stream()
|
String reviewIds = reviewList.stream()
|
||||||
|
|
@ -405,6 +408,7 @@ public class ArchivesQueryExe {
|
||||||
|
|
||||||
// 安全培训教材或课程讲义
|
// 安全培训教材或课程讲义
|
||||||
if (qry.getTypeList().contains(2)){
|
if (qry.getTypeList().contains(2)){
|
||||||
|
sb.append("-安全培训教材或课程讲义");
|
||||||
List<ClassCurriculumDO> curList = classCurriculumRepository.listAll(params);
|
List<ClassCurriculumDO> curList = classCurriculumRepository.listAll(params);
|
||||||
List<String> classCurriculumIds = curList.stream().map(ClassCurriculumDO::getClassCurriculumId).collect(Collectors.toList());
|
List<String> classCurriculumIds = curList.stream().map(ClassCurriculumDO::getClassCurriculumId).collect(Collectors.toList());
|
||||||
List<ClassCurriculumChapterDO> chapterList = classCurriculumChapterRepository.listByClassCurriculumIds(classCurriculumIds);
|
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)){
|
// if (qry.getTypeList().contains(4)){
|
||||||
//
|
//
|
||||||
// ClassDO classDO = classRepository.getByClassId(qry.getClassId());
|
// ClassDO classDO = classRepository.getByClassId(qry.getClassId());
|
||||||
|
|
@ -456,6 +469,7 @@ public class ArchivesQueryExe {
|
||||||
// classArchivesDTO.setSignList(BeanUtil.copyToList(studentSignList, StudentSignCO.class));
|
// classArchivesDTO.setSignList(BeanUtil.copyToList(studentSignList, StudentSignCO.class));
|
||||||
// }
|
// }
|
||||||
if(qry.getTypeList().contains(5)){
|
if(qry.getTypeList().contains(5)){
|
||||||
|
sb.append("-培训考核试卷");
|
||||||
ClassExamPaperDO classExamPaperDO = classExamPaperRepository.findByClassId(qry.getClassId());
|
ClassExamPaperDO classExamPaperDO = classExamPaperRepository.findByClassId(qry.getClassId());
|
||||||
List<QuestionDO> questionDOList = questionRepository.getInfoByExamPaperId(classExamPaperDO.getExamPaperId());
|
List<QuestionDO> questionDOList = questionRepository.getInfoByExamPaperId(classExamPaperDO.getExamPaperId());
|
||||||
List<QuestionCO> questionCOList = BeanUtil.copyToList(questionDOList, QuestionCO.class);
|
List<QuestionCO> questionCOList = BeanUtil.copyToList(questionDOList, QuestionCO.class);
|
||||||
|
|
@ -479,7 +493,7 @@ public class ArchivesQueryExe {
|
||||||
|
|
||||||
// 新增档案下载记录
|
// 新增档案下载记录
|
||||||
ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE();
|
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();
|
ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO();
|
||||||
BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO);
|
BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO);
|
||||||
archivesPdfFileRepository.save(archivesPdfFileDO);
|
archivesPdfFileRepository.save(archivesPdfFileDO);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue