Эх сурвалжийг харах

导出试卷,专业层次修改为课程专业

weiwenhai 7 жил өмнө
parent
commit
7d1cc641b8

+ 5 - 1
cqb-paper/src/main/java/com/qmth/cqb/paper/service/export/InitPaperExpService.java

@@ -133,7 +133,11 @@ public  class InitPaperExpService {
 		}
     	//创建试卷导出的dto
     	PaperExp paperExpDto = BeanCopierUtil.copyProperties(paper, PaperExp.class);
-    	paperExpDto.setCourseLevel(paper.getLevel() == null?CourseLevel.ALL.getName():paper.getLevel().getName());
+    	if(paper.getCourse() == null){
+    		paperExpDto.setCourseLevel(CourseLevel.ALL.getName());
+    	}else {
+    		paperExpDto.setCourseLevel(paper.getCourse().getLevel() == null?CourseLevel.ALL.getName():paper.getCourse().getLevel());
+    	}
     	//获取原试卷所有大题
     	List<PaperDetail> paperDetails = paperDetailRepo.findByPaperOrderByNumber(paper);
     	//生成新的大题对象集合,加添对应的小题