From 4ecf2dbe2c255c3b556ff4bfb49b4e2e8285bd17 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 31 Aug 2021 11:24:45 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 153 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 104 insertions(+), 49 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 3b1ae8c..4613cb7 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -39,12 +39,12 @@
<result column="hold" property="hold"/>
<result column="jurisdiction" property="jurisdiction"/>
<result column="securitynumber" property="securitynumber"/>
- <result column="examination_type" property="examinationType"/>
- <result column="examination_mx" property="examinationMx"/>
<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>
@@ -111,6 +111,9 @@
<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}
</if>
@@ -119,7 +122,8 @@
</if>
<if test="user.hold!=null and user.hold != ''">
and hold = #{user.hold}
- </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ </if>
+ <if test="user.jurisdiction!=null and user.jurisdiction != ''">
and jurisdiction = #{user.jurisdiction}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
@@ -127,41 +131,79 @@
</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>
+ 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 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
+ and status = 1
+ <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.hold!=null and user.hold != ''">
+ 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 bu.securitynumber = #{user.securitynumber}
+ </if>
+ ORDER BY bu.id
</select>
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMaps">
select
- bu.*
+ bu.*,bd.dept_name as deptName
from
- blade_user bu
+ blade_user bu
left join
- blade_dept bd
+ blade_dept bd
on
- bu.dept_id = bd.id
+ bu.dept_id = bd.id
where
- bu.is_deleted = 0
+ 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>
+ bd.dept_category = 1
+ and
+ bu.status = 1
<if test="user.cardid!=null and user.cardid != ''">
and bu.cardid like concat(concat('%', #{user.cardid}),'%')
</if>
@@ -182,58 +224,71 @@
</if>
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
- </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ </if>
+ <if test="user.jurisdiction!=null and user.jurisdiction != ''">
and bu.jurisdiction = #{user.jurisdiction}
</if>
<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.deptId!=null and user.deptId!=''">
+ and bu.dept_id =#{user.deptId}
</if>
<if test="user.useName==null or user.useName==''">
order by bu.id
</if>
<if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
- order by bu.examination_type ${user.sort}
+ 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}
+ order by bu.examination_mx ${user.sort}
</if>
</select>
-
<select id="getUser" resultMap="userResultMap">
- SELECT
- *
- FROM
- blade_user
- WHERE
- tenant_id = #{param1} and account = #{param2} and password = #{param3} and is_deleted = 0
+ SELECT *
+ FROM blade_user
+ WHERE tenant_id = #{param1}
+ and account = #{param2}
+ and password = #{param3}
+ and is_deleted = 0
</select>
<select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
- SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
+ SELECT id,
+ tenant_id,
+ user_type,
+ account,
+ name,
+ real_name,
+ email,
+ phone,
+ birthday,
+ role_id,
+ dept_id,
+ post_id
+ FROM blade_user ${ew.customSqlSegment}
</select>
<update id="updateUser">
- update blade_user set hold=#{hold} where cardid=#{cardid}
+ 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 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 examination_type is null
</select>
</mapper>
--
Gitblit v1.9.3