From fd7b9aabefdcfa4e2f8504c77d5a4e6f4f955585 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 14:50:28 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 140 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 121 insertions(+), 19 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 1bdcbf1..1e2d4ab 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -39,6 +39,56 @@
<result column="hold" property="hold"/>
<result column="jurisdiction" property="jurisdiction"/>
<result column="securitynumber" property="securitynumber"/>
+ <result column="fingerprint" property="fingerprint"/>
+ <result column="photo" property="photo"/>
+ <result column="dispatch" property="dispatch"/>
+ <result column="my_picture" property="myPicture"/>
+ <result column="soil" property="soil"/>
+ <result column="healstats" property="healstats"/>
+ </resultMap>
+
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="userResultMaps" type="org.springblade.modules.system.vo.UserVO">
+ <result column="id" property="id"/>
+ <result column="tenant_id" property="tenantId"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="status" property="status"/>
+ <result column="is_deleted" property="isDeleted"/>
+ <result column="code" property="code"/>
+ <result column="user_type" property="userType"/>
+ <result column="account" property="account"/>
+ <result column="password" property="password"/>
+ <result column="name" property="name"/>
+ <result column="real_name" property="realName"/>
+ <result column="email" property="email"/>
+ <result column="phone" property="phone"/>
+ <result column="birthday" property="birthday"/>
+ <result column="sex" property="sex"/>
+ <result column="role_id" property="roleId"/>
+ <result column="dept_id" property="deptId"/>
+ <result column="post_id" property="postId"/>
+ <result column="cardid" property="cardid"/>
+ <result column="nativeplace" property="nativeplace"/>
+ <result column="nation" property="nation"/>
+ <result column="education" property="education"/>
+ <result column="politicaloutlook" property="politicaloutlook"/>
+ <result column="height" property="height"/>
+ <result column="cell" property="cell"/>
+ <result column="emails" property="emails"/>
+ <result column="address" property="address"/>
+ <result column="registered" property="registered"/>
+ <result column="rtime" property="rtime"/>
+ <result column="hold" property="hold"/>
+ <result column="jurisdiction" property="jurisdiction"/>
+ <result column="securitynumber" property="securitynumber"/>
+ <result column="fingerprint" property="fingerprint"/>
+ <result column="photo" property="photo"/>
+ <result column="dispatch" property="dispatch"/>
+ <result column="my_picture" property="myPicture"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
@@ -52,11 +102,17 @@
<if test="user.realName!=null and user.realName != ''">
and real_name like concat(concat('%', #{user.realName}),'%')
</if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and dept_id like concat(concat('%', #{user.deptId}),'%')
+ </if>
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
</if>
<if test="user.nativeplace!=null and user.nativeplace != ''">
and nativeplace = #{user.nativeplace}
+ </if>
+ <if test="user.examinationType!=null and user.examinationType != ''">
+ and examination_type = #{user.examinationType}
</if>
<if test="user.sex!=null and user.sex != ''">
and sex = #{user.sex}
@@ -88,9 +144,52 @@
ORDER BY id
</select>
+ <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 bu.real_name like concat(concat('%', #{user.realName}),'%')
+ </if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and bu.dept_id like concat(concat('%', #{user.deptId}),'%')
+ </if>
+ <if test="user.userType!=null and user.userType != ''">
+ and bu.user_type = #{user.userType}
+ </if>
+ <if test="user.nativeplace!=null and user.nativeplace != ''">
+ and bu.nativeplace = #{user.nativeplace}
+ </if>
+ <if test="user.examinationType!=null and user.examinationType != ''">
+ and bu.examination_type = #{user.examinationType}
+ </if>
+ <if test="user.sex!=null and user.sex != ''">
+ and bu.sex = #{user.sex}
+ </if>
+ <if test="user.status!=null and user.status != ''">
+ and bu.status = #{user.status}
+ </if>
+ <if test="user.hold!=null and user.hold != ''">
+ and bu.hold = #{user.hold}
+ </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ and si.jurisdiction = #{user.jurisdiction}
+ </if>
+ <if test="user.securitynumber!=null and user.securitynumber != ''">
+ and bu.securitynumber = #{user.securitynumber}
+ </if>
+ ORDER BY bu.id
+ </select>
+
<!--保安员列表-->
- <select id="selectUserPageSecurity" resultMap="userResultMap">
+ <select id="selectUserPageSecurity" resultMap="userResultMaps">
select
bu.*
from
@@ -103,11 +202,8 @@
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 test="user.cardid!=null and user.cardid != ''">
+ and bu.cardid like concat(concat('%', #{user.cardid}),'%')
</if>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
@@ -132,20 +228,15 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
- <if test="deptIdList!=null and deptIdList.size>0">
- and 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 test="user.useName==null or user.useName==''">
+ order by bu.id
</if>
- ORDER BY bu.id
+ <if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
+ order by bu.examination_type ${user.sort}
+ </if>
+ <if test="user.useName!=null and user.useName!='' and user.useName=='examinationMx'">
+ order by bu.examination_mx ${user.sort}
+ </if>
</select>
@@ -167,4 +258,15 @@
update blade_user set hold=#{hold} where cardid=#{cardid}
</update>
+ <!--查询所有未注销用户-->
+ <select id="getAllUserList" resultType="org.springblade.modules.system.entity.User">
+ select id,cardid from blade_user where is_deleted = 0
+ </select>
+
+ <!--查询用户数据,未删除的,未审核的-->
+ <select id="getNotAuditAllUserList" resultType="org.springblade.modules.system.entity.User">
+ select id,cardid from blade_user where is_deleted = 0
+ and (examination_type!='0' or examination_type is null)
+ </select>
+
</mapper>
--
Gitblit v1.9.3