From 2e830efbe694a3d328251b41690dc685a6e080ea Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 27 五月 2024 09:51:30 +0800
Subject: [PATCH] feat：修改用户时返回密码
---
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 56c4f5d..857b230 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -452,6 +452,35 @@
</if>
</select>
+ <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 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>
+
<select id="pieChart" resultType="java.util.TreeMap">
SELECT
<!-- 鍙傚姞鑰冭瘯鐨勪汉鏁� -->
@@ -491,7 +520,7 @@
</foreach>
</insert>
- <select id="dataByTemplate" resultType="java.util.Map" parameterType="com.mindskip.xzs.domain.vo.ExamPaperDataVO">
+ <select id="dataByTemplate" resultType="com.mindskip.xzs.domain.vo.ExamPaperDataExportVO" parameterType="com.mindskip.xzs.domain.vo.ExamPaperDataVO">
SELECT
a.id,
a.name,
@@ -508,9 +537,26 @@
a.id, a.name
</select>
- <select id="totalByTemplate" resultType="java.util.Map" parameterType="com.mindskip.xzs.domain.vo.ExamPaperDataVO">
+ <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) + (SELECT count(*) FROM t_exam_templates)) as examTotal, -- 鎬昏�冭瘯娆℃暟
+ (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), 2), 0) as averageScore, -- 骞冲潎鎴愮哗
IFNULL(ROUND((COUNT(DISTINCT c.create_user) * 100.0 / COUNT(DISTINCT d.user_id)), 2), 0) AS referencePercentage -- 鍙傝�冪櫨鍒嗘瘮
@@ -519,12 +565,21 @@
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
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)
+ <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="java.util.Map" parameterType="com.mindskip.xzs.domain.vo.ExamPaperDataVO">
+ <select id="dataByPaper" resultType="com.mindskip.xzs.domain.vo.ExamPaperDataExportVO" parameterType="com.mindskip.xzs.domain.vo.ExamPaperDataVO">
SELECT
a.id,
a.name,
@@ -540,17 +595,65 @@
a.id, a.name
</select>
- <select id="totalByPaper" resultType="java.util.Map" parameterType="com.mindskip.xzs.domain.vo.ExamPaperDataVO">
+ <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_templates)) as examTotal, -- 鎬昏�冭瘯娆℃暟
+ (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), 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
+ <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>
+
+
</mapper>
--
Gitblit v1.8.0