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 | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 853497c..387b24d
--- a/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
@@ -43,9 +43,11 @@
<if test="payerObjType !=null and payerObjType != ''">
and pf.payer_obj_type = #{payerObjType}
</if>
- <if test="state !=null and state != ''">
- and (pfa.state is null
- or pfa.state = #{state})
+ <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 ">
@@ -96,11 +98,6 @@
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'
left join pay_fee_audit pfa on pf.fee_id = pfa.fee_id and pfd.detail_id = pfa.fee_detail_id and pfa.status_cd = '0'
where 1=1
- 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'
- left join pay_fee_audit pfa on pf.fee_id = pfa.fee_id and pfd.detail_id = pfa.fee_detail_id and pfa.status_cd = '0'
- where 1=1
and pfd.community_id = #{communityId}
and pfd.status_cd = '0'
and pfd.state = '1400'
@@ -118,9 +115,11 @@
<if test="payerObjType !=null and payerObjType != ''">
and pf.payer_obj_type = #{payerObjType}
</if>
- <if test="state !=null and state != ''">
- and (pfa.state is null
- or pfa.state = #{state})
+ <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