删除examTemplate

fuliqi

2024-06-13 f70b376cd2b9a1d7f29b81b30231d30dd55351ad

删除examTemplate

 pom.xml

@@ -42,6 +42,11 @@


    <dependencies>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
            <version>2.0.43</version>
        </dependency>

        <!-- swagger -->
        <dependency>

 src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java

@@ -5,29 +5,22 @@
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.ExamPaperQuestion;
import com.ycl.jxkg.domain.form.ExamPaperForm;
import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
import com.ycl.jxkg.domain.vo.admin.paper.ExamPaperQuestionVO;
import com.ycl.jxkg.enums.ExamPaperTypeEnum;
import com.ycl.jxkg.enums.VisibilityEnum;
import com.ycl.jxkg.group.Add;
import com.ycl.jxkg.group.Update;
import com.ycl.jxkg.mapper.ExamPaperMapper;
import com.ycl.jxkg.service.ExamPaperQuestionService;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.Date;
import java.util.List;


 src/main/java/com/ycl/jxkg/controller/admin/ExamTemplateController.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java

@@ -76,4 +76,10 @@
     * */
    @TableField("deduct_type_score")
    private BigDecimal deductTypeScore;

    /**
     * 多选评分分数
     * */
    @TableField("content")
    private String content;
}

 src/main/java/com/ycl/jxkg/domain/entity/ExamTemplate.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/exam/ExamPaperQuestionItemObject.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/exam/ExamPaperTempDTO.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/exam/ExamPaperTitleItemObject.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/exam/PaperQuestion.java

New file
@@ -0,0 +1,16 @@
package com.ycl.jxkg.domain.exam;

import lombok.Data;

import java.math.BigDecimal;

@Data
public class PaperQuestion {
    //关联题目id
    private Integer questionId;
    //排序
    private Integer order;
    //题目分数
    private BigDecimal score;

}

 src/main/java/com/ycl/jxkg/domain/exam/PaperQuestionDTO.java

New file
@@ -0,0 +1,20 @@
package com.ycl.jxkg.domain.exam;

import lombok.Data;

import java.util.List;

@Data
public class PaperQuestionDTO {
    //标题(单选题、判断题)
    private String title;
    //题目类别
    private Integer questionType;
    //随机试卷题目数量
    private Integer num;
    //随机试卷题目分数
    private Integer score;

    //固定试卷、随序试卷题目集合
    private List<PaperQuestion> paperQuestion;
}

 src/main/java/com/ycl/jxkg/domain/form/ExamPaperForm.java

@@ -1,16 +1,12 @@
package com.ycl.jxkg.domain.form;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.jxkg.domain.base.AbsEntity;
import com.ycl.jxkg.domain.base.AbsForm;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.ExamTemplate;
import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
import com.ycl.jxkg.domain.exam.PaperQuestionDTO;
import com.ycl.jxkg.group.Add;
import com.ycl.jxkg.group.Update;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;
@@ -81,9 +77,9 @@
    private BigDecimal deductTypeScore;

    /**
     * 题目模板
     * 题目配置
     * */
    private List<TemplateQuestionDTO> questionList;
    private List<PaperQuestionDTO> questionList;

    public static ExamPaper getEntityByForm(@NonNull ExamPaperForm form, ExamPaper entity) {
        if(entity == null) {

 src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/question/TemplateQuestionDTO.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/vo/ExamTemplateVO.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamResponseVO.java

@@ -1,11 +1,10 @@
package com.ycl.jxkg.domain.vo.admin.exam;


import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
import com.ycl.jxkg.domain.exam.PaperQuestionDTO;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@Data
@@ -35,5 +34,5 @@

    private String visibility;

    private List<TemplateQuestionDTO> questionList;
    private List<PaperQuestionDTO> questionList;
}

 src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamTemplateVO.java

File was deleted

 src/main/java/com/ycl/jxkg/mapper/ExamPaperMapper.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.exam.ExamPaperTempDTO;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter;
@@ -17,7 +16,7 @@
@Mapper
public interface ExamPaperMapper extends BaseMapper<ExamPaper> {

    List<ExamPaperTempDTO> page(ExamPaperPageRequestVO requestVM);
    List<ExamPaper> page(ExamPaperPageRequestVO requestVM);

    List<ExamPaper> taskExamPage(ExamPaperPageRequestVO requestVM);


 src/main/java/com/ycl/jxkg/mapper/ExamTemplateMapper.java

File was deleted

 src/main/java/com/ycl/jxkg/service/ExamPaperService.java

@@ -18,11 +18,11 @@

    PageInfo<ExamResponseVO> page(ExamPaperPageRequestVO requestVM);

    PageInfo<ExamPaper> taskExamPage(ExamPaperPageRequestVO requestVM);
//    PageInfo<ExamPaper> taskExamPage(ExamPaperPageRequestVO requestVM);

    PageInfo<ExamPaper> studentPage(ExamPaperPageVO requestVM);

    ExamPaper savePaperFromVM(ExamPaperEditRequestVO examPaperEditRequestVO, User user);
//    ExamPaper savePaperFromVM(ExamPaperEditRequestVO examPaperEditRequestVO, User user);

    ExamPaperEditRequestVO examPaperToVM(Integer id);


 src/main/java/com/ycl/jxkg/service/ExamTemplateService.java

File was deleted

 src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java

@@ -1,32 +1,24 @@
package com.ycl.jxkg.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.entity.ExamTemplate;
import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.exam.ExamPaperTempDTO;
import com.ycl.jxkg.domain.exam.PaperQuestion;
import com.ycl.jxkg.domain.exam.PaperQuestionDTO;
import com.ycl.jxkg.domain.form.ExamPaperForm;
import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
import com.ycl.jxkg.enums.ExamPaperTypeEnum;
import com.ycl.jxkg.domain.exam.ExamPaperQuestionItemObject;
import com.ycl.jxkg.domain.exam.ExamPaperTitleItemObject;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.enums.QuestionTypeEnum;
import com.ycl.jxkg.enums.VisibilityEnum;
import com.ycl.jxkg.enums.VisibilityEnum;
import com.ycl.jxkg.mapper.ExamPaperMapper;
import com.ycl.jxkg.mapper.ExamTemplateMapper;
import com.ycl.jxkg.mapper.QuestionMapper;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.service.QuestionService;
import com.ycl.jxkg.service.SubjectService;
import com.ycl.jxkg.service.TextContentService;
import com.ycl.jxkg.service.enums.ActionEnum;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.JsonUtil;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperTitleItemVO;
@@ -36,19 +28,15 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.utils.PageInfoHelper;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

@Service
@@ -60,7 +48,6 @@
    private final TextContentService textContentService;
    private final QuestionService questionService;
    private final SubjectService subjectService;
    private final ExamTemplateMapper examTemplateMapper;
    private final WebContext webContext;


@@ -68,118 +55,42 @@
    @Transactional(rollbackFor = Exception.class)
    public void addPaper(ExamPaperForm form) {
        ExamPaper examPaper = ExamPaperForm.getEntityByForm(form,null);
        examPaper.setContent(JSON.toJSONString(form.getQuestionList()));
        baseMapper.insert(examPaper);
        if(ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())){
            ExamTemplate examTemplate = getExamTemplate(form, examPaper);
            examTemplateMapper.insert(examTemplate);
            baseMapper.updateById(examPaper);
        }
        //TODO:随序试卷生成题目

    }

    private ExamTemplate getExamTemplate(ExamPaperForm form, ExamPaper examPaper) {
        //随机试卷存模板
        List<TemplateQuestionDTO> questionList = form.getQuestionList();
        BigDecimal score = BigDecimal.ZERO;
        Integer num=0;
        ExamTemplate examTemplate = new ExamTemplate();
        //设置题目信息
        for (TemplateQuestionDTO dto : questionList) {
            num += dto.getNum();
            score = score.add(dto.getScore().multiply(BigDecimal.valueOf(dto.getNum())));
            Integer questionType = dto.getQuestionType();
            //整理List为对象
            switch (QuestionTypeEnum.fromCode(questionType)){
                //单选
                case SingleChoice:
                    examTemplate.setSingleChoice(dto.getNum());
                    examTemplate.setSingleScore(dto.getScore());
                    break;
                //多选
                case MultipleChoice:
                    examTemplate.setMultipleChoice(dto.getNum());
                    examTemplate.setMultipleScore(dto.getScore());
                    break;
                //判断
                case TrueFalse:
                    examTemplate.setTrueFalse(dto.getNum());
                    examTemplate.setTrueFalseScore(dto.getScore());
                    break;
                //填空
                case GapFilling:
                    examTemplate.setGapFilling(dto.getNum());
                    examTemplate.setGapScore(dto.getScore());
                    break;
                //简答
                case ShortAnswer:
                    examTemplate.setShortAnswer(dto.getNum());
                    examTemplate.setShortAnswerScore(dto.getScore());
                    break;
                //计算
                case Calculation:
                    examTemplate.setCalculation(dto.getNum());
                    examTemplate.setCalculationScore(dto.getScore());
                    break;
            }
        }
        examTemplate.setExamPaperId(examPaper.getId());
        //回填
        examPaper.setQuestionCount(num);
        examPaper.setScore(score);
        return examTemplate;
//        if(ExamPaperTypeEnum.RandomOrder.getCode().equals(form.getPaperType())){
//            List<PaperQuestionDTO> questionList = form.getQuestionList();
//            List<PaperQuestion> list = questionMapper.selectQuestion();
//        }
    }

    @Override
    public void updateExamPaper(ExamPaperForm form) {
        ExamPaper entity = ExamPaperForm.getEntityByForm(form,null);
        //如果是随机试卷修改template表
        if(ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())){
            ExamTemplate examTemplate = getExamTemplate(form, entity);
            examTemplateMapper.removeById(form.getId());
            examTemplateMapper.insert(examTemplate);
        }
        baseMapper.updateById(entity);
    }

    @Override
    public PageInfo<ExamResponseVO> page(ExamPaperPageRequestVO requestVM) {
        PageInfo<ExamPaperTempDTO> page = PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
        PageInfo<ExamPaper> page = PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
                examPaperMapper.page(requestVM));
        PageInfo<ExamResponseVO> pageVO = PageInfoHelper.copyMap(page, e -> {
            ExamResponseVO vo = new ExamResponseVO();
            BeanUtils.copyProperties(e, vo);
            vo.setVisibility(VisibilityEnum.valueOf(vo.getVisibility()).getCode() + "");
            vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
            if(ExamPaperTypeEnum.Random.getCode().equals(e.getPaperType())) {
                //整理题目信息为集合
                ExamTemplate examTemplate = e.getExamTemplate();
                List<TemplateQuestionDTO> questionList = new ArrayList<>();
                addQuestionList(questionList, QuestionTypeEnum.SingleChoice.getCode(), examTemplate.getSingleScore(), examTemplate.getSingleChoice());
                addQuestionList(questionList, QuestionTypeEnum.MultipleChoice.getCode(), examTemplate.getMultipleScore(), examTemplate.getMultipleChoice());
                addQuestionList(questionList, QuestionTypeEnum.TrueFalse.getCode(), examTemplate.getTrueFalseScore(), examTemplate.getTrueFalse());
                addQuestionList(questionList, QuestionTypeEnum.GapFilling.getCode(), examTemplate.getGapScore(), examTemplate.getGapFilling());
                addQuestionList(questionList, QuestionTypeEnum.ShortAnswer.getCode(), examTemplate.getShortAnswerScore(), examTemplate.getShortAnswer());
                addQuestionList(questionList, QuestionTypeEnum.Calculation.getCode(), examTemplate.getCalculationScore(), examTemplate.getCalculation());
                vo.setQuestionList(questionList);
            }
            vo.setQuestionList(JSONArray.parseArray(e.getContent(),PaperQuestionDTO.class));
            return vo;
        });
        return pageVO;
    }

    private void addQuestionList(List<TemplateQuestionDTO> questionList, Integer code,BigDecimal score,Integer num) {
        TemplateQuestionDTO questionDTO = new TemplateQuestionDTO();
        questionDTO.setQuestionType(code);
        questionDTO.setScore(score);
        questionDTO.setNum(num);
        questionList.add(questionDTO);
    }
    @Override
    public PageInfo<ExamPaper> taskExamPage(ExamPaperPageRequestVO requestVM) {
        return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
                examPaperMapper.taskExamPage(requestVM));
    }

//    @Override
//    public PageInfo<ExamPaper> taskExamPage(ExamPaperPageRequestVO requestVM) {
//        return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
//                examPaperMapper.taskExamPage(requestVM));
//    }

    @Override
    public PageInfo<ExamPaper> studentPage(ExamPaperPageVO requestVM) {
@@ -188,37 +99,37 @@
    }


    @Override
    @Transactional
    public ExamPaper savePaperFromVM(ExamPaperEditRequestVO examPaperEditRequestVO, User user) {
        ActionEnum actionEnum = (examPaperEditRequestVO.getId() == null) ? ActionEnum.ADD : ActionEnum.UPDATE;
        Date now = new Date();
        List<ExamPaperTitleItemVO> titleItemsVM = examPaperEditRequestVO.getTitleItems();
        List<ExamPaperTitleItemObject> frameTextContentList = frameTextContentFromVM(titleItemsVM);
        String frameTextContentStr = JsonUtil.toJsonStr(frameTextContentList);

        ExamPaper examPaper = new ExamPaper();
        BeanUtils.copyProperties(examPaperEditRequestVO, examPaper);
        if (actionEnum == ActionEnum.ADD) {
            TextContent frameTextContent = new TextContent();
            frameTextContent.setContent(frameTextContentStr);
            frameTextContent.setCreateTime(now);
            textContentService.save(frameTextContent);
            examPaper.setCreateTime(now);
            examPaper.setCreateUser(user.getId());
            examPaperFromVM(examPaperEditRequestVO, examPaper, titleItemsVM);
            examPaperMapper.insert(examPaper);
        } else {
            examPaper = examPaperMapper.selectById(examPaperEditRequestVO.getId());
            //TODO:
//    @Override
//    @Transactional
//    public ExamPaper savePaperFromVM(ExamPaperEditRequestVO examPaperEditRequestVO, User user) {
//        ActionEnum actionEnum = (examPaperEditRequestVO.getId() == null) ? ActionEnum.ADD : ActionEnum.UPDATE;
//        Date now = new Date();
//        List<ExamPaperTitleItemVO> titleItemsVM = examPaperEditRequestVO.getTitleItems();
//        List<ExamPaperTitleItemObject> frameTextContentList = frameTextContentFromVM(titleItemsVM);
//        String frameTextContentStr = JsonUtil.toJsonStr(frameTextContentList);
//
//        ExamPaper examPaper = new ExamPaper();
//        BeanUtils.copyProperties(examPaperEditRequestVO, examPaper);
//        if (actionEnum == ActionEnum.ADD) {
//            TextContent frameTextContent = new TextContent();
//            frameTextContent.setContent(frameTextContentStr);
//            frameTextContent.setCreateTime(now);
//            textContentService.save(frameTextContent);
//            examPaper.setCreateTime(now);
//            examPaper.setCreateUser(user.getId());
//            examPaperFromVM(examPaperEditRequestVO, examPaper, titleItemsVM);
//            examPaperMapper.insert(examPaper);
//        } else {
//            examPaper = examPaperMapper.selectById(examPaperEditRequestVO.getId());
//          //TODO:
//            TextContent frameTextContent = textContentService.getById(examPaper.getFrameTextContentId());
//            frameTextContent.setContent(frameTextContentStr);
//            textContentService.updateById(frameTextContent);
            examPaperFromVM(examPaperEditRequestVO, examPaper, titleItemsVM);
            examPaperMapper.updateById(examPaper);
        }
        return examPaper;
    }
//            examPaperFromVM(examPaperEditRequestVO, examPaper, titleItemsVM);
//            examPaperMapper.updateById(examPaper);
//        }
//        return examPaper;
//    }

    @Override
    public ExamPaperEditRequestVO examPaperToVM(Integer id) {
@@ -298,23 +209,23 @@
//        }
    }

    private List<ExamPaperTitleItemObject> frameTextContentFromVM(List<ExamPaperTitleItemVO> titleItems) {
        AtomicInteger index = new AtomicInteger(1);
        return titleItems.stream().map(t -> {
            ExamPaperTitleItemObject titleItem = new ExamPaperTitleItemObject();
            BeanUtils.copyProperties(t, titleItem);
            List<ExamPaperQuestionItemObject> questionItems = t.getQuestionItems().stream()
                    .map(q -> {
                        ExamPaperQuestionItemObject examPaperQuestionItemObject = new ExamPaperQuestionItemObject();
                        BeanUtils.copyProperties(q, examPaperQuestionItemObject);
                        examPaperQuestionItemObject.setItemOrder(index.getAndIncrement());
                        return examPaperQuestionItemObject;
                    })
                    .collect(Collectors.toList());
            titleItem.setQuestionItems(questionItems);
            return titleItem;
        }).collect(Collectors.toList());
    }
//    private List<ExamPaperTitleItemObject> frameTextContentFromVM(List<ExamPaperTitleItemVO> titleItems) {
//        AtomicInteger index = new AtomicInteger(1);
//        return titleItems.stream().map(t -> {
//            ExamPaperTitleItemObject titleItem = new ExamPaperTitleItemObject();
//            BeanUtils.copyProperties(t, titleItem);
//            List<ExamPaperQuestionItemObject> questionItems = t.getQuestionItems().stream()
//                    .map(q -> {
//                        ExamPaperQuestionItemObject examPaperQuestionItemObject = new ExamPaperQuestionItemObject();
//                        BeanUtils.copyProperties(q, examPaperQuestionItemObject);
//                        examPaperQuestionItemObject.setItemOrder(index.getAndIncrement());
//                        return examPaperQuestionItemObject;
//                    })
//                    .collect(Collectors.toList());
//            titleItem.setQuestionItems(questionItems);
//            return titleItem;
//        }).collect(Collectors.toList());
//    }

    @Override
    public List<ExamPaper> myExamPaper(Integer paperType) {

 src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java

File was deleted

 src/main/resources/mapper/ExamPaperMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.ExamPaperMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.exam.ExamPaperTempDTO">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaper">
        <id column="id"  property="id"/>
        <result column="name"  property="name"/>
        <result column="subject_id"  property="subjectId"/>
@@ -12,23 +12,11 @@
        <result column="visibility"  property="visibility"/>
        <result column="deduct_type" property="deductType"/>
        <result column="deduct_type_score"  property="deductTypeScore"/>
        <result column="content"  property="content"/>
        <result column="create_user"  property="createUser"/>
        <result column="create_time"  property="createTime"/>
        <result column="deleted"  property="deleted"/>
        <association property="examTemplate" javaType="com.ycl.jxkg.domain.entity.ExamTemplate">
            <result column="single_choice" property="singleChoice" />
            <result column="single_score" property="singleScore" />
            <result column="multiple_choice" property="multipleChoice" />
            <result column="multiple_score" property="multipleScore" />
            <result column="gap_filling" property="gapFilling" />
            <result column="gap_score" property="gapScore" />
            <result column="true_false" property="trueFalse" />
            <result column="true_false_score" property="trueFalseScore" />
            <result column="short_answer" property="shortAnswer" />
            <result column="short_answer_score" property="shortAnswerScore" />
            <result column="calculation" property="calculation" />
            <result column="calculation_score" property="calculationScore" />
        </association>

    </resultMap>

    <sql id="Base_Column_List">
@@ -43,22 +31,10 @@
    </resultMap>


    <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO">
    <select id="page" resultMap="BaseResultMap">
        SELECT
        tep.*,
        tet.single_choice,
        tet.multiple_choice,
        tet.gap_filling,
        tet.true_false,
        tet.short_answer,
        tet.calculation,
        tet.single_score,
        tet.multiple_score,
        tet.gap_score,
        tet.true_false_score,
        tet.short_answer_score,
        tet.calculation_score
        FROM t_exam_paper tep left join t_exam_template tet on tep.id =tet.exam_paper_id
        FROM t_exam_paper tep
        <where>
            and tep.deleted=0
            <if test="id != null ">

 src/main/resources/mapper/ExamTemplateMapper.xml

File was deleted

 src/main/resources/mapper/QuestionMapper.xml

@@ -75,4 +75,14 @@
        GROUP BY create_time
    </select>

    <select id="getQuestionRandom">
        SELECT
            *
        FROM
            t_question
        WHERE
            id >= ( SELECT floor( RAND() * ( SELECT MAX( id ) FROM t_question ) ) )
            LIMIT #{num};
    </select>

</mapper>