From 30df94c05573a426d030510d4dd58ae1d93bfb7a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 14:03:37 +0800
Subject: [PATCH] 1.资格审查排序
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 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 dda3727..b4daf57 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}
@@ -195,7 +202,7 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
- ORDER BY bu.id
+ ORDER BY bu.audit_time desc
</select>
@@ -241,7 +248,7 @@
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
- <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1372091709474910209'">
and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
</if>
<if test="user.dispatch!=null and user.dispatch != ''">
@@ -267,9 +274,6 @@
</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 test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber like concat('%', #{user.securitynumber},'%')
@@ -319,7 +323,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>
@@ -339,16 +345,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>
@@ -357,10 +361,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