|
|
@@ -630,7 +630,7 @@ public class LearnTeacherService {
|
|
|
private LearnTestPaper getPaper(TestPaperVO.TestPaperBuildReq req,DzSubject dzSubject,LearnTest learnTest){
|
|
|
LearnPaper paper = new LearnPaper();
|
|
|
paper.setSubjectId(req.getSubjectId());
|
|
|
- String paperName = StringUtils.isBlank(req.getName()) ? learnTest.getName() + "_" + dzSubject.getSubjectName() : req.getName();
|
|
|
+ String paperName = StringUtils.isBlank(req.getName()) ? learnTest.getName() + "_" + (null==dzSubject?"":dzSubject.getSubjectName()) : req.getName();
|
|
|
paper.setPaperName(paperName.length() > 254 ? paperName.substring(0, 254) : paperName);
|
|
|
paper.setYear(Calendar.getInstance().get(Calendar.YEAR)); // TODO 年度
|
|
|
paper.setPaperType(PaperType.Test.name());
|