From ddebcfaf85cbb400668f38b1efd82e439c6e1012 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:39:43 +0800
Subject: [PATCH] 报名考试接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 109 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 1ec2f77..76d3e17 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -40,7 +40,11 @@
<result column="jurisdiction" property="jurisdiction"/>
<result column="securitynumber" property="securitynumber"/>
<result column="dispatch" property="dispatch"/>
- <result column="deptname" property="deptname"/>
+ <result column="my_picture" property="myPicture"/>
+ <result column="is_apply" property="isApply"/>
+ <result column="is_apply" property="isApply"/>
+ <result column="is_train" property="isTrain"/>
+ <result column="birthtime" property="birthtime"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
@@ -81,7 +85,7 @@
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
</if>
- <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1123598813738675201'">
and bu.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.realName!=null and user.realName != ''">
@@ -203,4 +207,107 @@
ORDER BY bu.id
</select>
+ <select id="selectUserPageSecurityApply" resultMap="userResultMap">
+ select
+ bu.*,
+ bd.dept_name
+ from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ where
+ bu.is_deleted = 0
+ and
+ bd.dept_category = 1
+ and
+ (hold = 2 or hold = 3)
+ <if test="tenantId!=null and tenantId != ''">
+ and bu.tenant_id = #{tenantId}
+ </if>
+ <if test="user.account!=null and user.account != ''">
+ and bu.account = #{user.account}
+ </if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and bu.dept_id = #{user.deptId}
+ </if>
+ <if test="user.isApply!=null">
+ and sa.is_apply = #{user.isApply}
+ </if>
+ <if test="user.roleId!=null and user.roleId != ''">
+ and bu.role_id = #{user.roleId}
+ </if>
+ <if test="user.status!=null and user.status != ''">
+ and bu.status = #{user.status}
+ </if>
+ <if test="user.realName!=null and user.realName != ''">
+ and bu.real_name like concat('%', #{user.realName},'%')
+ </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}
+ </if>
+ <if test="deptIdList!=null and deptIdList.size>0">
+ and bu.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>
+ ORDER BY bu.id
+ </select>
+
+
+ <!--保安员列表树 安员列表树，帅选无保安证,下拉tree-->
+ <select id="getSecurityApplyTree" resultType="org.springblade.modules.system.node.TreeNode">
+ (select #{user.deptId} as id,
+ '全部' as name,
+ 0 as parentId
+ from blade_user)
+
+ union all
+
+ (select
+ bu.id,
+ bu.real_name as name,
+ #{user.deptId} parentId
+ from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ where
+ bu.is_deleted = 0
+ and
+ bd.dept_category = 1
+ and
+ (hold = 2 or hold = 3)
+ and bd.id = #{user.deptId}
+ )
+ </select>
+
+
+ <select id="selectInr" resultType="java.util.HashMap">
+ SELECT real_name as realName,id FROM blade_user
+ WHERE role_id='1412226235153731586'
+ <if test="deptid!=null and deptid!='' and dept!='1123598813738675201'">
+ and dept_id=#{deptid}
+ </if>
+ </select>
+
+ <!--查询当前年份已有的保安证编号-->
+ <select id="getSecurityPaperCount" resultType="java.lang.Integer">
+ select count(*) from blade_user
+ where securitynumber like concat('%', #{pre},'%')
+ </select>
</mapper>
--
Gitblit v1.9.3