试卷组卷方式读取优化；创建考试优化

web/src/main/java/com/ynfy/buss/exam/exam/controller/ExamController.java

@@ -7,6 +7,8 @@ import com.ynfy.buss.exam.exam.dto.ExamSubmitDTO;
 import com.ynfy.buss.exam.exam.dto.QuestionTypeCountDTO;
 import com.ynfy.buss.exam.exam.entity.Exam;
 import com.ynfy.buss.exam.exam.service.IExamService;
+import com.ynfy.buss.exam.paper.enmus.JoinType;
+import com.ynfy.buss.exam.paper.entity.Paper;
 import com.ynfy.buss.exam.paperrulegroup.service.IPaperRuleGroupService;
 import com.ynfy.buss.exam.question.enums.QuestionType;
 import com.ynfy.buss.exam.userexam.entity.UserExam;
@@ -146,9 +148,13 @@ public class ExamController extends JeecgController<Exam, IExamService> {
     @ApiOperation(value = "考试-通过id查询", notes = "考试-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<Exam> queryById(@RequestParam(name = "id", required = true) String id) {
-        Exam exam = examService.getById(id);
-        if (exam == null) {
-            return Result.error("未找到对应数据");
+        Exam exam = examService.detail(id);
+        if (Objects.isNull(exam)) {
+            return Result.error("考试不存在");
+        }
+        Paper paper = exam.getPaper();
+        if (!Objects.isNull(paper)) {
+            paper.setJoinType_dictText(JoinType.getByCode(paper.getJoinType()).getValue());
         }
         List<QuestionTypeCountDTO> dtoList = paperRuleGroupService.sumQuestionCount(exam.getPaperId());
         if (!CollectionUtils.isEmpty(dtoList)) {

web/src/main/java/com/ynfy/buss/exam/paper/enmus/JoinType.java

@@ -5,7 +5,8 @@ package com.ynfy.buss.exam.paper.enmus;
  */
 public enum JoinType {
     XT(1, "选题组卷"),
-    SJ(2, "随机组卷");
+    SJ(2, "随机组卷"),
+    CT(3, "抽题组卷");
 
     private Integer code;
 

web/src/main/java/com/ynfy/buss/exam/paper/entity/Paper.java

@@ -1,6 +1,7 @@
 package com.ynfy.buss.exam.paper.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -92,4 +93,10 @@ public class Paper implements Serializable {
     @Excel(name = "是否有主观题", width = 15)
     @ApiModelProperty(value = "是否有主观题")
     private Boolean hasSubjective;
+
+    /**
+     * 组卷方式文本
+     */
+    @TableField(exist = false)
+    private String joinType_dictText;
 }