From 2a46259ac136e4318a6a0ddde632f9fd481c2441 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 22 七月 2024 09:50:02 +0800
Subject: [PATCH] fix：成绩统计修改为统计选择参考的部门，即使无人参考
---
src/main/resources/mapper/UserDepartmentMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/UserDepartmentMapper.xml b/src/main/resources/mapper/UserDepartmentMapper.xml
index a2f68c8..22a6e92 100644
--- a/src/main/resources/mapper/UserDepartmentMapper.xml
+++ b/src/main/resources/mapper/UserDepartmentMapper.xml
@@ -7,13 +7,13 @@
<result column="department_id" jdbcType="INTEGER" property="departmentId" />
</resultMap>
<sql id="Base_Column_List">
- id, user_id, department_id
+ id, user_id, department_id, dept_admin
</sql>
<insert id="insert" parameterType="com.mindskip.xzs.domain.UserDepartment" useGeneratedKeys="true" keyProperty="id">
- insert into t_user_department (id, user_id, department_id
+ insert into t_user_department (id, user_id, department_id, dept_admin
)
- values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}
+ values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{departmentId,jdbcType=INTEGER}, #{deptAdmin}
)
</insert>
@@ -30,6 +30,13 @@
<include refid="Base_Column_List" />
from t_user_department
where user_id = #{userId,jdbcType=INTEGER}
+ </select>
+
+ <select id="selectDeptByUserId" resultType="com.mindskip.xzs.domain.Department">
+ SELECT
+ d.id,d.name
+ FROM t_user_department ud INNER JOIN t_department d ON ud.department_id = d.id
+ WHERE ud.user_id = #{userId} AND d.deleted = 0
</select>
<select id="selectByDepartmentId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -74,4 +81,8 @@
</where>
</select>
+ <select id="selectDeptAdmin" resultType="java.lang.Integer">
+ SELECT user_id FROM t_user_department WHERE dept_admin = 1 AND department_id = #{depId}
+ </select>
+
</mapper>
--
Gitblit v1.8.0