From dae145fda8a0102c8cb396acce37d6219cf6be88 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 10:53:32 +0800
Subject: [PATCH] 统计接口修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   51 ++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 42 insertions(+), 9 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 4613cb7..f22d648 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -45,6 +45,7 @@
         <result column="my_picture" property="myPicture"/>
         <result column="soil" property="soil"/>
         <result column="healstats" property="healstats"/>
+        <result column="holdv" property="holdv"/>
     </resultMap>
 
 
@@ -92,15 +93,16 @@
     </resultMap>
 
     <select id="selectUserPage" resultMap="userResultMap">
-        select * from blade_user where is_deleted = 0
+        select * from blade_user
+        where is_deleted = 0
         <if test="user.tenantId!=null and user.tenantId != ''">
             and tenant_id = #{user.tenantId}
         </if>
         <if test="user.account!=null and user.account != ''">
-            and account != #{user.account}
+            and account like concat('%', #{user.account},'%')
         </if>
         <if test="user.realName!=null and user.realName != ''">
-            and real_name like concat(concat('%', #{user.realName}),'%')
+            and real_name like concat('%', #{user.realName},'%')
         </if>
         <if test="user.deptId!=null and user.deptId != ''">
             and dept_id like concat(concat('%', #{user.deptId}),'%')
@@ -148,7 +150,7 @@
     <select id="selectUserPages" resultMap="userResultMaps">
         select
         bu.*,
-        TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()) age
+        ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( cardid,7,4),0) age
         from
         blade_user bu
         left join
@@ -178,7 +180,7 @@
         <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'">
+        <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1372091709474910209'">
             and si.jurisdiction = #{user.jurisdiction}
         </if>
         <if test="user.securitynumber!=null and user.securitynumber != ''">
@@ -191,19 +193,28 @@
     <!--保安员列表-->
     <select id="selectUserPageSecurity" resultMap="userResultMaps">
         select
-        bu.*,bd.dept_name as deptName
+        bu.*,
+        ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
+        bd.dept_name as deptName
         from
         blade_user bu
         left join
         blade_dept bd
         on
         bu.dept_id = bd.id
+        left join
+        blade_role br
+        on
+        br.id = bu.role_id
         where
         bu.is_deleted = 0
         and
-        bd.dept_category = 1
+        br.role_alias = '安保人员'
         and
         bu.status = 1
+        and bd.parent_id!=1425365577303621633
+        and bd.id != 1425365577303621633
+        and bd.id != 1432625856013971457
         <if test="user.cardid!=null and user.cardid != ''">
             and bu.cardid like concat(concat('%', #{user.cardid}),'%')
         </if>
@@ -229,7 +240,7 @@
             and bu.jurisdiction = #{user.jurisdiction}
         </if>
         <if test="user.securitynumber!=null and user.securitynumber != ''">
-            and bu.securitynumber = #{user.securitynumber}
+            and bu.securitynumber like concat('%', #{user.securitynumber},'%')
         </if>
         <if test="user.deptId!=null and user.deptId!=''">
             and bu.dept_id =#{user.deptId}
@@ -273,7 +284,7 @@
 
     <update id="updateUser">
         update blade_user
-        set hold=#{hold}
+        set hold=#{hold},holdv=#{holdv},holdvtime=#{time}
         where cardid = #{cardid}
     </update>
 
@@ -291,4 +302,26 @@
         where examination_type is null
     </select>
 
+    <!--根据保安员编码查询保安信息-->
+    <select id="getUserInfoBySecurityNumber" resultType="org.springblade.modules.system.vo.UserVO">
+        select
+        bu.*,
+        ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( cardid,7,4),0) age,
+        bd.dept_name deptName
+         from
+         blade_user bu
+         left join
+         blade_dept bd
+         on
+         bu.dept_id = bd.id
+        where securitynumber = #{securityNumber}
+    </select>
+
+    <!--通过 身份证号查询用户信息-->
+    <select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
+        SELECT id, name, real_name RealName
+        FROM blade_user
+        where cardid = #{param1}
+    </select>
+
 </mapper>

--
Gitblit v1.9.3