From 7f25606654ebe94b5d82cfd9f74275989c71538d Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 16 七月 2024 11:47:40 +0800
Subject: [PATCH] feat：默认选中当前部门
---
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 857b230..a5db441 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -354,7 +354,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
@@ -423,11 +423,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,
@@ -455,11 +455,11 @@
<select id="histogramByTemplate" resultType="java.util.TreeMap">
SELECT
<![CDATA[
- COUNT(CASE WHEN c.user_score < 60 THEN 1 END) AS score0To59,
- COUNT(CASE WHEN c.user_score >= 60 AND c.user_score < 70 THEN 1 END) AS score60To69,
- COUNT(CASE WHEN c.user_score >= 70 AND c.user_score < 80 THEN 1 END) AS score70To79,
- COUNT(CASE WHEN c.user_score >= 80 AND c.user_score < 90 THEN 1 END) AS score80To89,
- COUNT(CASE WHEN c.user_score >= 90 AND c.user_score <= 100 THEN 1 END) AS score90To100,
+ 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,
@@ -508,7 +508,7 @@
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
+ 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
@@ -525,14 +525,15 @@
a.id,
a.name,
COUNT(DISTINCT c.create_user) as factPeopleTotal, -- 鍙傝�冧汉鏁�
- IFNULL(ROUND(AVG(c.user_score), 2), 0) as averageScore, -- 骞冲潎鎴愮哗
+ 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_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
- LEFT JOIN t_exam_paper_answer c ON d.user_id = c.create_user AND e.exam_paper_id = c.exam_paper_id AND (c.invalid = 0 OR c.invalid IS NULL)
+ INNER JOIN t_exam_paper_answer c ON d.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>
@@ -558,7 +559,7 @@
</if>
)) as examTotal, -- 鎬昏�冭瘯娆℃暟
COUNT(DISTINCT c.create_user) as factPeopleTotal, -- 鍙傝�冧汉鏁�
- IFNULL(ROUND(AVG(c.user_score), 2), 0) as averageScore, -- 骞冲潎鎴愮哗
+ 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
@@ -584,13 +585,14 @@
a.id,
a.name,
COUNT(DISTINCT c.create_user) as factPeopleTotal, -- 鍙傝�冧汉鏁�
- IFNULL(ROUND(AVG(c.user_score), 2), 0) as averageScore, -- 骞冲潎鎴愮哗
+ 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_answer c ON b.user_id = c.create_user AND (c.invalid = 0 OR c.invalid IS NULL) AND c.exam_paper_id = #{id}
LEFT 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>
@@ -598,7 +600,7 @@
<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
+ (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=")">
@@ -615,12 +617,12 @@
</foreach>
</if>
)) as examTotal, -- 鎬昏�冭瘯娆℃暟
- count(DISTINCT b.create_user) AS factPeopleTotal, -- 鍙傝�冩暟
- IFNULL(ROUND(avg(user_score), 2), 0) as averageScore, -- 骞冲潎鍒�
+ 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_answer b ON a.id = b.exam_paper_id AND (b.invalid = 0 OR b.invalid IS NULL)
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>
@@ -655,5 +657,16 @@
)
</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 = #{createUser} AND exam_templates_id =
+ (SELECT exam_templates_id FROM t_exam_templates_user_count WHERE exam_paper_id = #{examPaperId} LIMIT 1))
+ HAVING MAX(user_score) ORDER BY create_time 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}
+ HAVING MAX(user_score) ORDER BY create_time DESC LIMIT 1
+ </select>
</mapper>
--
Gitblit v1.8.0