From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml
index 4d6abbf..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}
@@ -302,7 +308,7 @@
             and t.fee_id= #{feeId}
         </if>
         <if test="returnFeeId !=null and returnFeeId != ''">
-            and t.return_fee_id= #{returnFeeId}
+            and t.return_fee_id = #{returnFeeId}
         </if>
         <if test="configId !=null and configId != ''">
             and t.config_id= #{configId}
@@ -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