From 3013329b493ea1c1a34ec34af93b8d380c951c23 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 26 Nov 2021 15:14:34 +0800
Subject: [PATCH] 培训查询修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 4e35814..519b3dc 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -246,6 +246,12 @@
         <if test="user.sex!=null and user.sex != ''">
             and bu.sex = #{user.sex}
         </if>
+        <if test="user.examinationType==0">
+            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 test="user.status!=null and user.status != ''">
             and bu.status = #{user.status}
         </if>
@@ -265,7 +271,7 @@
             and bu.paper_time &lt;= #{user.endTime}
         </if>
         <if test="user.useName==null or user.useName==''">
-            order by bu.id
+            order by bu.examination_type desc,bu.id
         </if>
         <if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
             order by bu.examination_type ${user.sort}
@@ -325,7 +331,7 @@
     <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
+               bd.dept_name deptName
         from blade_user bu
                  left join
              blade_dept bd
@@ -343,7 +349,7 @@
         bu.cardid,
         ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
         bu.phone,
-        if(bu.examination_type=0,'正常','异常') examinationType,
+        if(bu.examination_type=1,'异常','正常') examinationType,
         bu.examination_mx examinationMx,
         bu.paper_time paperTime
         from
@@ -401,7 +407,7 @@
             and bu.securitynumber like concat('%', #{user.securitynumber},'%')
         </if>
         <if test="user.deptId!=null and user.deptId!=''">
-            and bu.dept_id =#{user.deptId}
+            and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
         </if>
         <if test="user.startTime!=null and user.startTime!=''">
             and bu.paper_time &gt;= #{user.startTime}
@@ -409,8 +415,14 @@
         <if test="user.endTime!=null and user.endTime!=''">
             and bu.paper_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="")
+        </if>
+        <if test="user.examinationType==1">
+            and bu.examination_type = #{user.examinationType}
+        </if>
         <if test="user.useName==null or user.useName==''">
-            order by bu.id
+            order by bu.examination_type desc,bu.id
         </if>
         <if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
             order by bu.examination_type ${user.sort}

--
Gitblit v1.9.3