From f5379a7100a20f538092eb839b2f4c9f6d3a1b45 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 04 七月 2024 17:06:10 +0800
Subject: [PATCH] 上课记录Bug修复
---
src/main/resources/mapper/ExamPaperScoreMapper.xml | 74 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperScoreMapper.xml b/src/main/resources/mapper/ExamPaperScoreMapper.xml
index c4c70c7..0c24845 100644
--- a/src/main/resources/mapper/ExamPaperScoreMapper.xml
+++ b/src/main/resources/mapper/ExamPaperScoreMapper.xml
@@ -2,23 +2,24 @@
<!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_id" jdbcType="INTEGER" property="examId"/>
- <result column="exam_name" jdbcType="VARCHAR" property="examName"/>
- <result column="paper_type" jdbcType="INTEGER" property="paperType"/>
- <result column="score" jdbcType="INTEGER" property="score"/>
- <result column="total_score" jdbcType="INTEGER" property="totalScore"/>
- <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="user_id" jdbcType="INTEGER" property="userId"/>
- <result column="judge_user" jdbcType="INTEGER" property="judgeUser"/>
- <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
- <result column="submit_time" jdbcType="TIMESTAMP" property="submitTime"/>
- <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,
@@ -43,17 +44,27 @@
<select id="studentPage" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
SELECT
- <include refid="Base_Column_List"/>
- FROM t_exam_paper_score
+ 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 user_id = #{createUser}
+ AND user_id = #{createUser}
<if test="examName != null and examName != ''">
- and INSTR(exam_name, #{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
@@ -65,11 +76,13 @@
</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_score
- WHERE create_time between #{startTime} and #{endTime}) a
- GROUP BY create_time
+ SELECT submit_time as name, sum(question_count) as value
+ from
+ (
+ 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 submit_time
</select>
@@ -84,7 +97,7 @@
<select id="adminPage" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
SELECT
- a.*, b.real_name AS userName, c.name as paperName
+ a.id, a.exam_name, a.score, a.total_score, a.question_correct, a.question_count, a.do_time, a.status, a.submit_time, 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
@@ -108,15 +121,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 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
- 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_classes_user e ON t.classes_id = e.classes_id
<where>
a.deleted = 0
<if test="subjectId != null and subjectId.size() > 0">
--
Gitblit v1.8.0