From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug：学员有状态不能修改问题
---
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 202 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 7b059bf..d69bef0 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -209,6 +209,9 @@
<if test="taskExamId != null">
task_exam_id = #{taskExamId,jdbcType=INTEGER},
</if>
+ <if test="invalid != null">
+ invalid = #{invalid},
+ </if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
@@ -354,7 +357,7 @@
(#{item.examPaperId},#{item.userId})
</foreach>
</if>
- and (invalid = 0 or invalid is null)
+ and (invalid = 0 or invalid is null or invalid = 2)
</select>
<select id="adminPageByGrade" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM">
select
@@ -407,7 +410,7 @@
</select>
<select id="getResult" resultMap="BaseResultMap" parameterType="list">
- select * from t_exam_paper_answer where (exam_paper_id) in
+ select * from t_exam_paper_answer where invalid = 0 and (exam_paper_id) in
<foreach collection="list" item="item" open="(" close=")" separator=",">
(#{item})
</foreach>
@@ -423,11 +426,11 @@
<select id="histogram" resultType="java.util.TreeMap">
<![CDATA[
SELECT
- COUNT(CASE WHEN a.user_score < 60 THEN 1 END) AS score0To59,
- COUNT(CASE WHEN a.user_score >= 60 AND a.user_score < 70 THEN 1 END) AS score60To69,
- COUNT(CASE WHEN a.user_score >= 70 AND a.user_score < 80 THEN 1 END) AS score70To79,
- COUNT(CASE WHEN a.user_score >= 80 AND a.user_score < 90 THEN 1 END) AS score80To89,
- COUNT(CASE WHEN a.user_score >= 90 AND a.user_score <= 100 THEN 1 END) AS score90To100,
+ COUNT(CASE WHEN a.user_score / 10 < 60 THEN 1 END) AS score0To59,
+ COUNT(CASE WHEN a.user_score / 10 >= 60 AND a.user_score / 10 < 70 THEN 1 END) AS score60To69,
+ COUNT(CASE WHEN a.user_score / 10 >= 70 AND a.user_score / 10 < 80 THEN 1 END) AS score70To79,
+ COUNT(CASE WHEN a.user_score / 10 >= 80 AND a.user_score / 10 < 90 THEN 1 END) AS score80To89,
+ COUNT(CASE WHEN a.user_score / 10 >= 90 AND a.user_score / 10 <= 100 THEN 1 END) AS score90To100,
COUNT(CASE WHEN TIMESTAMPDIFF(YEAR, c.birth_day, CURDATE()) BETWEEN 0 AND 19 THEN 1 END) AS age0To19,
COUNT(CASE WHEN TIMESTAMPDIFF(YEAR, c.birth_day, CURDATE()) BETWEEN 20 AND 29 THEN 1 END) AS age20To29,
COUNT(CASE WHEN TIMESTAMPDIFF(YEAR, c.birth_day, CURDATE()) BETWEEN 30 AND 39 THEN 1 END) AS age30To39,
@@ -449,6 +452,35 @@
(a.invalid IS NULL OR a.invalid = 0)
<if test="examPaperId != null and examPaperId != ''">
AND a.exam_paper_id = #{examPaperId}
+ </if>
+ </select>
+
+ <select id="histogramByTemplate" resultType="java.util.TreeMap">
+ SELECT
+ <![CDATA[
+ COUNT(CASE WHEN c.user_score / 10 < 60 THEN 1 END) AS score0To59,
+ COUNT(CASE WHEN c.user_score / 10 >= 60 AND c.user_score / 10 < 70 THEN 1 END) AS score60To69,
+ COUNT(CASE WHEN c.user_score / 10 >= 70 AND c.user_score / 10 < 80 THEN 1 END) AS score70To79,
+ COUNT(CASE WHEN c.user_score / 10 >= 80 AND c.user_score / 10 < 90 THEN 1 END) AS score80To89,
+ COUNT(CASE WHEN c.user_score / 10 >= 90 AND c.user_score / 10 <= 100 THEN 1 END) AS score90To100,
+ ]]>
+ COUNT(CASE WHEN TIMESTAMPDIFF(YEAR, d.birth_day, CURDATE()) BETWEEN 0 AND 19 THEN 1 END) AS age0To19,
+ COUNT(CASE WHEN TIMESTAMPDIFF(YEAR, d.birth_day, CURDATE()) BETWEEN 20 AND 29 THEN 1 END) AS age20To29,
+ COUNT(CASE WHEN TIMESTAMPDIFF(YEAR, d.birth_day, CURDATE()) BETWEEN 30 AND 39 THEN 1 END) AS age30To39,
+ COUNT(CASE WHEN TIMESTAMPDIFF(YEAR, d.birth_day, CURDATE()) BETWEEN 40 AND 49 THEN 1 END) AS age40To49,
+ COUNT(CASE WHEN TIMESTAMPDIFF(YEAR, d.birth_day, CURDATE()) >= 50 THEN 1 END) AS ageOver50
+ FROM
+ t_exam_templates a
+ LEFT JOIN (SELECT exam_templates_id, GROUP_CONCAT(exam_paper_id) AS exam_paper_id FROM t_exam_templates_user_count GROUP BY exam_templates_id) b ON a.id = b.exam_templates_id
+ LEFT JOIN t_exam_paper_answer c ON FIND_IN_SET(c.exam_paper_id, b.exam_paper_id) AND (c.invalid = 0 OR c.invalid IS NULL)
+ LEFT JOIN t_user d ON c.create_user = d.id AND d.deleted = 0
+ LEFT JOIN (SELECT * FROM t_user_department GROUP BY user_id) e ON d.id = e.user_id
+ WHERE a.id = #{examPaperId}
+ <if test="departmentId != null and departmentId.size() > 0">
+ AND e.department_id IN
+ <foreach collection="departmentId" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
</select>
@@ -475,20 +507,168 @@
GROUP BY user_id) d ON a.user_id = d.user_id
</select>
-<insert id="insertDefault">
- INSERT INTO t_exam_paper_answer(exam_paper_id, paper_name, paper_type, system_score, user_score, paper_score, question_correct, question_count, do_time, status,
- create_user, create_time, invalid)
- SELECT
- a.id, a.name, a.paper_type, 0, 0, a.score, 0, a.question_count, 0, 2, b.user_id, NOW(), 0
- FROM t_exam_paper a
- left join t_exam_paper_user b on a.id = b.exam_paper_id and b.deleted = 0
- left join t_exam_paper_answer c on a.id = c.exam_paper_id and c.create_user = b.user_id
- WHERE a.id = #{examPaperId}
- and c.id is null
- and b.user_id not in
- <foreach collection="userIds" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
-</insert>
+ <insert id="insertDefault">
+ INSERT INTO t_exam_paper_answer(exam_paper_id, paper_name, paper_type, system_score, user_score, paper_score, question_correct, question_count, do_time, status,
+ create_user, create_time, invalid)
+ SELECT
+ a.id, a.name, a.paper_type, 0, 0, a.score, 0, a.question_count, 0, 2, b.user_id, NOW(), 2
+ FROM t_exam_paper a
+ left join t_exam_paper_user b on a.id = b.exam_paper_id and b.deleted = 0
+ left join t_exam_paper_answer c on a.id = c.exam_paper_id and c.create_user = b.user_id
+ WHERE a.id = #{examPaperId}
+ and c.id is null
+ and b.user_id not in
+ <foreach collection="userIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </insert>
+
+ <select id="dataByTemplate" resultType="com.mindskip.xzs.domain.vo.ExamPaperDataExportVO" parameterType="com.mindskip.xzs.domain.vo.ExamPaperDataVO">
+ SELECT
+ a.id,
+ a.name,
+ COUNT(DISTINCT c.create_user) as factPeopleTotal, -- 鍙傝�冧汉鏁�
+ IFNULL(ROUND(AVG(c.user_score / 10), 2), 0) as averageScore, -- 骞冲潎鎴愮哗
+ IFNULL(ROUND((COUNT(DISTINCT c.create_user) * 100.0 / COUNT(DISTINCT d.user_id)), 2), 0) AS referencePercentage -- 鍙傝�冪櫨鍒嗘瘮
+ FROM
+ t_department a
+ LEFT JOIN t_user_department b ON a.id = b.department_id
+ INNER JOIN t_exam_templates_user d ON d.user_id = b.user_id AND d.templates_id = #{id}
+ LEFT JOIN t_exam_templates_user_count e ON d.templates_id = e.exam_templates_id AND e.user_id = b.user_id
+ LEFT JOIN t_exam_paper_answer c ON e.user_id = c.create_user AND e.exam_paper_id = c.exam_paper_id AND (c.invalid = 0 OR c.invalid IS NULL)
+ WHERE a.deleted = 0
+ GROUP BY
+ a.id, a.name
+ </select>
+
+ <select id="totalByTemplate" resultType="com.mindskip.xzs.domain.vo.ExamPaperDataExportVO" parameterType="com.mindskip.xzs.domain.vo.ExamPaperDataVO">
+ SELECT
+ (SELECT
+ (SELECT count(*) FROM t_exam_paper
+ <if test="deptIds != null and deptIds.size() > 0">
+ WHERE dept_id IN
+ <foreach collection="deptIds" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ )
+ +
+ (SELECT count(*) FROM t_exam_templates
+ <if test="deptIds != null and deptIds.size() > 0">
+ WHERE dept_id IN
+ <foreach collection="deptIds" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ )) as examTotal, -- 鎬昏�冭瘯娆℃暟
+ COUNT(DISTINCT c.create_user) as factPeopleTotal, -- 鍙傝�冧汉鏁�
+ IFNULL(ROUND(AVG(c.user_score / 10), 2), 0) as averageScore, -- 骞冲潎鎴愮哗
+ IFNULL(ROUND((COUNT(DISTINCT c.create_user) * 100.0 / COUNT(DISTINCT d.user_id)), 2), 0) AS referencePercentage -- 鍙傝�冪櫨鍒嗘瘮
+ FROM
+ t_exam_templates a
+ LEFT JOIN t_exam_templates_user d ON d.templates_id = a.id
+ LEFT JOIN t_exam_templates_user_count e ON d.templates_id = e.exam_templates_id AND d.user_id = e.user_id
+ LEFT JOIN t_exam_paper_answer c ON e.user_id = c.create_user AND e.exam_paper_id = c.exam_paper_id AND (c.invalid = 0 OR c.invalid IS NULL)
+ <if test="deptIds != null and deptIds.size() > 0">
+ LEFT JOIN t_user_department f ON d.user_id = f.user_id
+ </if>
+ WHERE a.id = #{id}
+ <if test="deptIds != null and deptIds.size() > 0">
+ AND f.department_id IN
+ <foreach collection="deptIds" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ GROUP BY
+ a.id
+ </select>
+
+ <select id="dataByPaper" resultType="com.mindskip.xzs.domain.vo.ExamPaperDataExportVO" parameterType="com.mindskip.xzs.domain.vo.ExamPaperDataVO">
+ SELECT
+ a.id,
+ a.name,
+ COUNT(DISTINCT c.create_user) as factPeopleTotal, -- 鍙傝�冧汉鏁�
+ IFNULL(ROUND(AVG(c.user_score / 10), 2), 0) as averageScore, -- 骞冲潎鎴愮哗
+ IFNULL(ROUND((COUNT(DISTINCT c.create_user) * 100.0 / COUNT(DISTINCT d.user_id)), 2), 0) AS referencePercentage -- 鍙傝�冪櫨鍒嗘瘮
+ FROM
+ t_department a
+ LEFT JOIN t_user_department b ON a.id = b.department_id
+ LEFT JOIN t_exam_paper_answer c ON b.user_id = c.create_user AND (c.invalid = 0 OR c.invalid IS NULL) AND c.exam_paper_id = #{id}
+ INNER JOIN t_exam_paper_user d ON b.user_id = d.user_id AND d.exam_paper_id = #{id}
+ WHERE a.deleted = 0
+ GROUP BY
+ a.id, a.name
+ </select>
+
+ <select id="totalByPaper" resultType="com.mindskip.xzs.domain.vo.ExamPaperDataExportVO" parameterType="com.mindskip.xzs.domain.vo.ExamPaperDataVO">
+ SELECT
+ (SELECT
+ (SELECT COUNT(*) FROM t_exam_paper
+ <if test="deptIds != null and deptIds.size() > 0">
+ WHERE dept_id IN
+ <foreach collection="deptIds" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ )
+ +
+ (SELECT count(*) FROM t_exam_templates
+ <if test="deptIds != null and deptIds.size() > 0">
+ WHERE dept_id IN
+ <foreach collection="deptIds" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ )) as examTotal, -- 鎬昏�冭瘯娆℃暟
+ COUNT(DISTINCT b.create_user) AS factPeopleTotal, -- 鍙傝�冩暟
+ IFNULL(ROUND(AVG(user_score / 10), 2), 0) as averageScore, -- 骞冲潎鍒�
+ IFNULL(ROUND((COUNT(DISTINCT b.create_user) * 100.0 / COUNT(DISTINCT c.user_id)), 2), 0) AS referencePercentage -- 鍙傝�冪櫨鍒嗘瘮
+ FROM t_exam_paper a
+ LEFT JOIN t_exam_paper_user c ON a.id = c.exam_paper_id
+ LEFT JOIN t_exam_paper_answer b ON a.id = b.exam_paper_id AND (b.invalid = 0 OR b.invalid IS NULL) AND c.user_id = b.create_user
+ <if test="deptIds != null and deptIds.size() > 0">
+ LEFT JOIN t_user_department d ON c.user_id = d.user_id
+ </if>
+ WHERE a.id = #{id}
+ <if test="deptIds != null and deptIds.size() > 0">
+ AND d.department_id IN
+ <foreach collection="deptIds" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ GROUP BY a.id
+ </select>
+
+ <select id="getExamTotal" resultType="java.lang.Integer">
+ SELECT
+ (SELECT count(*) FROM t_exam_paper
+ <if test="departmentId != null and departmentId.size() > 0">
+ WHERE dept_id IN
+ <foreach collection="departmentId" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ )
+ +
+ (SELECT count(*) FROM t_exam_templates
+ <if test="departmentId != null and departmentId.size() > 0">
+ WHERE dept_id IN
+ <foreach collection="departmentId" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ )
+ </select>
+
+ <select id="getTemplateOtherExamAnswer" resultType="com.mindskip.xzs.domain.ExamPaperAnswer">
+ SELECT id, user_score FROM t_exam_paper_answer WHERE exam_paper_id IN
+ (SELECT exam_paper_id FROM t_exam_templates_user_count WHERE user_id = #{examPaperAnswer.createUser} AND exam_templates_id = #{templateId})
+ ORDER BY user_score DESC LIMIT 1
+ </select>
+
+ <select id="getPaperOtherExamAnswer" resultType="com.mindskip.xzs.domain.ExamPaperAnswer">
+ SELECT id, user_score FROM t_exam_paper_answer WHERE exam_paper_id = #{examPaperId} AND create_user = #{createUser}
+ ORDER BY user_score DESC LIMIT 1
+ </select>
</mapper>
--
Gitblit v1.8.0