From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 52baa40..387b24d
--- a/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
@@ -20,7 +20,7 @@
select pf.payer_obj_id payerObjId,pf.payer_obj_type payerObjType,pfc.fee_name feeName,
pfd.cycles,pfd.start_time startTime,pfd.end_time endTime,pfd.receivable_amount receivableAmount,
pfd.received_amount receivedAmount,pfd.create_time createTime,pfa.state,pfa.message,pfd.remark,
- pfa.audit_user_name auditUserName,pfd.b_id bId
+ pfa.audit_user_name auditUserName,pfd.b_id bId,pf.fee_id feeId,pf.community_id communityId,pfd.detail_id detailId
from pay_fee_detail pfd
INNER JOIN pay_fee pf on pf.fee_id = pfd.fee_id and pf.community_id = pfd.community_id and pf.status_cd = '0'
inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pf.community_id = pfc.community_id and pfc.status_cd = '0'
@@ -28,6 +28,7 @@
where 1=1
and pfd.community_id = #{communityId}
and pfd.status_cd = '0'
+ and pfd.state = '1400'
<if test="roomId !=null and roomId != ''">
and pf.payer_obj_id = #{roomId}
and pf.payer_obj_type = '3333'
@@ -36,9 +37,17 @@
and pf.payer_obj_id = #{carId}
and pf.payer_obj_type = '6666'
</if>
- <if test="state !=null and state != ''">
- and (pfa.state is null
- or pfa.state = #{state})
+ <if test="payerObjId !=null and payerObjId != ''">
+ and pf.payer_obj_id = #{payerObjId}
+ </if>
+ <if test="payerObjType !=null and payerObjType != ''">
+ and pf.payer_obj_type = #{payerObjType}
+ </if>
+ <if test="state !=null and state != '1010'">
+ and pfa.state = #{state}
+ </if>
+ <if test="state !=null and state == '1010'">
+ and pfa.state is null
</if>
ORDER BY pfd.create_time desc
<if test="page != -1 and page != null ">
@@ -91,6 +100,7 @@
where 1=1
and pfd.community_id = #{communityId}
and pfd.status_cd = '0'
+ and pfd.state = '1400'
<if test="roomId !=null and roomId != ''">
and pf.payer_obj_id = #{roomId}
and pf.payer_obj_type = '3333'
@@ -99,9 +109,17 @@
and pf.payer_obj_id = #{carId}
and pf.payer_obj_type = '6666'
</if>
- <if test="state !=null and state != ''">
- and (pfa.state is null
- or pfa.state = #{state})
+ <if test="payerObjId !=null and payerObjId != ''">
+ and pf.payer_obj_id = #{payerObjId}
+ </if>
+ <if test="payerObjType !=null and payerObjType != ''">
+ and pf.payer_obj_type = #{payerObjType}
+ </if>
+ <if test="state !=null and state != '1010'">
+ and pfa.state = #{state}
+ </if>
+ <if test="state !=null and state == '1010'">
+ and pfa.state is null
</if>
--
Gitblit v1.8.0