From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml
index 6023705..75c28f4 100755
--- a/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml
@@ -161,6 +161,8 @@
t.b_id,t.b_id bId,
t.community_id,t.community_id communityId,
t.create_time,t.create_time createTime,
+ t.apply_person_id applyPersonId,t.apply_person_name applyPersonName,
+ t.audit_person_id auditPersonId,t.audit_person_name auditPersonName,
d.name feeTypeCdName,
c.name stateName,
pf.payer_obj_type payerObjType,
@@ -187,10 +189,10 @@
<if test="payTime !=null and payTime != ''">
and t.pay_time= #{payTime}
</if>
- <if test="startTime !=null ">
+ <if test="startTime !=null and startTime != ''">
and t.create_time >= #{startTime}
</if>
- <if test="endTime !=null ">
+ <if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
<if test="detailId !=null and detailId != ''">
@@ -228,6 +230,18 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="applyPersonId !=null and applyPersonId != ''">
+ and t.apply_person_id= #{applyPersonId}
+ </if>
+ <if test="applyPersonName !=null and applyPersonName != ''">
+ and t.apply_person_name like concat('%',#{applyPersonName},'%')
+ </if>
+ <if test="auditPersonId !=null and auditPersonId != ''">
+ and t.audit_person_id= #{auditPersonId}
+ </if>
+ <if test="auditPersonName !=null and auditPersonName != ''">
+ and t.audit_person_name like concat('%',#{auditPersonName},'%')
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -495,10 +509,10 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="startTime !=null ">
+ <if test="startTime !=null and startTime !='' ">
and t.create_time >= #{startTime}
</if>
- <if test="endTime !=null ">
+ <if test="endTime !=null and endTime !=''">
and t.create_time <= #{endTime}
</if>
</select>
--
Gitblit v1.8.0