From 269b7d3e853794aefb36fab0fe8390f325d57374 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 04 Dec 2021 16:29:59 +0800
Subject: [PATCH] 1.数据库连接

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 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 85a88ef..d6b0830 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -177,11 +177,18 @@
         </if>
         <if test="user.examinationType!=null and user.examinationType != ''">
             <if test="user.examinationType == 0">
-                and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type ='')
+                and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type
+                ='')
             </if>
             <if test="user.examinationType == 1">
                 and bu.examination_type = #{user.examinationType}
             </if>
+        </if>
+        <if test="user.types!=null and user.types=='1'.toString()">
+            and to_days(bu.audit_time) = to_days(now())
+        </if>
+        <if test="user.types!=null and user.types=='2'.toString()">
+            and DATE_FORMAT(bu.audit_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
         </if>
         <if test="user.sex!=null and user.sex != ''">
             and bu.sex = #{user.sex}
@@ -302,7 +309,9 @@
 
     <update id="updateUser">
         update blade_user
-        set hold=#{hold},holdv=#{holdv},holdvtime=#{time}
+        set hold=#{hold},
+            holdv=#{holdv},
+            holdvtime=#{time}
         where cardid = #{cardid}
     </update>
 
@@ -322,16 +331,14 @@
 
     <!--根据保安员编码查询保安信息-->
     <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
+        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>
 
@@ -340,10 +347,9 @@
         SELECT id, name, real_name RealName
         FROM blade_user
         where cardid = #{param1}
-        and is_deleted = 0
-        and status = 1
+          and is_deleted = 0
+          and status = 1
     </select>
-
 
 
     <select id="selectPeo" resultType="java.util.HashMap">

--
Gitblit v1.9.3