考试试卷接口去除年级 学科关联

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/ExamPaperServiceImpl.java

@@ -183,7 +183,11 @@ public class ExamPaperServiceImpl extends BaseServiceImpl<ExamPaper> implements
     }
 
     private void examPaperFromVM(ExamPaperEditRequestVM examPaperEditRequestVM, ExamPaper examPaper, List<ExamPaperTitleItemVM> titleItemsVM) {
-        Integer gradeLevel = subjectService.levelBySubjectId(examPaperEditRequestVM.getSubjectId());
+        Integer gradeLevel = null;
+        if(examPaperEditRequestVM.getSubjectId() != null){
+            gradeLevel = subjectService.levelBySubjectId(examPaperEditRequestVM.getSubjectId());
+            examPaper.setGradeLevel(gradeLevel);
+        }
         Integer questionCount = titleItemsVM.stream()
                 .mapToInt(t -> t.getQuestionItems().size()).sum();
         Integer score = titleItemsVM.stream().
@@ -192,7 +196,6 @@ public class ExamPaperServiceImpl extends BaseServiceImpl<ExamPaper> implements
                 ).sum();
         examPaper.setQuestionCount(questionCount);
         examPaper.setScore(score);
-        examPaper.setGradeLevel(gradeLevel);
         List<String> dateTimes = examPaperEditRequestVM.getLimitDateTime();
         if (ExamPaperTypeEnum.TimeLimit == ExamPaperTypeEnum.fromCode(examPaper.getPaperType())) {
             examPaper.setLimitStartTime(DateTimeUtil.parse(dateTimes.get(0), DateTimeUtil.STANDER_FORMAT));

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/QuestionServiceImpl.java

@@ -95,10 +95,13 @@ public class QuestionServiceImpl extends BaseServiceImpl<Question> implements Qu
     @Override
     @Transactional
     public Question updateFullQuestion(QuestionEditRequestVM model) {
-        Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
         Question question = questionMapper.selectByPrimaryKey(model.getId());
-        question.setSubjectId(model.getSubjectId());
-        question.setGradeLevel(gradeLevel);
+        Integer gradeLevel = null;
+        if(model.getSubjectId() != null){
+            gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
+            question.setGradeLevel(gradeLevel);
+            question.setSubjectId(model.getSubjectId());
+        }
         question.setScore(ExamUtil.scoreFromVM(model.getScore()));
         question.setDifficult(model.getDifficult());
         question.setCorrectFromVM(model.getCorrect(), model.getCorrectArray());