From 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 16:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml | 47 ++++++++++++++++++++++-------------------------
1 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index fe5d5fb..429dd1c
--- a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
@@ -8,13 +8,13 @@
<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,payment_cd,payment_cycle
+ start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text
) values (
#{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},
- #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId},#{billType},#{paymentCd},#{paymentCycle}
+ #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId},#{billType},#{paymentCd},#{paymentCycle},
+ #{computingFormulaText}
)
</insert>
-
<!-- 鏌ヨ璐圭敤閰嶇疆淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessFeeConfigInfo" parameterType="Map" resultType="Map">
@@ -23,7 +23,7 @@
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,
- t.payment_cd,t.payment_cycle
+ t.payment_cd,t.payment_cycle,t.computing_formula_text,t.computing_formula_text computingFormulaText
from business_pay_fee_config t
where 1 =1
<if test="feeTypeCd !=null and feeTypeCd != ''">
@@ -51,7 +51,7 @@
and t.fee_flag= #{feeFlag}
</if>
<if test="feeName !=null and feeName != ''">
- and t.fee_name= #{feeName}
+ and t.fee_name like '%${feeName}%'
</if>
<if test="billType !=null and billType != ''">
and t.bill_type= #{billType}
@@ -68,19 +68,17 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</select>
-
<!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅鑷� 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,payment_cd,payment_cycle
+ start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text
) 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.payment_cd,t.payment_cycle
+ t.b_id,t.bill_type,t.payment_cd,t.payment_cycle,t.computing_formula_text
from business_pay_fee_config t where 1=1
<if test="feeTypeCd !=null and feeTypeCd != ''">
and t.fee_type_cd= #{feeTypeCd}
@@ -122,9 +120,7 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</insert>
-
<!-- 鏌ヨ璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
<select id="getFeeConfigInfo" parameterType="Map" resultType="Map">
@@ -134,7 +130,8 @@
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,td3.name billTypeName,
- t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle
+ t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle,
+ t.computing_formula_text,t.computing_formula_text computingFormulaText
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
@@ -171,13 +168,16 @@
and t.fee_flag= #{feeFlag}
</if>
<if test="feeName !=null and feeName != ''">
- and t.fee_name= #{feeName}
+ and t.fee_name like '%${feeName}%'
</if>
<if test="startTime !=null ">
and t.start_time= #{startTime}
</if>
<if test="endTime !=null ">
and t.end_time= #{endTime}
+ </if>
+ <if test="valid !=null and valid == 1">
+ and t.end_time > now()
</if>
<if test="curTime !=null ">
and t.end_time > #{curTime}
@@ -202,9 +202,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateFeeConfigInfoInstance" parameterType="Map">
@@ -217,6 +215,9 @@
</if>
<if test="computingFormula !=null and computingFormula != ''">
, t.computing_formula= #{computingFormula}
+ </if>
+ <if test="computingFormulaText !=null and computingFormulaText != ''">
+ , t.computing_formula_text= #{computingFormulaText}
</if>
<if test="additionalAmount !=null and additionalAmount != '' or additionalAmount == 0">
, t.additional_amount= #{additionalAmount}
@@ -258,7 +259,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ璐圭敤閰嶇疆鏁伴噺 add by wuxw 2018-07-03 -->
@@ -300,13 +300,16 @@
and t.fee_flag= #{feeFlag}
</if>
<if test="feeName !=null and feeName != ''">
- and t.fee_name= #{feeName}
+ and t.fee_name like '%${feeName}%'
</if>
<if test="startTime !=null ">
and t.start_time= #{startTime}
</if>
<if test="endTime !=null ">
and t.end_time= #{endTime}
+ </if>
+ <if test="valid !=null and valid == 1">
+ and t.end_time > now()
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -323,22 +326,16 @@
<if test="billType !=null and billType != ''">
and t.bill_type= #{billType}
</if>
-
-
</select>
-
-
-
<!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveFeeConfig" 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,payment_cd,payment_cycle
+ start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text
) values (
#{feeTypeCd},#{computingFormula},#{additionalAmount},'0',#{squarePrice},#{isDefault},#{configId},
- #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},'-1',#{billType},#{paymentCd},#{paymentCycle}
+ #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},'-1',#{billType},#{paymentCd},#{paymentCycle},#{computingFormulaText}
)
</insert>
-
</mapper>
--
Gitblit v1.8.0