题类型调整

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontExamController.java

@@ -13,6 +13,7 @@ import com.ruoyi.ie.service.IAMarjorPlanService;
 import com.ruoyi.learn.domain.AnswerSheet;
 import com.ruoyi.learn.domain.LearnExaminee;
 import com.ruoyi.learn.domain.LearnPaper;
+import com.ruoyi.learn.domain.PaperVO;
 import com.ruoyi.learn.service.ILearnExamineeService;
 import com.ruoyi.learn.service.ILearnPaperService;
 import com.ruoyi.system.service.ISysUserService;
@@ -59,20 +60,22 @@ public class FrontExamController {
         return AjaxResult.success();
     }
 
+    @ApiOperation("02 交卷")
+    @PostMapping(value = "commitExamineePaper")
+    public AjaxResult commitExamineePaper(@RequestBody PaperVO paperDto) {
+//        if (MxjbContants.ExamineeTypeIeValue.equals(paperDto.getExamineeType())) {
+//            return mxjbPaperExamService.saveExamPaper(paperDto);
+//        }
+//        return syTestMajorService.saveTestPaper(paperDto);
+        return AjaxResult.success();
+    }
+
     /*@ApiOperation("02 答题")
     @PostMapping(value = "commitExamineeQuestion")
     public AjaxResult commitExamineeQuestion(@RequestBody PaperDto paperDto) {
         return adminExaminationService.saveQuestion(paperDto);
     }
 
-    @ApiOperation("02 交卷")
-    @PostMapping(value = "commitExamineePaper")
-    public AjaxResult commitExamineePaper(@RequestBody PaperDto paperDto) {
-        if (MxjbContants.ExamineeTypeIeValue.equals(paperDto.getExamineeType())) {
-            return mxjbPaperExamService.saveExamPaper(paperDto);
-        }
-        return syTestMajorService.saveTestPaper(paperDto);
-    }
 
     @ApiOperation("04 阅卷打分")
     @PostMapping(value = "scoreExamineeQuestions")

ie-admin/src/main/java/com/ruoyi/web/service/PaperService.java

@@ -67,7 +67,7 @@ public class PaperService {
             BeanUtils.copyProperties(lqs, qs, "options", "parse", "answer1", "answer2");
             QuestionType qt = QuestionType.of(lqs.getQtpye());
             qs.setTypeId(qt.getVal());
-            qs.setType(qt.getName());
+            qs.setType(qt.getTitle());
             qs.setOptions(getOptions(lqs.getOptionA(), lqs.getOptionB(), lqs.getOptionC(), lqs.getOptionD(), lqs.getOptionE(), lqs.getOptionF(), lqs.getOptionG()));
             if(StringUtils.isNotBlank(lqs.getTitle0())) { // 大题
                 PaperVO.QuestionSeq qg = gropuMap.get(lqs.getTitle0());

ie-system/src/main/java/com/ruoyi/enums/QuestionType.java

@@ -11,10 +11,10 @@ import java.util.Map;
 @Getter
 public enum QuestionType {
     Single(1, "单选题"), Multiple(2, "多选题"), Judgment(3, "判断题"), Fill(4, "填空题"),
-    Subjective(5, "主观题");
+    Subjective(5, "主观题"), Short(6, "简答题"), Essay(7, "问答题"), Analysis(8, "分析题");
 
     private final Integer val;
-    private final String name;
+    private final String title;
 
     private static final Map<String, QuestionType> valMap = Maps.newHashMap();
 
@@ -30,6 +30,7 @@ public enum QuestionType {
     static {
         Arrays.stream(QuestionType.values()).forEach(t -> {
             valMap.put(t.val.toString(), t);
+            valMap.put(t.title, t);
             valMap.put(t.name(), t);
         });
     }

ie-system/src/main/java/com/ruoyi/learn/domain/PaperVO.java

@@ -40,6 +40,9 @@ public class PaperVO {
         @ApiModelProperty("选项数组")
         List<String> options;
 
+        @ApiModelProperty("学生回答")
+        List<String> answers;
+
         List<QuestionSeq> subQuestions;
     }
 }