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/PayFeeConfigV1ServiceDaoImplMapper.xml | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeConfigV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeConfigV1ServiceDaoImplMapper.xml
index eddc792..dffa4c4 100644
--- a/java110-db/src/main/resources/mapper/fee/PayFeeConfigV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeConfigV1ServiceDaoImplMapper.xml
@@ -6,9 +6,13 @@
<!-- 淇濆瓨鏀惰垂椤圭洰淇℃伅 add by wuxw 2018-07-03 -->
<insert id="savePayFeeConfigInfo" parameterType="Map">
insert into pay_fee_config(
- fee_type_cd,computing_formula,additional_amount,bill_type,computing_formula_text,square_price,payment_cd,is_default,config_id,fee_flag,fee_name,payment_cycle,start_time,end_time,community_id
+ fee_type_cd,computing_formula,additional_amount,bill_type,computing_formula_text,square_price,
+ payment_cd,is_default,config_id,fee_flag,fee_name,payment_cycle,start_time,end_time,community_id,deduct_from,
+ pay_online,scale,decimal_place,units
) values (
- #{feeTypeCd},#{computingFormula},#{additionalAmount},#{billType},#{computingFormulaText},#{squarePrice},#{paymentCd},#{isDefault},#{configId},#{feeFlag},#{feeName},#{paymentCycle},#{startTime},#{endTime},#{communityId}
+ #{feeTypeCd},#{computingFormula},#{additionalAmount},#{billType},#{computingFormulaText},#{squarePrice},
+ #{paymentCd},#{isDefault},#{configId},#{feeFlag},#{feeName},#{paymentCycle},#{startTime},#{endTime},#{communityId},#{deductFrom},
+ #{payOnline},#{scale},#{decimalPlace},#{units}
)
</insert>
@@ -21,7 +25,8 @@
statusCd,t.square_price,t.square_price squarePrice,t.payment_cd,t.payment_cd paymentCd,t.is_default,t.is_default
isDefault,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag feeFlag,t.fee_name,t.fee_name
feeName,t.payment_cycle,t.payment_cycle paymentCycle,t.start_time,t.start_time startTime,t.end_time,t.end_time
- endTime,t.community_id,t.community_id communityId
+ endTime,t.community_id,t.community_id communityId,t.deduct_from,t.deduct_from deductFrom,
+ t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units
from pay_fee_config t
where 1 =1
<if test="feeTypeCd !=null and feeTypeCd != ''">
@@ -54,7 +59,7 @@
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
</if>
- <if test="configIds !=null">
+ <if test="configIds != null">
and t.config_id in
<foreach collection="configIds" open="(" close=")"
separator="," item="item">
@@ -78,6 +83,9 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="deductFrom !=null and deductFrom != ''">
+ and t.deduct_from = #{deductFrom}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -134,6 +142,21 @@
</if>
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
+ </if>
+ <if test="deductFrom !=null and deductFrom != ''">
+ , t.deduct_from= #{deductFrom}
+ </if>
+ <if test="payOnline !=null and payOnline != ''">
+ , t.pay_online= #{payOnline}
+ </if>
+ <if test="scale !=null and scale != ''">
+ , t.scale= #{scale}
+ </if>
+ <if test="decimalPlace !=null and decimalPlace != ''">
+ , t.decimal_place= #{decimalPlace}
+ </if>
+ <if test="units !=null and units != ''">
+ , t.units= #{units}
</if>
where 1=1
<if test="configId !=null and configId != ''">
@@ -202,7 +225,9 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
+ <if test="deductFrom !=null and deductFrom != ''">
+ and t.deduct_from = #{deductFrom}
+ </if>
</select>
--
Gitblit v1.8.0