Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-07 0879a157fd7c85ec34f1dac51a2b113bf1f5f2f6

 src/main/resources/mapper/ExamPaperQuestionCustomerAnswerMapper.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.ExamPaperQuestionCustomerAnswerMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.ExamPaperQuestionCustomerAnswer">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="question_id" jdbcType="INTEGER" property="questionId"/>
        <result column="exam_paper_id" jdbcType="INTEGER" property="examPaperId"/>
@@ -10,7 +10,7 @@
        <result column="subject_id" jdbcType="INTEGER" property="subjectId"/>
        <result column="customer_score" jdbcType="INTEGER" property="customerScore"/>
        <result column="question_score" jdbcType="INTEGER" property="questionScore"/>
        <result column="question_text_content_id" jdbcType="INTEGER" property="questionTextContentId"/>
        <result column="question_content" jdbcType="VARCHAR" property="questionContent"/>
        <result column="answer" jdbcType="VARCHAR" property="answer"/>
        <result column="text_content_id" jdbcType="INTEGER" property="textContentId"/>
        <result column="do_right" jdbcType="BIT" property="doRight"/>
@@ -21,7 +21,7 @@
    <sql id="Base_Column_List">
        id
        , question_id, exam_paper_id, exam_paper_answer_id, question_type, subject_id,
    customer_score, question_score, question_text_content_id, answer, text_content_id,
    customer_score, question_score, question_content, answer, text_content_id,
    do_right, create_user, create_time, item_order
    </sql>

@@ -36,7 +36,7 @@


    <select id="studentPage" resultMap="BaseResultMap"
            parameterType="com.ycl.jxkg.vo.student.question.answer.QuestionPageStudentRequestVO">
            parameterType="com.ycl.jxkg.domain.vo.student.question.answer.QuestionPageStudentRequestVO">
        SELECT
        <include refid="Base_Column_List"/>
        FROM t_exam_paper_question_customer_answer
@@ -51,7 +51,7 @@
        subject_id, create_time, create_user,
        text_content_id, exam_paper_id, question_type,
        answer, customer_score, exam_paper_answer_id ,
        do_right,question_text_content_id,item_order)
        do_right,question_content,item_order)
        values
        <foreach collection="list" item="item" index="index"
                 separator=",">