From 55ec2fb38d9beaf5bbd969082db870d1204bda49 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 18 Aug 2021 14:59:51 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 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..08ba532 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,11 @@
<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"/>
</resultMap>
@@ -111,6 +110,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>
@@ -141,6 +143,40 @@
ORDER BY id
</select>
+ <select id="selectUserPages" resultMap="userResultMap">
+ select * from blade_user where is_deleted = 0
+ <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}
+ </if>
+ <if test="user.status!=null and user.status != ''">
+ and 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}
+ </if>
+ <if test="user.securitynumber!=null and user.securitynumber != ''">
+ and securitynumber = #{user.securitynumber}
+ </if>
+ ORDER BY id
+ </select>
+
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMaps">
@@ -156,12 +192,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.cardid!=null and user.cardid != ''">
and bu.cardid like concat(concat('%', #{user.cardid}),'%')
</if>
@@ -187,19 +217,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 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>
<if test="user.useName==null or user.useName==''">
order by bu.id
@@ -236,4 +253,10 @@
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