From e48f17558e2c8d3fcb1cf2cbc0d539130ee3eb33 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 11 Sep 2021 15:56:38 +0800
Subject: [PATCH] 缴费查询修改
---
src/main/java/org/springblade/modules/apply/vo/ExamPaymentVO.java | 22 ++++++++++++++++++++--
src/main/java/org/springblade/modules/apply/mapper/ExamPaymentMapper.xml | 32 ++++++++++++++++++++------------
2 files changed, 40 insertions(+), 14 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 4d4e83b..dd346c7 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ExamPaymentMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ExamPaymentMapper.xml
@@ -2,39 +2,47 @@
<!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
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
WHERE
- type = 1
+ type = 1
<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.type!=null">
- and se.type = #{examPayment.type}
+ <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}
diff --git a/src/main/java/org/springblade/modules/apply/vo/ExamPaymentVO.java b/src/main/java/org/springblade/modules/apply/vo/ExamPaymentVO.java
index a0e8218..d07bc24 100644
--- a/src/main/java/org/springblade/modules/apply/vo/ExamPaymentVO.java
+++ b/src/main/java/org/springblade/modules/apply/vo/ExamPaymentVO.java
@@ -32,11 +32,10 @@
@Data
@TableName("sys_apply")
public class ExamPaymentVO extends ExamPayment implements Serializable {
-
private static final long serialVersionUID = 1L;
/**
- * 保安单位名称（人员名称）
+ * 保安单位名称
*/
private String deptName;
@@ -45,5 +44,24 @@
*/
private Integer num;
+ /**
+ * 保安员姓名
+ */
+ private String realName;
+
+ /**
+ * 身份证号
+ */
+ private String idCardNo;
+
+ /**
+ * 性别 1男 2女
+ */
+ private Integer sex;
+
+ /**
+ * 联系电话
+ */
+ private String phone;
}
--
Gitblit v1.9.3