From d910a3e7ad5bc3a5e5443f506d05bbb9e83a4c8e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 31 十月 2024 17:14:33 +0800
Subject: [PATCH] 生成试卷时如果题目列表为空，则不反悔这个题型的数据
---
src/main/resources/mapper/ExamPaperScoreMapper.xml | 137 ++++++++++++++++++++++++++++++---------------
1 files changed, 90 insertions(+), 47 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperScoreMapper.xml b/src/main/resources/mapper/ExamPaperScoreMapper.xml
index e899adc..a29bf61 100644
--- a/src/main/resources/mapper/ExamPaperScoreMapper.xml
+++ b/src/main/resources/mapper/ExamPaperScoreMapper.xml
@@ -2,44 +2,69 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.ExamPaperScoreMapper">
<resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaperScore">
- <id column="id" jdbcType="INTEGER" property="id"/>
- <result column="paper_id" jdbcType="INTEGER" property="examPaperId"/>
- <result column="paper_name" jdbcType="VARCHAR" property="paperName"/>
- <result column="paper_type" jdbcType="INTEGER" property="paperType"/>
- <result column="user_score" jdbcType="INTEGER" property="userScore"/>
- <result column="paper_score" jdbcType="INTEGER" property="paperScore"/>
- <result column="question_correct" jdbcType="INTEGER" property="questionCorrect"/>
- <result column="question_count" jdbcType="INTEGER" property="questionCount"/>
- <result column="do_time" jdbcType="INTEGER" property="doTime"/>
- <result column="status" jdbcType="INTEGER" property="status"/>
- <result column="create_user" jdbcType="INTEGER" property="createUser"/>
- <result column="judge_user" jdbcType="INTEGER" property="judgeUser"/>
- <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
- <result column="answer_time" jdbcType="TIMESTAMP" property="answerTime"/>
- <result column="exam_id" jdbcType="INTEGER" property="examId"/>
- <result column="exam_name" jdbcType="INTEGER" property="examName"/>
- <result column="paper_content" jdbcType="INTEGER" property="paperContent"/>
+ <id column="id" property="id"/>
+ <result column="paper_id" property="examPaperId"/>
+ <result column="paper_name" property="paperName"/>
+ <result column="paper_type" property="paperType"/>
+ <result column="score" property="score"/>
+ <result column="total_score" property="totalScore"/>
+ <result column="question_correct" property="questionCorrect"/>
+ <result column="question_count" property="questionCount"/>
+ <result column="do_time" property="doTime"/>
+ <result column="status" property="status"/>
+ <result column="user_id" property="userId"/>
+ <result column="judge_user" property="judgeUser"/>
+ <result column="submit_time" property="submitTime"/>
+ <result column="judge_time" property="judgeTime"/>
+ <result column="exam_id" property="examId"/>
+ <result column="exam_name" property="examName"/>
+ <result column="paper_content" property="paperContent"/>
+ <result column="navbar" property="navbar"/>
</resultMap>
<sql id="Base_Column_List">
- id, paper_id, paper_name, paper_type, user_score,paper_score,
- question_correct, question_count, do_time, status, create_user, create_time,
- judge_user,answer_time,paper_content,create_time
+ id,
+ exam_id,
+ exam_name,
+ paper_id,
+ paper_type,
+ score,
+ total_score,
+ question_correct,
+ question_count,
+ do_time,
+ status,
+ user_id,
+ judge_user,
+ submit_time,
+ paper_content,
+ navbar,
+ judge_time,
+ deleted
</sql>
- <select id="studentPage" resultMap="BaseResultMap"
- parameterType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageVO">
+ <select id="studentPage" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
SELECT
- <include refid="Base_Column_List"/>
- FROM t_exam_paper_answer
+ a.*,
+ ep.name AS paperName
+ FROM t_exam_paper_score a
+ INNER JOIN t_exam_paper ep ON ep.id = paper_id AND ep.deleted = 0
<where>
- and create_user = #{createUser}
- <if test="subjectId != null">
- and subject_id = #{subjectId}
+ AND user_id = #{createUser}
+ <if test="examName != null and examName != ''">
+ AND INSTR(exam_name, #{examName})
</if>
</where>
</select>
-
+ <select id="getByExamIdUserId" resultType="com.ycl.jxkg.domain.entity.ExamPaperScore">
+ SELECT
+ <include refid="Base_Column_List"/>
+ from t_exam_paper_score
+ <where>
+ and user_id = #{userId}
+ and exam_id = #{examId}
+ </where>
+ </select>
<select id="selectAllCount" resultType="java.lang.Integer">
SELECT count(*)
from t_exam_paper_score
@@ -51,13 +76,13 @@
</select>
<select id="selectCountByDate" resultType="com.ycl.jxkg.domain.other.KeyValue">
- SELECT create_time as name, COUNT(create_time) as value
+ SELECT submit_time as name, sum(question_count) as value
from
(
- SELECT DATE_FORMAT(create_time, '%Y-%m-%d') as create_time from t_exam_paper_score
- WHERE create_time between #{startTime} and #{endTime}
+ SELECT question_count ,DATE_FORMAT(submit_time, '%Y-%m-%d') as submit_time from t_exam_paper_score
+ WHERE submit_time between #{startTime} and #{endTime}
) a
- GROUP BY create_time
+ GROUP BY submit_time
</select>
@@ -65,32 +90,38 @@
select
<include refid="Base_Column_List"/>
from t_exam_paper_score
- where paper_id = #{pid} and create_user=#{uid}
+ where paper_id = #{pid} and user_id=#{uid}
limit 1
</select>
<select id="adminPage" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
SELECT
- a.id , exam_paper_id, paper_name, paper_type, system_score, user_score, paper_score,
- question_correct, question_count, do_time, a.status, create_user, a.create_time, b.real_name AS userName
- FROM t_exam_paper_answer a
- LEFT JOIN t_user b ON a.create_user = b.id
+ a.id, a.exam_name, a.score, a.total_score, a.question_correct, a.question_count, a.do_time, a.status, IF(a.status = 0, a.submit_time, '缂鸿��') AS submitTime, b.real_name AS userName, c.name AS paperName
+ FROM t_exam_paper_score a
+ INNER JOIN t_user b ON a.user_id = b.id AND b.deleted = 0
+ INNER JOIN t_exam_paper c ON a.paper_id = c.id AND c.deleted = 0
<where>
- <if test="examPaperId != null">
- AND paper_id = #{examPaperId}
+ <if test="examId != null and examId != ''">
+ AND a.exam_id = #{examId}
+ </if>
+ <if test="userId != null and userId != ''">
+ AND a.user_id = #{userId}
</if>
<if test="userName != null and userName != ''">
AND INSTR(b.real_name, #{userName})
+ </if>
+ <if test="examName != null and examName != ''">
+ AND INSTR(a.exam_name, #{examName})
</if>
</where>
</select>
<select id="pageExamPaper" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
SELECT
- a.id,
+ t.id,
a.name AS paperName,
- a.score AS systemScore,
+ a.score AS totalScore,
a.num as questionCount,
a.subject_id,
a.paper_type,
@@ -98,15 +129,14 @@
b.name AS subjectName,
c.real_name AS userName,
IFNULL(COUNT(DISTINCT d.id), 0) AS personAnswerNum,
- IFNULL(COUNT(DISTINCT f.id), 0) AS personTotalNum,
+ IFNULL(COUNT(DISTINCT e.id), 0) AS personTotalNum,
t.exam_name
FROM t_exam_paper a
INNER JOIN t_exam t ON a.id = t.exam_paper_id AND t.deleted = 0
- LEFT JOIN t_subject b ON a.subject_id = b.id
- LEFT JOIN t_user c ON t.teacher_id = c.id
- LEFT JOIN t_exam_paper_answer d ON a.id = d.exam_paper_id
- LEFT JOIN t_exam_paper_classes e ON a.id = e.exam_paper_id
- LEFT JOIN t_classes_user f ON e.classes_id = f.classes_id
+ LEFT JOIN t_subject b ON a.subject_id = b.id AND b.deleted = 0
+ LEFT JOIN t_user c ON t.teacher_id = c.id AND c.deleted = 0
+ LEFT JOIN t_exam_paper_score d ON t.id = d.exam_id AND d.deleted = 0
+ LEFT JOIN t_classes_user e ON t.classes_id = e.classes_id AND e.deleted = 0
<where>
a.deleted = 0
<if test="subjectId != null and subjectId.size() > 0">
@@ -124,4 +154,17 @@
ORDER BY t.id DESC
</select>
+ <select id="pageUser" resultType="com.ycl.jxkg.domain.vo.student.exampaper.UserAnswerPageResponseVO">
+ SELECT a.id, a.real_name AS userName, COUNT(b.id) AS examCount
+ FROM t_user a
+ LEFT JOIN t_exam_paper_score b ON a.id = b.user_id AND b.deleted = 0
+ <where>
+ a.deleted = 0 AND a.role = 1
+ <if test="name != null and name != ''">
+ AND INSTR(a.real_name, #{name})
+ </if>
+ </where>
+ GROUP BY a.id
+ </select>
+
</mapper>
--
Gitblit v1.8.0