From 1c89a9d39893c18aac63aa5763b4787b65de3624 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 30 五月 2024 11:28:37 +0800
Subject: [PATCH] fix：在线练习排序
---
src/main/resources/mapper/UserMapper.xml | 94 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 75 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 45aa42a..0d3b2e1 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -23,7 +23,7 @@
</resultMap>
<sql id="Base_Column_List">
id, user_uuid, user_name, password, real_name, age, sex, birth_day, user_level, phone,
- role, status, image_path, create_time, modify_time, last_active_time, deleted, wx_open_id, `condition`, condition_detail
+ role, status, image_path, create_time, modify_time, last_active_time, deleted, wx_open_id, `condition`
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
@@ -329,20 +329,27 @@
</select>
- <select id="userPage" resultMap="BaseResultMap"
- parameterType="com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM">
+ <select id="userPage" resultType="com.mindskip.xzs.viewmodel.admin.user.UserResponseVM" parameterType="com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM">
SELECT
- <include refid="Base_Column_List"/>
- FROM t_user
- <where>
- and deleted=0
+ a.*,
+ c.result as departmentExamineResult,
+ d.result as conditionExamineResult
+ FROM t_user a
+ LEFT JOIN t_user_department b ON a.id = b.user_id
+ LEFT JOIN t_department_examine c ON a.id = c.user_id AND c.deleted = 0 AND c.result = 0
+ LEFT JOIN t_user_condition_examine d ON a.id = d.user_id AND d.deleted = 0 AND d.result = 0
+ WHERE
+ a.deleted=0
+ <if test="departmentId != null and departmentId.size() > 0">
+ AND b.department_id IN <foreach collection="departmentId" item="item" open="(" separator="," close=")"> #{item} </foreach>
+ </if>
<if test="userName != null and userName != ''">
- and real_name like concat('%',#{userName},'%')
+ AND real_name LIKE concat('%',#{userName},'%')
</if>
- <if test="role != null ">
- and role= #{role}
+ <if test="role != null and role.size() > 0">
+ AND role IN <foreach collection="role" item="item" open="(" separator="," close=")"> #{item} </foreach>
</if>
- </where>
+ GROUP BY a.id
</select>
@@ -459,11 +466,10 @@
</update>
<update id="setStatus">
- UPDATE t_user
- SET `condition` = #{condition},
- `condition_detail` = #{conditionDetail}
- WHERE id = #{id}
- AND deleted = 0
+ UPDATE t_user
+ SET `condition` = #{condition}
+ WHERE id = #{id}
+ AND deleted = 0
</update>
<update id="clearDeptAdmin">
@@ -481,8 +487,8 @@
t_user tu INNER JOIN t_user_department tud ON tu.id = tud.user_id AND tu.deleted = 0
LEFT JOIN t_exam_paper_answer tepa ON tepa.create_user = tu.id
<where>
- <if test="query.deptId != null">
- AND tud.department_id = #{query.deptId}
+ <if test="query.deptId != null and query.deptId.size() > 0">
+ AND tud.department_id in <foreach collection="query.deptId" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach>
</if>
<if test="query.start != null and query.end != null">
AND tepa.create_time between #{query.start} and #{query.end}
@@ -497,7 +503,7 @@
<select id="getUserByExam" resultType="com.mindskip.xzs.domain.User">
<![CDATA[
SELECT
- d.*
+ DISTINCT d.*
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
@@ -508,4 +514,54 @@
]]>
</select>
+
+ <update id="updateUserDeptAdmin">
+ update t_user set role = -1 where id in
+ <foreach collection="adminIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </update>
+
+ <update id="cancelUserDeptAdmin">
+ update t_user set role = 1 where id in(
+ select user_id from t_user_department where department_id = #{id} and user_id not in
+ <foreach collection="adminIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ and user_id not in
+ (select user_id from t_user_department where dept_admin = 1 and user_id in
+ (select user_id from t_user_department where department_id = #{id} and user_id not in
+ <foreach collection="adminIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ )))
+ </update>
+
+ <select id="getDeptAdminIds" resultType="java.lang.Integer" parameterType="java.lang.Integer">
+ select department_id from t_user_department where dept_admin = 1 and user_id = #{id}
+ </select>
+
+ <select id="getDeptAdmins" resultType="com.mindskip.xzs.domain.Department" parameterType="java.lang.Integer">
+ <if test="id != null">
+ select a.id, a.name from t_department a inner join t_user_department b on a.id = b.department_id where a.deleted = 0 and b.dept_admin = 1 and b.user_id = #{id} order by a.id desc
+ </if>
+ <if test="id == null">
+ select a.id, a.name from t_department a where a.deleted = 0 order by a.id desc
+ </if>
+ </select>
+
+ <select id="getUserByExamByTemplateId" resultType="com.mindskip.xzs.domain.User" parameterType="com.mindskip.xzs.domain.ExamPaper">
+ select *
+ from t_user
+ where id in
+ (select user_id from t_exam_templates_user WHERE templates_id = #{id} and user_id not in
+ (SELECT create_user from t_exam_paper_answer where (user_score / paper_score) > 0.6 and (invalid = 0 or invalid is null) and exam_paper_id in
+ (select exam_paper_id from t_exam_templates_user_count WHERE exam_templates_id = #{id})))
+ and id = #{createUser}
+ </select>
+
+ <select id="getDeptIds" resultType="integer">
+ SELECT department_id FROM t_user_department WHERE user_id = #{userId} AND dept_admin != 1
+ </select>
+
</mapper>
--
Gitblit v1.8.0