From 247abfbc0b322a04f8dc5fcf01fe7989b25fd7e9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 04 Nov 2021 10:35:29 +0800
Subject: [PATCH] 保安员发证时间更新接口新增

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 4 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 76e8469..1fa857b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -53,6 +53,7 @@
     <!--带坐标-->
     <select id="selectUserPages" resultMap="userResultMap">
         select
+        distinct
         bu.*,
         sll.longitude,sll.latitude,
         bd.dept_name
@@ -78,6 +79,10 @@
         blade_role br
         on
         br.id = bu.role_id
+        left join
+        sys_training_registration str
+        on
+        bu.id = str.user_id
         where
         bu.is_deleted = 0
         and bd.parent_id!=1425365577303621633
@@ -100,6 +105,9 @@
         </if>
         <if test="user.status!=null and user.status != ''">
             and bu.status = #{user.status}
+        </if>
+        <if test="user.trainingUnitId!=null and user.trainingUnitId != ''">
+            and str.training_unit_id = #{user.trainingUnitId}
         </if>
         <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
             and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
@@ -207,9 +215,12 @@
 
     <!--通过 身份证号查询用户信息-->
     <select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
-        SELECT id, name, real_name RealName
+        SELECT id, name, real_name RealName,securitynumber
         FROM blade_user
-        where cardid = #{param1}
+        where 1=1
+        and is_deleted = 0
+        and status = 1
+        and cardid = #{param1}
     </select>
 
 
@@ -386,7 +397,11 @@
 
     <!--计算保安人员年龄-->
     <select id="getUserAgeById" resultType="org.springblade.modules.system.vo.UserVO">
-        select id,ifnull(TIMESTAMPDIFF(YEAR, birthday, CURDATE()),0) age from blade_user where id = #{userId}
+        select id,ifnull(TIMESTAMPDIFF(YEAR, birthday, CURDATE()),0) age,securitynumber,cardid
+        from
+        blade_user
+        where
+        id = #{userId}
     </select>
 
 
@@ -516,7 +531,10 @@
 
     <!--查询账号相同的数量-->
     <select id="selectCountAccount" resultType="java.lang.Integer">
-        select count(*) from blade_user where account = #{account}
+        select count(*) from blade_user where 1=1
+        and status = 1
+        and is_deleted = 0
+        and account = #{account}
     </select>
 
     <!--查询当前部门名称及父级部门名称-->
@@ -535,4 +553,36 @@
         and is_deleted = 0
         and status = 1
     </select>
+
+
+    <!--现场检查获取保安员-->
+    <select id="getSecurityInfo" resultType="java.util.HashMap">
+        select bu.*,si.jurisdiction from blade_user bu
+        left join
+        blade_dept bd
+        on
+        bd.id = bu.dept_id
+        left join
+        sys_information si
+        on
+        bd.id = si.departmentid
+        left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction
+        left join
+        blade_role br
+        on
+        br.id = bu.role_id
+        where
+        1=1
+        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+            and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
+        </if>
+        and bu.status = 1
+        and bu.is_deleted = 0
+        and br.role_alias = "保安"
+    </select>
+
+
 </mapper>

--
Gitblit v1.9.3