From 05525460a40423f25417663b155bb14ae99e1912 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Dec 2021 10:45:47 +0800
Subject: [PATCH] 保安员查询修改，异常排序，导出查询修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 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 48127a4..b897d25 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -197,7 +197,7 @@
         <if test="user.score!=null and user.score != ''">
             and p.score = 3
         </if>
-        ORDER BY bu.id
+        ORDER BY bu.id desc
     </select>
 
 
@@ -258,6 +258,9 @@
         <if test="user.realName!=null and user.realName != ''">
             and bu.real_name like concat(concat('%', #{user.realName}),'%')
         </if>
+        <if test="user.deptName!=null and user.deptName != ''">
+            and bd.dept_name like concat('%', #{user.deptName},'%')
+        </if>
         <if test="user.userType!=null and user.userType != ''">
             and bu.user_type = #{user.userType}
         </if>
@@ -289,19 +292,19 @@
             and bu.securitynumber like concat('%', #{user.securitynumber},'%')
         </if>
         <if test="user.startTime!=null and user.startTime!=''">
-            and bu.paper_time &gt;= #{user.startTime}
+            and bu.audit_time &gt;= #{user.startTime}
         </if>
         <if test="user.endTime!=null and user.endTime!=''">
-            and bu.paper_time &lt;= #{user.endTime}
+            and bu.audit_time &lt;= #{user.endTime}
         </if>
         <if test="user.useName==null or user.useName==''">
-            order by bu.examination_type desc,bu.id
+            order by bu.id desc
         </if>
         <if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
-            order by bu.examination_type ${user.sort}
+            order by bu.examination_type ${user.sort},bu.id
         </if>
         <if test="user.useName!=null and user.useName!='' and  user.useName=='examinationMx'">
-            order by bu.examination_mx ${user.sort}
+            order by bu.examination_mx ${user.sort},bu.id
         </if>
     </select>
 
@@ -376,7 +379,7 @@
         bu.phone,
         if(bu.examination_type=1,'异常','正常') examinationType,
         bu.examination_mx examinationMx,
-        bu.paper_time paperTime
+        bu.audit_time auditTime
         from
         blade_user bu
         left join
@@ -401,9 +404,6 @@
         br.role_alias = "安保人员"
         and
         bu.status = 1
-        and bd.parent_id!=1425365577303621633
-        and bd.id != 1425365577303621633
-        and bd.id != 1432625856013971457
         <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1372091709474910209'">
             and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
         </if>
@@ -431,6 +431,9 @@
         <if test="user.securitynumber!=null and user.securitynumber != ''">
             and bu.securitynumber like concat('%', #{user.securitynumber},'%')
         </if>
+        <if test="user.deptName!=null and user.deptName != ''">
+            and bd.dept_name like concat('%', #{user.deptName},'%')
+        </if>
         <if test="user.deptId!=null and user.deptId!=''">
             and bd.id in
             (
@@ -453,10 +456,10 @@
             )
         </if>
         <if test="user.startTime!=null and user.startTime!=''">
-            and bu.paper_time &gt;= #{user.startTime}
+            and bu.audit_time &gt;= #{user.startTime}
         </if>
         <if test="user.endTime!=null and user.endTime!=''">
-            and bu.paper_time &lt;= #{user.endTime}
+            and bu.audit_time &lt;= #{user.endTime}
         </if>
         <if test="user.examinationType==0">
             and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")

--
Gitblit v1.9.3