From 6beeb715fcef8db22b17c309ec8fecc45cc04b00 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 16:30:47 +0800
Subject: [PATCH] 1.考试成绩查询修改 2.用户查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 50 +++++++++++---------------------------------------
1 files changed, 11 insertions(+), 39 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index e5c50d2..e71440d 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -105,6 +105,9 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
+ <if test="user.examinationType!=null and user.examinationType != ''">
+ and bu.examination_type = #{user.examinationType}
+ </if>
<if test="deptIdList!=null and deptIdList.size>0">
and bu.id in (
SELECT
@@ -154,6 +157,9 @@
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and securitynumber = #{user.securitynumber}
+ </if>
+ <if test="user.examinationType!=null and user.examinationType != ''">
+ and examination_type = #{user.examinationType}
</if>
<if test="deptIdList!=null and deptIdList.size>0">
and id in (
@@ -218,12 +224,6 @@
bu.is_deleted = 0
and
bd.dept_category = 1
- <if test="user.tenantId!=null and user.tenantId != ''">
- and bu.tenant_id = #{user.tenantId}
- </if>
- <if test="user.account!=null and user.account != ''">
- and bu.account != #{user.account}
- </if>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
@@ -251,19 +251,6 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
- <if test="deptIdList!=null and deptIdList.size>0">
- and bu.id in (
- SELECT
- user_id
- FROM
- blade_user_dept
- WHERE
- dept_id IN
- <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
- )
- </if>
ORDER BY bu.id
</select>
@@ -283,12 +270,6 @@
bd.dept_category = 1
and
(hold = 2 or hold = 3)
- <if test="tenantId!=null and tenantId != ''">
- and bu.tenant_id = #{tenantId}
- </if>
- <if test="user.account!=null and user.account != ''">
- and bu.account = #{user.account}
- </if>
<if test="user.deptId!=null and user.deptId != ''">
and bu.dept_id = #{user.deptId}
</if>
@@ -309,19 +290,6 @@
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
- </if>
- <if test="deptIdList!=null and deptIdList.size>0">
- and bu.id in (
- SELECT
- user_id
- FROM
- blade_user_dept
- WHERE
- dept_id IN
- <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
- )
</if>
ORDER BY bu.id
</select>
@@ -383,9 +351,13 @@
sa.user_id = bu.id
where 1=1
and (hold=2 or hold = 3)
- and (sa.is_exam != 1 or sa.is_exam is null)
and (bu.is_apply != 1 or bu.is_apply is null)
and (sa.apply_status !=2 or sa.apply_status is null)
and bu.dept_id = #{deptId}
</select>
+
+ <!--计算保安人员年龄-->
+ <select id="getUserAgeById" resultType="org.springblade.modules.system.vo.UserVO">
+ select id,ifnull(TIMESTAMPDIFF(YEAR, birthday, CURDATE()),0) age from blade_user where id = #{userId}
+ </select>
</mapper>
--
Gitblit v1.9.3