From f24c180ae9afa33ddef6ff1aa73baa35df73f2ca Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 Aug 2021 11:14:12 +0800
Subject: [PATCH] 用户新增发证时间字段
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 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 08ba532..11acdb5 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -44,6 +44,7 @@
<result column="dispatch" property="dispatch"/>
<result column="my_picture" property="myPicture"/>
<result column="soil" property="soil"/>
+ <result column="healstats" property="healstats"/>
</resultMap>
@@ -143,45 +144,54 @@
ORDER BY id
</select>
- <select id="selectUserPages" resultMap="userResultMap">
- select * from blade_user where is_deleted = 0
+ <select id="selectUserPages" resultMap="userResultMaps">
+ select
+ bu.*,
+ TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()) age
+ from
+ blade_user bu
+ left join
+ sys_information si
+ on
+ si.departmentid = bu.dept_id
+ where is_deleted = 0
<if test="user.realName!=null and user.realName != ''">
- and real_name like concat(concat('%', #{user.realName}),'%')
+ and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
<if test="user.deptId!=null and user.deptId != ''">
- and dept_id like concat(concat('%', #{user.deptId}),'%')
+ and bu.dept_id like concat(concat('%', #{user.deptId}),'%')
</if>
<if test="user.userType!=null and user.userType != ''">
- and user_type = #{user.userType}
+ and bu.user_type = #{user.userType}
</if>
<if test="user.nativeplace!=null and user.nativeplace != ''">
- and nativeplace = #{user.nativeplace}
+ and bu.nativeplace = #{user.nativeplace}
</if>
<if test="user.examinationType!=null and user.examinationType != ''">
- and examination_type = #{user.examinationType}
+ and bu.examination_type = #{user.examinationType}
</if>
<if test="user.sex!=null and user.sex != ''">
- and sex = #{user.sex}
+ and bu.sex = #{user.sex}
</if>
<if test="user.status!=null and user.status != ''">
- and status = #{user.status}
+ and bu.status = #{user.status}
</if>
<if test="user.hold!=null and user.hold != ''">
- and hold = #{user.hold}
- </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and jurisdiction = #{user.jurisdiction}
+ and bu.hold = #{user.hold}
+ </if> <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1123598813738675201'">
+ and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
- and securitynumber = #{user.securitynumber}
+ and bu.securitynumber = #{user.securitynumber}
</if>
- ORDER BY id
+ ORDER BY bu.id
</select>
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMaps">
select
- bu.*
+ bu.*,bd.dept_name as deptName
from
blade_user bu
left join
@@ -218,6 +228,9 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
+ <if test="user.deptName!=null and user.deptName!=''">
+ and bd.dept_name like concat(concat('%', #{user.deptName}),'%')
+ </if>
<if test="user.useName==null or user.useName==''">
order by bu.id
</if>
--
Gitblit v1.9.3