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/apply/mapper/ExamPaymentMapper.xml |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/apply/mapper/ExamPaymentMapper.xml b/src/main/java/org/springblade/modules/apply/mapper/ExamPaymentMapper.xml
index fde187e..c382785 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ExamPaymentMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ExamPaymentMapper.xml
@@ -2,33 +2,53 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.modules.apply.mapper.ExamPaymentMapper">
 
-    <!--考试报名分页信息-->
+    <!--缴费分页信息-->
     <select id="selectExamPaymentPage" resultType="org.springblade.modules.apply.vo.ExamPaymentVO">
         SELECT
-            se.*,
-            bd.dept_name deptName
+        se.*,
+        bu.real_name realName,bu.cardid idCardNo,bu.sex,bu.phone,
+        bd.dept_name deptName,
+        sa.apply_time applyTime,"保安员证" as paperType
         FROM
-            sys_exam_payment se
+        sys_exam_payment se
         left join
-            blade_dept bd
+        blade_user bu
         on
-            bd.id = se.worker_id
+        bu.id = se.worker_id
+        left join
+        blade_dept bd
+        on
+        bd.id = bu.dept_id
+        left join
+        sys_apply sa
+        on
+        sa.user_id = se.worker_id
         WHERE
-            type = 1
+        1=1
+        and sa.apply_status = 2
         <if test="examPayment.workerId!=null and  examPayment.workerId!=''">
             and se.worker_id like concat('%', #{examPayment.workerId},'%')
         </if>
         <if test="examPayment.deptName!=null and  examPayment.deptName!=''">
             and bd.dept_name like concat('%', #{examPayment.deptName},'%')
         </if>
+        <if test="examPayment.realName!=null and  examPayment.realName!=''">
+            and bu.real_name like concat('%', #{examPayment.realName},'%')
+        </if>
+        <if test="examPayment.idCardNo!=null and  examPayment.idCardNo!=''">
+            and bu.cardid like concat('%', #{examPayment.idCardNo},'%')
+        </if>
+        <if test="examPayment.paymentStatus!=null">
+            and se.payment_status = #{examPayment.paymentStatus}
+        </if>
     </select>
 
-    <!--考试报名详情信息-->
+    <!--缴费详情信息-->
     <select id="selectExamPaymentInfo" resultType="org.springblade.modules.apply.vo.ExamPaymentVO">
         SELECT
-            *
+        *
         FROM
-            sys_examPayment
+        sys_examPayment
         where 1=1
         <if test="examPayment.id!=null and examPayment.id!=''">
             and id = #{examPayment.id}

--
Gitblit v1.9.3