From 7f3372fe96d927debd388a0cb285a45e6b952296 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期四, 17 七月 2025 18:23:54 +0800
Subject: [PATCH] 房产新增字段、采购去除必输项2025/07/17
---
java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 110 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
index a4a1da1..2bfbc27 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
@@ -156,7 +156,14 @@
td4.table_columns = 'computing_formula'
where 1 = 1
<if test="feeTypeCd !=null and feeTypeCd != ''">
- and t.fee_type_cd= #{feeTypeCd}
+ <choose>
+ <when test="feeTypeCd == 0">
+ and t.fee_type_cd in ('630000003','630000004','630000005')
+ </when>
+ <otherwise>
+ and t.fee_type_cd= #{feeTypeCd}
+ </otherwise>
+ </choose>
</if>
<if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
and t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
@@ -237,6 +244,108 @@
</if>
</select>
+ <!-- 鏌ヨ璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
+ <select id="getFeeConfigInfoByCar" parameterType="Map" resultType="Map">
+ select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,t.computing_formula,t.computing_formula
+ computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.status_cd,t.status_cd
+ 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,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,t.deduct_from,t.deduct_from
+ deductFrom,td4.name computingFormulaName,t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units,
+ t.prepayment_period,t.prepayment_period prepaymentPeriod,t.state
+ from pay_fee_config t
+ left join secondary_fee_type_cd_tb s on s.secondary_fee_type_cd = t.secondary_fee_type_cd
+ 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 t.fee_type_cd in ('630000003','630000004','630000005')
+ <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
+ and t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
+ </if>
+ <if test="computingFormula !=null and computingFormula != ''">
+ and t.computing_formula= #{computingFormula}
+ </if>
+ <if test="additionalAmount !=null and additionalAmount != ''">
+ and t.additional_amount= #{additionalAmount}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="squarePrice !=null and squarePrice != ''">
+ and t.square_price= #{squarePrice}
+ </if>
+ <if test="isDefault !=null and isDefault != ''">
+ and t.is_default= #{isDefault}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
+ </if>
+ <if test="feeFlag !=null and feeFlag != ''">
+ and t.fee_flag= #{feeFlag}
+ </if>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name like '%${feeName}%'
+ </if>
+ <if test="feeNameEq !=null and feeNameEq != ''">
+ and t.fee_name = #{feeNameEq}
+ </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}
+ and t.start_time < #{curTime}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="communityIds !=null">
+ and t.community_id in
+ <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <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>
+ <if test="deductFrom !=null and deductFrom != ''">
+ and t.deduct_from = #{deductFrom}
+ </if>
+ <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
+ and t.prepayment_period = #{prepaymentPeriod}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state = #{state}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
<!-- 淇敼璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateFeeConfigInfoInstance" parameterType="Map">
update pay_fee_config t set t.status_cd = #{statusCd}
--
Gitblit v1.8.0