From 372ec8892f5ed3d11736e75abdd7f33ea34e0d2d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 03 Aug 2021 10:40:09 +0800
Subject: [PATCH] 个人考试信息查询接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 83 +++++++++++++++++++++++++++--------------
1 files changed, 54 insertions(+), 29 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 fa8d80f..d4988cd 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.system.mapper.UserMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="userResultMap" type="org.springblade.modules.system.entity.User">
+ <resultMap id="userResultMap" type="org.springblade.modules.system.vo.UserVO">
<result column="id" property="id"/>
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
@@ -40,17 +40,27 @@
<result column="jurisdiction" property="jurisdiction"/>
<result column="securitynumber" property="securitynumber"/>
<result column="dispatch" property="dispatch"/>
+ <result column="my_picture" property="myPicture"/>
+ <result column="deptname" property="deptname"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
- select bu.* from
- blade_user bu
+ select
+ bu.*,
+ sll.longitude,sll.latitude,
+ bd.dept_name
+ from
+ blade_user bu
left join
- blade_dept bd
+ blade_dept bd
on
- bu.dept_id = bd.id
+ bu.dept_id = bd.id
+ left join
+ sys_live_location sll
+ on
+ sll.worker_id = bu.id
where
- bu.is_deleted = 0
+ bu.is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
and bu.tenant_id = #{tenantId}
</if>
@@ -81,43 +91,54 @@
<if test="user.userType!=null and user.userType != ''">
and bu.user_type = #{user.userType}
</if>
- <if test="user.securitynumber!=null and user.securitynumber != ''">
+ <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>
+ 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>
<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>
<!--通过 身份证号查询用户信息-->
<select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
SELECT id, name, real_name RealName
- FROM
- blade_user
+ FROM blade_user
where cardid = #{param1}
</select>
<!--保安员列表-->
@@ -149,6 +170,9 @@
<if test="user.nativeplace!=null and user.nativeplace != ''">
and bu.nativeplace = #{user.nativeplace}
</if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and bu.dept_id = #{user.deptId}
+ </if>
<if test="user.sex!=null and user.sex != ''">
and bu.sex = #{user.sex}
</if>
@@ -157,14 +181,15 @@
</if>
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
- </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and bu.jurisdiction = #{user.jurisdiction}
- </if>
+ </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 (
+ and bu.id in (
SELECT
user_id
FROM
--
Gitblit v1.9.3