From e80d90bf5e5f2b8e72f02454606f1f432cbab7fd Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 18:01:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index dd8488a..82d8832 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -1,7 +1,7 @@
<?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.ExamPaperAnswer">
+ <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaperAnswer">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="exam_paper_id" jdbcType="INTEGER" property="examPaperId"/>
<result column="paper_name" jdbcType="VARCHAR" property="paperName"/>
@@ -26,7 +26,7 @@
</sql>
<select id="studentPage" resultMap="BaseResultMap"
- parameterType="com.ycl.jxkg.vo.student.exampaper.ExamPaperAnswerPageVO">
+ parameterType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageVO">
SELECT
<include refid="Base_Column_List"/>
FROM t_exam_paper_answer
@@ -65,16 +65,51 @@
</select>
- <select id="adminPage" resultMap="BaseResultMap"
- parameterType="com.ycl.jxkg.vo.admin.paper.ExamPaperAnswerPageRequestVO">
+ <select id="adminPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.paper.ExamPaperAnswerPageRequestVO">
SELECT
<include refid="Base_Column_List"/>
FROM t_exam_paper_answer
<where>
- <if test="subjectId != null">
- and subject_id = #{subjectId}
+ <if test="subjectId != null and subjectId.size() > 0">
+ AND subject_id IN
+ <foreach collection="subjectId" item="item" open="(" separator="," close=")">#{item}</foreach>
+ </if>
+ <if test="examPaperId != null">
+ AND exam_paper_id = #{examPaperId}
</if>
</where>
</select>
+ <select id="pageExamPaper" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
+ SELECT
+ a.id,
+ a.name AS paperName,
+ a.score AS systemScore,
+ a.question_count,
+ a.subject_id,
+ a.paper_type,
+ b.name AS subjectName,
+ c.real_name AS userName,
+ IFNULL(COUNT(d.id), 0) AS personAnswerNum,
+ IFNULL(COUNT(f.id), 0) AS personTotalNum
+ FROM t_exam_paper a
+ LEFT JOIN t_subject b ON a.subject_id = b.id
+ LEFT JOIN t_user c ON a.create_user = 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
+ <where>
+ a.deleted = 0
+ <if test="subjectId != null and subjectId.size() > 0">
+ AND a.subject_id IN
+ <foreach collection="subjectId" item="item" open="(" separator="," close=")">#{item}</foreach>
+ </if>
+ <if test="name != null and name != ''">
+ AND INSTR(a.name, #{name})
+ </if>
+ </where>
+ GROUP BY a.id
+ ORDER BY a.id DESC
+ </select>
+
</mapper>
--
Gitblit v1.8.0