From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
index df4f150..c8c231c 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
@@ -129,23 +129,24 @@
feeTypeCd,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time
endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId,t.user_id,t.user_id
userId,t.payer_obj_id,t.payer_obj_id payerObjId,pfc.square_price squarePrice,pfc.additional_amount
- additionalAmount,t.fee_flag,t.fee_flag feeFlag,t.state,t.config_id,t.config_id configId,
+ additionalAmount,pfc.fee_flag,pfc.fee_flag feeFlag,t.state,t.config_id,t.config_id configId,
pfc.fee_name feeName,td1.name feeTypeCdName,td2.name stateName,td3.name feeFlagName,pfc.computing_formula
computingFormula,pfc.computing_formula_text computingFormulaText,
pfc.bill_type billType,t.payer_obj_type,t.payer_obj_type payerObjType,pfc.is_default isDefault,pfc.start_time
configStartTime,pfc.end_time configEndTime,pfc.payment_cd paymentCd,pfc.payment_cycle paymentCycle,td4.name
billTypeName,pfa.value importFeeName,ifd.end_time importFeeEndTime,mw.cur_degrees curDegrees,mw.pre_degrees
preDegrees,
- mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price
+ mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,pfa1.`value` maxEndTime,mw.price
mwPrice,
- pfa2.`value` ownerName,t.batch_id,t.batch_id batchId
+ pfa2.`value` ownerName,t.batch_id,t.batch_id batchId,
+ pfc.pay_online payOnline,pfc.scale,pfc.decimal_place decimalPlace,pfc.units
from pay_fee t
INNER join pay_fee_config pfc on t.config_id = pfc.config_id and
pfc.status_cd = '0'
left join t_dict td1 on pfc.fee_type_cd = td1.status_cd and td1.table_name = 'pay_fee_config' and
td1.table_columns = 'fee_type_cd'
left join t_dict td2 on t.state = td2.status_cd and td2.table_name = 'pay_fee' and td2.table_columns = 'state'
- left join t_dict td3 on t.fee_flag = td3.status_cd and td3.table_name = 'pay_fee' and td3.table_columns =
+ left join t_dict td3 on pfc.fee_flag = td3.status_cd and td3.table_name = 'pay_fee' and td3.table_columns =
'fee_flag'
left join t_dict td4 on pfc.bill_type = td4.status_cd and td4.table_name = 'pay_fee_config' and
td4.table_columns = 'bill_type'
@@ -204,7 +205,7 @@
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
- <if test="payerObjIds != null ">
+ <if test="payerObjIds != null and payerObjIds.length > 0">
and t.payer_obj_id in
<foreach collection="payerObjIds" item="item" open="(" close=")" separator=",">
#{item}
@@ -222,11 +223,13 @@
<if test="payerObjType !=null and payerObjType != ''">
and t.payer_obj_type = #{payerObjType}
</if>
+ <if test="deductFrom !=null and deductFrom != ''">
+ and pfc.deduct_from = #{deductFrom}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
--
Gitblit v1.8.0