From db689e5e2cb730b2cf08796fa224084f00758a71 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 12 三月 2022 17:05:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml
index e68a532..d569a6a 100755
--- a/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml
@@ -171,14 +171,20 @@
t.create_time,t.create_time createTime,
d.name feeTypeCdName,
c.name stateName,
- pf.payer_obj_type payerObjType
+ pf.payer_obj_type payerObjType,
+ pfa.value payerObjName
from return_pay_fee t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390012' and pfa.status_cd = '0'
inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns = 'fee_type_cd'
inner join t_dict c on t.state = c.status_cd and c.table_name = 'return_pay_fee' and c.table_columns = 'state'
where 1 = 1
+
<if test="reason !=null and reason != ''">
and t.reason= #{reason}
+ </if>
+ <if test="payerObjName !=null and payerObjName != ''">
+ and pfa.value= #{payerObjName}
</if>
<if test="primeRate !=null and primeRate != ''">
and t.prime_rate= #{primeRate}
@@ -434,7 +440,13 @@
select count(1) count
from return_pay_fee t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390012' and pfa.status_cd = '0'
+ inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns = 'fee_type_cd'
+ inner join t_dict c on t.state = c.status_cd and c.table_name = 'return_pay_fee' and c.table_columns = 'state'
where 1 =1
+ <if test="payerObjName !=null and payerObjName != ''">
+ and pfa.value= #{payerObjName}
+ </if>
<if test="reason !=null and reason != ''">
and t.reason= #{reason}
</if>
--
Gitblit v1.8.0