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/FeeConfigServiceDaoImplMapper.xml | 98 +++++++++++++++++++++++++++---------------------
1 files changed, 55 insertions(+), 43 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
index 29ea58e..edcb6bc 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="feeConfigServiceDaoImpl">
<!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅 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,payment_cd,payment_cycle,computing_formula_text
- ) values (
- #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},
- #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId},#{billType},#{paymentCd},#{paymentCycle},
- #{computingFormulaText}
- )
+ 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, computing_formula_text, deduct_from)
+ values (#{feeTypeCd}, #{computingFormula}, #{additionalAmount}, #{squarePrice}, #{isDefault}, #{operate},
+ #{configId},
+ #{feeFlag}, #{feeName}, #{startTime}, #{endTime}, #{communityId}, #{bId}, #{billType}, #{paymentCd},
+ #{paymentCycle},
+ #{computingFormulaText}, #{deductFrom})
</insert>
<!-- 鏌ヨ璐圭敤閰嶇疆淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
@@ -23,7 +23,8 @@
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.computing_formula_text,t.computing_formula_text computingFormulaText
+ t.payment_cd,t.payment_cycle,t.computing_formula_text,t.computing_formula_text
+ computingFormulaText,t.deduct_from,t.deduct_from deductFrom,t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units
from business_pay_fee_config t
where 1 =1
<if test="feeTypeCd !=null and feeTypeCd != ''">
@@ -68,17 +69,20 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
+ <if test="deductFrom !=null and deductFrom != ''">
+ and t.deduct_from = #{deductFrom}
+ </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,computing_formula_text
+ start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text,deduct_from
) 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.computing_formula_text
+ t.b_id,t.bill_type,t.payment_cd,t.payment_cycle,t.computing_formula_text,t.deduct_from
from business_pay_fee_config t where 1=1
<if test="feeTypeCd !=null and feeTypeCd != ''">
and t.fee_type_cd= #{feeTypeCd}
@@ -131,18 +135,18 @@
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.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
- and td1.table_name = 'pay_fee_config'
- and td1.table_columns = 'fee_type_cd'
- and t.fee_flag = td2.status_cd
- and td2.table_name = 'pay_fee_config'
- and td2.table_columns = 'fee_flag'
- and t.bill_type = td3.status_cd
- and td3.table_name = 'pay_fee_config'
- and td3.table_columns = 'bill_type'
+ t.computing_formula_text,t.computing_formula_text computingFormulaText,t.deduct_from,t.deduct_from
+ deductFrom,td4.name computingFormulaName,t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units
+ from pay_fee_config t
+ left join t_dict td1 on t.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.fee_flag = td2.status_cd and td2.table_name = 'pay_fee_config' and td2.table_columns =
+ 'fee_flag'
+ left join t_dict td3 on t.bill_type = td3.status_cd and td3.table_name = 'pay_fee_config' and td3.table_columns
+ = 'bill_type'
+ left join t_dict td4 on t.computing_formula = td4.status_cd and td4.table_name = 'pay_fee_config' and
+ td4.table_columns = 'computing_formula'
+ where 1 = 1
<if test="feeTypeCd !=null and feeTypeCd != ''">
and t.fee_type_cd= #{feeTypeCd}
</if>
@@ -201,6 +205,9 @@
<if test="billType !=null and billType != ''">
and t.bill_type= #{billType}
</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 ">
limit #{page}, #{row}
@@ -255,6 +262,9 @@
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
+ <if test="deductFrom !=null and deductFrom != ''">
+ , t.deduct_from= #{deductFrom}
+ </if>
where 1=1
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
@@ -267,17 +277,16 @@
<!-- 鏌ヨ璐圭敤閰嶇疆鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryFeeConfigsCount" parameterType="Map" resultType="Map">
select count(1) count
- 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
- and td1.table_name = 'pay_fee_config'
- and td1.table_columns = 'fee_type_cd'
- and t.fee_flag = td2.status_cd
- and td2.table_name = 'pay_fee_config'
- and td2.table_columns = 'fee_flag'
- and t.bill_type = td3.status_cd
- and td3.table_name = 'pay_fee_config'
- and td3.table_columns = 'bill_type'
+ from pay_fee_config t
+ left join t_dict td1 on t.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.fee_flag = td2.status_cd and td2.table_name = 'pay_fee_config' and td2.table_columns =
+ 'fee_flag'
+ left join t_dict td3 on t.bill_type = td3.status_cd and td3.table_name = 'pay_fee_config' and td3.table_columns
+ = 'bill_type'
+ left join t_dict td4 on t.computing_formula = td4.status_cd and td4.table_name = 'pay_fee_config' and
+ td4.table_columns = 'computing_formula'
+ where 1 = 1
<if test="feeTypeCd !=null and feeTypeCd != ''">
and t.fee_type_cd= #{feeTypeCd}
</if>
@@ -329,16 +338,19 @@
<if test="billType !=null and billType != ''">
and t.bill_type= #{billType}
</if>
+ <if test="deductFrom !=null and deductFrom != ''">
+ and t.deduct_from = #{deductFrom}
+ </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,computing_formula_text
- ) values (
- #{feeTypeCd},#{computingFormula},#{additionalAmount},'0',#{squarePrice},#{isDefault},#{configId},
- #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},'-1',#{billType},#{paymentCd},#{paymentCycle},#{computingFormulaText}
- )
+ 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,
+ computing_formula_text, deduct_from,pay_online,scale,decimal_place,units)
+ values (#{feeTypeCd}, #{computingFormula}, #{additionalAmount}, '0', #{squarePrice}, #{isDefault}, #{configId},
+ #{feeFlag}, #{feeName}, #{startTime}, #{endTime}, #{communityId}, '-1', #{billType}, #{paymentCd},
+ #{paymentCycle}, #{computingFormulaText}, #{deductFrom}, #{payOnline},#{scale},#{decimalPlace},#{units})
</insert>
</mapper>
--
Gitblit v1.8.0