From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
index f12c434..96ceb4a 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
@@ -121,20 +121,28 @@
         t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value`
         importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount,
         mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time
-        curReadingTime
+        curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value` payerObjName,
+        t.cashier_id cashierId,t.cashier_name cashierName,pfc.fee_flag feeFlag
         from pay_fee_detail t
         left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
         left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
         left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
         LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and mw.community_id = t.community_id
+        left join pay_fee_attrs pfao1 on pfao1.fee_id = t.fee_id and pfao1.spec_cd = '390012' and pfao1.status_cd = '0'
         <if test="ownerId != null and ownerId != ''">
             left join pay_fee_attrs pfao on pfao.fee_id = t.fee_id and pfao.spec_cd = '390007' and pfao.status_cd = '0'
         </if>
         left join t_dict d on t.state = d.status_cd and d.table_name = 'pay_fee_detail' and d.table_columns = 'state'
+        left join t_dict td on t.prime_rate = td.status_cd and td.table_name = 'pay_fee_detail' and td.table_columns = 'prime_rate'
         where 1 =1
         <if test="configId != null and configId != ''">
             and pf.config_id = #{configId}
+        </if>
+        <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="ownerId != null and ownerId != ''">
             and pfao.value = #{ownerId}
@@ -190,6 +198,12 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="cashierId !=null and cashierId != ''">
+            and t.cashier_id= #{cashierId}
+        </if>
+        <if test="cashierName !=null and cashierName != ''">
+            and t.cashier_name= #{cashierName}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -242,16 +256,19 @@
     <select id="queryFeeDetailsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from pay_fee_detail t
-        <if test="configId != null and configId != ''">
-            inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
-        </if>
+        left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
         <if test="ownerId != null and ownerId != ''">
             left join pay_fee_attrs pfa on pfa.fee_id = t.fee_id and pfa.spec_cd = '390007' and pfa.status_cd = '0'
         </if>
         where 1 =1
         <if test="configId != null and configId != ''">
             and pf.config_id = #{configId}
+        </if>
+        <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="ownerId != null and ownerId != ''">
             and pfa.value = #{ownerId}
@@ -298,6 +315,12 @@
         <if test="endTime !=null ">
             and t.create_time &lt;= #{endTime}
         </if>
+        <if test="cashierId !=null and cashierId != ''">
+            and t.cashier_id= #{cashierId}
+        </if>
+        <if test="cashierName !=null and cashierName != ''">
+            and t.cashier_name= #{cashierName}
+        </if>
         <if test="curYear != null and curYear != ''">
             and DATE_FORMAT(DATE_SUB(t.end_time,INTERVAL 1 DAY),'%Y') = #{curYear}
         </if>

--
Gitblit v1.8.0