Accept Merge Request #65: (hyc -> master)

Merge Request: 【新增】学生身份证字段,学生进入试卷返回信息确认

Created By: @华允传
Accepted By: @华允传
URL: https://g-iswv8783.coding.net/p/education/d/pengchen-exam-java/git/merge/65?initial=true
This commit is contained in:
华允传
2025-05-19 22:07:10 +08:00
committed by Coding
34 changed files with 888 additions and 197 deletions

View File

@@ -50,10 +50,10 @@
</trim>
</insert>
<insert id="insertEducationPaperQuList">
INSERT INTO education_paper_qu (paper_id ,qu_id )VALUES
INSERT INTO education_paper_qu (paper_id ,qu_id ,sort )VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.paperId}, #{item.quId}
#{item.paperId}, #{item.quId}, #{item.sort}
)
</foreach>
</insert>

View File

@@ -62,9 +62,9 @@
<select id="getPoints" resultMap="ExamSpecialtyResult">
SELECT sp_id, parent_id, ancestors, sp_name, order_num
FROM knowledge_points
FROM exam_knowledge_points
WHERE FIND_IN_SET(#{id}, ancestors)
and del_flag='0'
and deleted='0'
ORDER BY order_num;
</select>
@@ -78,7 +78,7 @@
</foreach>
</select>
<select id="getPointIdByName" resultType="java.lang.Long">
select sp_id from knowledge_points where sp_name =#{name} limit 1
select sp_id from exam_knowledge_points where sp_name =#{name} limit 1
</select>
<select id="getQuCount" resultType="java.lang.Integer">

View File

@@ -118,6 +118,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTenantId" resultType="java.lang.Long">
select tenant_id from system_users limit 1
</select>
<select id="selectByTypes" resultMap="ExamQuestionResult">
select * from exam_question where specialty_name =#{specialtyName}
and course_name=#{courseName}
and subject_name =#{subjectName}
and content =#{content}
limit 1;
</select>
<select id="selectSchoolnameBytId" resultType="java.lang.String">
select name from system_tenant where id =#{loginTenantId}
</select>
<insert id="insertExamQuestion" parameterType="ExamQuestion">

View File

@@ -35,6 +35,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectKnowledgePointsVo"/>
where sp_id = #{spId}
</select>
<select id="selectKnowledgePointsListPage"
resultType="pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtyQueryVo">
select sp_id as id, sp_name as name, parent_id,order_num ,status, create_time from exam_knowledge_points
<where>
<if test="knowledgePoints.spName != null and knowledgePoints.spName != ''"> and sp_name like concat('%', #{knowledgePoints.spName}, '%')</if>
<if test="knowledgePoints.status != null and knowledgePoints.status != ''"> and 'status' = #{knowledgePoints.status}</if>
and deleted = 0
</where>
</select>
<update id="deleteKnowledgePointsBySpId" parameterType="Long">
update exam_knowledge_points

View File

@@ -95,6 +95,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select roles
from exam_specialty where sp_id =#{id};
</select>
<select id="selectBySpecCourseSub" resultMap="ExamSpecialtyResult">
SELECT
q3.*
FROM exam_specialty q1
JOIN exam_specialty q2 ON q2.parent_id = q1.sp_id
JOIN exam_specialty q3 ON q3.parent_id = q2.sp_id
WHERE q1.sp_name = #{specialtyName}
AND q2.sp_name = #{courseName}
AND q3.sp_name = #{subjectName}
AND q1.deleted = '0'
AND q2.deleted = '0'
AND q3.deleted = '0';
</select>
<update id="deleteExamSpecialtyBySpId" parameterType="Long">
update exam_specialty