From 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 11:05:44 +0800
Subject: [PATCH] 1.许可审批
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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 df14164..0d34e68 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -45,6 +45,8 @@
<result column="is_apply" property="isApply"/>
<result column="is_train" property="isTrain"/>
<result column="birthtime" property="birthtime"/>
+ <result column="healstats" property="healstats"/>
+ <result column="soil" property="soil"/>
</resultMap>
<!--带坐标-->
@@ -97,11 +99,17 @@
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat('%', #{user.realName},'%')
</if>
+ <if test="user.dispatch!=null and user.dispatch != ''">
+ and bu.dispatch = #{user.dispatch}
+ </if>
<if test="user.userType!=null and user.userType != ''">
and bu.user_type = #{user.userType}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
- and bu.securitynumber = #{user.securitynumber}
+ and bu.securitynumber like concat('%', #{user.securitynumber},'%')
+ </if>
+ <if test="user.cardid!=null and user.cardid != ''">
+ and bu.cardid like concat('%', #{user.cardid},'%')
</if>
<if test="user.examinationType!=null and user.examinationType != ''">
and bu.examination_type = #{user.examinationType}
@@ -312,7 +320,7 @@
<select id="selectInr" resultType="java.util.HashMap">
SELECT real_name as realName,id FROM blade_user
- WHERE role_id='1412226235153731586'
+ WHERE role_id='1412226235153731586' and status=1
<if test="deptid!=null and deptid!='' and dept!='1123598813738675201'">
and dept_id=#{deptid}
</if>
@@ -345,4 +353,30 @@
<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>
+
+
+ <!--根据保安员编码查询保安信息-->
+ <select id="getUserInfoBySecurityNumber" resultType="org.springblade.modules.system.vo.UserVO">
+ select
+ bu.id,
+ bu.avatar,
+ bu.securitynumber securityNumber,
+ ifnull(TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()),0) age,
+ bu.real_name realName,
+ bu.sex,
+ bd.dept_name deptName
+ from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ where securitynumber = #{securityNumber}
+ </select>
+
+
+ <select id="selectUser" resultType="java.util.HashMap">
+ select CAST(id AS CHAR) as groupmember,real_name as rname from blade_user
+ </select>
+
</mapper>
--
Gitblit v1.9.3