From 57cbb7df3dcd52707c8d284ecc035bafb190312d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 01 八月 2020 00:14:32 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
index 2dfa0a5..8243f24 100644
--- a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
@@ -7,9 +7,11 @@
<!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessFeeConfigInfo" parameterType="Map">
insert into business_pay_fee_config(
- fee_type_cd,computing_formula,additional_amount,square_price,is_default,operate,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id,bill_type
+ fee_type_cd,computing_formula,additional_amount,square_price,is_default,operate,config_id,fee_flag,fee_name,
+ start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle
) values (
- #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},#{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId},#{billType}
+ #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},
+ #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId},#{billType},#{paymentCd},#{paymentCycle}
)
</insert>
@@ -20,7 +22,8 @@
computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.square_price,t.square_price
squarePrice,t.is_default,t.is_default isDefault,t.operate,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag
feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time startTime,t.end_time,t.end_time
- endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.bill_type,t.bill_type billType
+ endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.bill_type,t.bill_type billType,
+ t.payment_cd,t.payment_cycle
from business_pay_fee_config t
where 1 =1
<if test="feeTypeCd !=null and feeTypeCd != ''">
@@ -29,10 +32,10 @@
<if test="computingFormula !=null and computingFormula != ''">
and t.computing_formula= #{computingFormula}
</if>
- <if test="additionalAmount !=null and additionalAmount != ''">
+ <if test="additionalAmount !=null and additionalAmount != '' or additionalAmount == 0">
and t.additional_amount= #{additionalAmount}
</if>
- <if test="squarePrice !=null and squarePrice != ''">
+ <if test="squarePrice !=null and squarePrice != '' or squarePrice == 0">
and t.square_price= #{squarePrice}
</if>
<if test="isDefault !=null and isDefault != ''">
@@ -72,11 +75,12 @@
<!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveFeeConfigInfoInstance" parameterType="Map">
insert into pay_fee_config(
- fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id
- ,bill_type
+ fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,
+ start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle
) select
- t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,t.start_time,t.end_time,t.community_id,
- t.b_id,t.bill_type
+ t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,
+ t.start_time,t.end_time,t.community_id,
+ t.b_id,t.bill_type,t.payment_cd,t.payment_cycle
from business_pay_fee_config t where 1=1
<if test="feeTypeCd !=null and feeTypeCd != ''">
and t.fee_type_cd= #{feeTypeCd}
@@ -129,7 +133,8 @@
statusCd,t.square_price,t.square_price squarePrice,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.start_time,t.start_time
startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
- td1.name feeTypeCdName,td2.name feeFlagName,t.bill_type billType,t.bill_type,t.name billTypeName
+ td1.name feeTypeCdName,td2.name feeFlagName,t.bill_type billType,t.bill_type,td3.name billTypeName,
+ t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle
from pay_fee_config t,t_dict td1,t_dict td2,t_dict td3
where 1 =1
and t.fee_type_cd = td1.status_cd
@@ -180,6 +185,15 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
+ <if test="paymentCd !=null and paymentCd != ''">
+ and t.payment_cd= #{paymentCd}
+ </if>
+ <if test="paymentCycle !=null and paymentCycle != ''">
+ and t.payment_cycle= #{paymentCycle}
+ </if>
+ <if test="billType !=null and billType != ''">
+ and t.bill_type= #{billType}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -200,11 +214,17 @@
<if test="computingFormula !=null and computingFormula != ''">
, t.computing_formula= #{computingFormula}
</if>
- <if test="additionalAmount !=null and additionalAmount != ''">
+ <if test="additionalAmount !=null and additionalAmount != '' or additionalAmount == 0">
, t.additional_amount= #{additionalAmount}
</if>
- <if test="squarePrice !=null and squarePrice != ''">
+ <if test="squarePrice !=null and squarePrice != '' or squarePrice == 0">
, t.square_price= #{squarePrice}
+ </if>
+ <if test="paymentCd !=null and paymentCd != ''">
+ , t.payment_cd= #{paymentCd}
+ </if>
+ <if test="paymentCycle !=null and paymentCycle != ''">
+ , t.payment_cycle= #{paymentCycle}
</if>
<if test="isDefault !=null and isDefault != ''">
, t.is_default= #{isDefault}
@@ -290,6 +310,15 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
+ <if test="paymentCd !=null and paymentCd != ''">
+ and t.payment_cd= #{paymentCd}
+ </if>
+ <if test="paymentCycle !=null and paymentCycle != ''">
+ and t.payment_cycle= #{paymentCycle}
+ </if>
+ <if test="billType !=null and billType != ''">
+ and t.bill_type= #{billType}
+ </if>
</select>
--
Gitblit v1.8.0