From b431c00a3e736e27599cd34793c65369fdb7b8cd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 04 Jan 2024 15:50:50 +0800
Subject: [PATCH] 模拟成绩查询修改

---
 src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml |   75 ++++++++++---------------------------
 1 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml b/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
index 43fe24e..0742d25 100644
--- a/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
@@ -12,39 +12,25 @@
             bu.cardid idCardNo,
             bu.securitynumber securityNumber,
             bu.avatar,
+            bud.permanent_residence_address as registered,
             ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
             bu1.real_name applyName,
             bt1.dept_name applyUnit,
-            bu.registered,
-            bu.user_type userType
+            bu.user_type userType,
+            bu.paper_time as userPaperTime
         FROM
             sys_accreditation_records sar
         left join
             blade_user bu
         on
             sar.user_id = bu.id
-        LEFT JOIN
-            blade_dept bt
-        ON
-            bu.dept_id = bt.id
-        left join
-        blade_user bu1
-        on
-        sar.create_user = bu1.id
-        LEFT JOIN
-        blade_dept bt1
-        ON
-        bu1.dept_id = bt1.id
-        left join
-        sys_information si
-        on
-        bt.id = si.departmentid
-        left join
-        sys_jurisdiction sj
-        on
-        sj.id = si.jurisdiction
-        WHERE
-            1=1
+        LEFT JOIN blade_user_detail bud ON bud.user_id = bu.id
+        LEFT JOIN  blade_dept bt ON bu.dept_id = bt.id
+        left join blade_user bu1 on sar.create_user = bu1.id
+        LEFT JOIN  blade_dept bt1  ON  bu1.dept_id = bt1.id
+        left join sys_information si on bt.id = si.departmentid
+        left join sys_jurisdiction sj on sj.id = si.jurisdiction
+        WHERE  1=1
         and bu.status = 1
         and bu.is_deleted = 0
         <if test="accreditationRecords.deptName!=null and  accreditationRecords.deptName!=''">
@@ -128,7 +114,7 @@
     </select>
 
 
-    <!--导出保安员证信息-->
+    <!--导出保安员证信息(上岗证)-->
     <select id="exportSecurityPaperList" resultType="org.springblade.modules.accreditation.vo.AccreditationRecordsVo">
         SELECT
         sar.*,
@@ -213,6 +199,9 @@
         </if>
         <if test="accreditationRecords.isAvatar==2">
             and (bu.avatar is null or bu.avatar="")
+        </if>
+        <if test="accreditationRecords.auditStatus!=null">
+            and sar.audit_status = #{accreditationRecords.auditStatus}
         </if>
         <if test="accreditationRecords.startTime!=null and accreditationRecords.startTime!='' and accreditationRecords.startTime!='undefined'">
             and sar.create_time &gt;= #{accreditationRecords.startTime}
@@ -340,38 +329,16 @@
         ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
         bu1.real_name applyName,
         bt1.dept_name applyUnit,
-        bu.registered,
         bu.user_type userType
         FROM
         sys_accreditation_records sar
-        left join
-        blade_user bu
-        on
-        sar.user_id = bu.id
-        LEFT JOIN
-        blade_dept bt
-        ON
-        bu.dept_id = bt.id
-        left join
-        blade_user bu1
-        on
-        sar.create_user = bu1.id
-        LEFT JOIN
-        blade_dept bt1
-        ON
-        bu1.dept_id = bt1.id
-        left join
-        sys_information si
-        on
-        bt.id = si.departmentid
-        left join
-        sys_jurisdiction sj
-        on
-        sj.id = si.jurisdiction
-        WHERE
-        1=1
-        and bu.status = 1
-        and bu.is_deleted = 0
+        left join blade_user bu on sar.user_id = bu.id
+        LEFT JOIN blade_dept bt ON bu.dept_id = bt.id
+        left join blade_user bu1 on sar.create_user = bu1.id
+        LEFT JOIN blade_dept bt1 ON bu1.dept_id = bt1.id
+        left join sys_information si on bt.id = si.departmentid
+        left join sys_jurisdiction sj on sj.id = si.jurisdiction
+        WHERE 1=1 and bu.status = 1 and bu.is_deleted = 0
         <if test="accreditationRecords.deptName!=null and  accreditationRecords.deptName!=''">
             and bt.dept_name like concat('%', #{accreditationRecords.deptName},'%')
         </if>

--
Gitblit v1.9.3