From decf7856a39ff88488285cac45d3298f2844d614 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 14 五月 2024 18:12:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/resources/mapper/ExamPaperAnswerMapper.xml | 85 +++++++++++++++++++++++++++++++++++------- 1 files changed, 71 insertions(+), 14 deletions(-) diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml index 9f4e0bf..d312ee9 100644 --- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml +++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml @@ -395,20 +395,77 @@ where a.create_time </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 id="histogram" resultType="java.util.Map"> + <![CDATA[ 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> + COUNT(CASE WHEN a.user_score < 60 THEN 1 END) AS scoreLeq60, + COUNT(CASE WHEN a.user_score >= 60 AND a.user_score < 80 THEN 1 END) AS score60To79, + COUNT(CASE WHEN a.user_score >= 80 AND a.user_score <= 100 THEN 1 END) AS score80To100, + 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, + COUNT(CASE WHEN TIMESTAMPDIFF(YEAR, c.birth_day, CURDATE()) BETWEEN 40 AND 49 THEN 1 END) AS age40To49, + COUNT(CASE WHEN TIMESTAMPDIFF(YEAR, c.birth_day, CURDATE()) >= 50 THEN 1 END) AS ageOver50 + ]]> + FROM + t_exam_paper_answer a + INNER JOIN (SELECT * FROM t_user_department + <if test="departmentId != null and departmentId != ''"> + WHERE department_id = #{departmentId} + </if> + GROUP BY user_id) b ON a.create_user = b.user_id + LEFT JOIN t_user c ON a.create_user = c.id + WHERE + (a.invalid IS NULL OR a.invalid = 0) + <if test="examPaperId != null and examPaperId != ''"> + AND a.exam_paper_id = #{examPaperId} + </if> + </select> + + <select id="pieChart" resultType="java.util.Map"> + SELECT + <!-- 搴旇鍙傚姞鑰冭瘯鐨勪汉鏁� --> + COUNT(DISTINCT a.user_id) AS totalExpected, + <!-- 鍙傚姞鑰冭瘯鐨勪汉鏁� --> + COUNT(DISTINCT c.create_user) AS totalAttended, + <!-- 鍙傚姞鑰冭瘯鐨勭櫨鍒嗘瘮锛屽苟鍥涜垗浜斿叆淇濈暀涓や綅灏忔暟 --> + ROUND((COUNT(DISTINCT c.create_user) * 100.0 / NULLIF(COUNT(DISTINCT a.user_id), 0)), 2) AS percentageAttended, + <!-- 鍙傚姞鑰冭瘯鐨勫皬鏁� --> + COUNT(DISTINCT c.create_user) / NULLIF(COUNT(DISTINCT a.user_id), 0) as attended, + <!-- 缂鸿�冪殑浜烘暟 --> + COUNT(DISTINCT a.user_id) - COUNT(DISTINCT c.create_user) AS totalAbsent, + <!-- 缂鸿�冪殑鐧惧垎姣旓紝骞跺洓鑸嶄簲鍏ヤ繚鐣欎袱浣嶅皬鏁� --> + ROUND(((COUNT(DISTINCT a.user_id) - COUNT(DISTINCT c.create_user)) * 100.0 / COUNT(DISTINCT a.user_id)), 2) AS percentageAbsent, + <!-- 缂鸿�冪殑灏忔暟 --> + ((COUNT(DISTINCT a.user_id) - COUNT(DISTINCT c.create_user)) / COUNT(DISTINCT a.user_id)) as absent + FROM + t_exam_paper_user a + INNER JOIN t_exam_paper b ON a.exam_paper_id = b.id + <if test="examPaperId != null and examPaperId != ''"> + AND b.id = #{examPaperId} + </if> + LEFT JOIN t_exam_paper_answer c ON a.exam_paper_id = c.exam_paper_id AND a.user_id = c.create_user AND (c.invalid IS NULL OR c.invalid = 0) + INNER JOIN (SELECT * FROM t_user_department + <if test="departmentId != null and departmentId != ''"> + WHERE department_id = #{departmentId} + </if> + 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> </mapper> -- Gitblit v1.8.0