From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/PayFeeConfigV1ServiceDaoImplMapper.xml | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeConfigV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeConfigV1ServiceDaoImplMapper.xml
index ffa6b00..04e950b 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,6 +59,13 @@
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
</if>
+ <if test="configIds != null">
+ and t.config_id in
+ <foreach collection="configIds" open="(" close=")"
+ separator="," item="item">
+ #{item}
+ </foreach>
+ </if>
<if test="feeFlag !=null and feeFlag != ''">
and t.fee_flag= #{feeFlag}
</if>
@@ -71,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 ">
@@ -128,6 +143,21 @@
<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 != ''">
and t.config_id= #{configId}
@@ -170,6 +200,13 @@
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
</if>
+ <if test="configIds !=null">
+ and t.config_id in
+ <foreach collection="configIds" open="(" close=")"
+ separator="," item="item">
+ #{item}
+ </foreach>
+ </if>
<if test="feeFlag !=null and feeFlag != ''">
and t.fee_flag= #{feeFlag}
</if>
@@ -188,8 +225,37 @@
<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>
+ <!-- 鏌ヨ鏀惰垂椤圭洰鏁伴噺 add by wuxw 2018-07-03 -->
+ <select id="queryFeeObjsCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from pay_fee t
+ left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.status_cd = '0' and pfa.spec_cd = '390012'
+ left join pay_fee_attrs pfa1 on t.fee_id = pfa1.fee_id and pfa1.status_cd = '0' and pfa1.spec_cd = '390008'
+ left join pay_fee_attrs pfa2 on t.fee_id = pfa2.fee_id and pfa2.status_cd = '0' and pfa2.spec_cd = '390009'
+ where t.config_id = #{configId}
+ and t.community_id= #{communityId}
+ </select>
+
+ <!-- 鏌ヨ鏀惰垂椤圭洰淇℃伅 add by wuxw 2018-07-03 -->
+ <select id="queryFeeObjs" parameterType="Map" resultType="Map">
+ select t.fee_id feeId,t.payer_obj_type payerObjType,pfa.`value` payerObjName,pfa1.`value` ownerName,
+ pfa2.value ownerTel, t.create_time createTime
+ from pay_fee t
+ left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.status_cd = '0' and pfa.spec_cd = '390012'
+ left join pay_fee_attrs pfa1 on t.fee_id = pfa1.fee_id and pfa1.status_cd = '0' and pfa1.spec_cd = '390008'
+ left join pay_fee_attrs pfa2 on t.fee_id = pfa2.fee_id and pfa2.status_cd = '0' and pfa2.spec_cd = '390009'
+ where t.config_id = #{configId}
+ and t.community_id= #{communityId}
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0