From 6043c55ce5a3c4f146e20286a707f67d09384674 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 28 六月 2024 16:00:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/ExamPaperScoreMapper.xml | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperScoreMapper.xml
similarity index 79%
rename from src/main/resources/mapper/ExamPaperAnswerMapper.xml
rename to src/main/resources/mapper/ExamPaperScoreMapper.xml
index aa22944..e899adc 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperScoreMapper.xml
@@ -1,13 +1,11 @@
<?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.ExamPaperAnswerMapper">
- <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaperAnswer">
+<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_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"/>
@@ -15,14 +13,17 @@
<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="task_exam_id" jdbcType="INTEGER" property="taskExamId"/>
+ <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"/>
</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
+ 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
</sql>
<select id="studentPage" resultMap="BaseResultMap"
@@ -41,15 +42,19 @@
<select id="selectAllCount" resultType="java.lang.Integer">
SELECT count(*)
- from t_exam_paper_answer
+ 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
from
(
- SELECT DATE_FORMAT(create_time, '%Y-%m-%d') as create_time from t_exam_paper_answer
+ SELECT DATE_FORMAT(create_time, '%Y-%m-%d') as create_time from t_exam_paper_score
WHERE create_time between #{startTime} and #{endTime}
) a
GROUP BY create_time
@@ -59,8 +64,8 @@
<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 create_user=#{uid}
limit 1
</select>
@@ -73,7 +78,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