From e0614cb9fa53719a3ccdaab4a0cbf6768af5baa2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 01 七月 2024 13:13:50 +0800
Subject: [PATCH] 考试定时任务、考试修改调整
---
src/main/resources/mapper/ExamPaperScoreMapper.xml | 77 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperScoreMapper.xml b/src/main/resources/mapper/ExamPaperScoreMapper.xml
index e96bfef..0c4926f 100644
--- a/src/main/resources/mapper/ExamPaperScoreMapper.xml
+++ b/src/main/resources/mapper/ExamPaperScoreMapper.xml
@@ -2,27 +2,30 @@
<!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="exam_paper_id" jdbcType="INTEGER" property="examPaperId"/>
- <result column="paper_name" jdbcType="VARCHAR" property="paperName"/>
- <result column="paper_type" jdbcType="INTEGER" property="paperType"/>
- <result column="subject_id" jdbcType="INTEGER" property="subjectId"/>
- <result column="system_score" jdbcType="INTEGER" property="systemScore"/>
- <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="create_time" jdbcType="TIMESTAMP" property="createTime"/>
- <result column="task_exam_id" jdbcType="INTEGER" property="taskExamId"/>
+ <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
- , exam_paper_id, paper_name, paper_type, subject_id, system_score, user_score,
- paper_score, question_correct, question_count, do_time, status, create_user, create_time,
- task_exam_id
+ , paper_id, paper_name, paper_type, score,total_score,
+ question_correct, question_count, do_time, status, user_id, exam_id,exam_name,
+ judge_user,submit_time,paper_content,judge_time,navbar
</sql>
<select id="studentPage" resultMap="BaseResultMap"
@@ -31,36 +34,46 @@
<include refid="Base_Column_List"/>
FROM t_exam_paper_answer
<where>
- and create_user = #{createUser}
- <if test="subjectId != null">
- and subject_id = #{subjectId}
- </if>
+ and user_id = #{createUser}
</where>
</select>
- <select id="selectAllCount" resultType="java.lang.Integer">
- SELECT count(*)
- from t_exam_paper_answer
+ <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
+ </select>
+ <select id="selectAllQuestionCount" resultType="java.lang.Integer">
+ SELECT sum(question_count)
+ from t_exam_paper_score
+ </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_answer
- 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>
<select id="getByPidUid" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
- from t_exam_paper_answer
- where exam_paper_id = #{pid} and create_user=#{uid}
+ from t_exam_paper_score
+ where paper_id = #{pid} and user_id=#{uid}
limit 1
</select>
@@ -73,7 +86,7 @@
LEFT JOIN t_user b ON a.create_user = b.id
<where>
<if test="examPaperId != null">
- AND exam_paper_id = #{examPaperId}
+ AND paper_id = #{examPaperId}
</if>
<if test="userName != null and userName != ''">
AND INSTR(b.real_name, #{userName})
--
Gitblit v1.8.0