Lianxun_Java.git

			@@ -8,12 +8,10 @@
			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)
			payment_cycle, computing_formula_text, deduct_from, prepayment_period)
			values (#{feeTypeCd}, #{computingFormula}, #{additionalAmount}, #{squarePrice}, #{isDefault}, #{operate},
			#{configId},
			#{feeFlag}, #{feeName}, #{startTime}, #{endTime}, #{communityId}, #{bId}, #{billType}, #{paymentCd},
			#{paymentCycle},
			#{computingFormulaText}, #{deductFrom})
			#{configId}, #{feeFlag}, #{feeName}, #{startTime}, #{endTime}, #{communityId}, #{bId}, #{billType},
			#{paymentCd}, #{paymentCycle}, #{computingFormulaText}, #{deductFrom}, #{prepaymentPeriod})
			</insert>

			<!-- 查询费用配置信息（Business） add by wuxw 2018-07-03 -->
			@@ -24,7 +22,8 @@
			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.deduct_from,t.deduct_from deductFrom,t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units
			computingFormulaText,t.deduct_from,t.deduct_from deductFrom,t.pay_online payOnline,t.scale,t.decimal_place
			decimalPlace,t.units,t.prepayment_period,t.prepayment_period prepaymentPeriod
			from business_pay_fee_config t
			where 1 =1
			<if test="feeTypeCd !=null and feeTypeCd != ''">
			@@ -72,17 +71,20 @@
			<if test="deductFrom !=null and deductFrom != ''">
			and t.deduct_from = #{deductFrom}
			</if>
			<if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
			and t.prepayment_period = #{prepaymentPeriod}
			</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,deduct_from
			start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text,deduct_from,prepayment_period
			) 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.deduct_from
			t.b_id,t.bill_type,t.payment_cd,t.payment_cycle,t.computing_formula_text,t.deduct_from,t.prepayment_period
			from business_pay_fee_config t where 1=1
			<if test="feeTypeCd !=null and feeTypeCd != ''">
			and t.fee_type_cd= #{feeTypeCd}
			@@ -124,6 +126,9 @@
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>
			<if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
			and t.prepayment_period = #{prepaymentPeriod}
			</if>
			</insert>

			<!-- 查询费用配置信息 add by wuxw 2018-07-03 -->
			@@ -136,7 +141,8 @@
			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
			deductFrom,td4.name computingFormulaName,t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units,
			t.prepayment_period,t.prepayment_period prepaymentPeriod
			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'
			@@ -208,6 +214,9 @@
			<if test="deductFrom !=null and deductFrom != ''">
			and t.deduct_from = #{deductFrom}
			</if>
			<if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
			and t.prepayment_period = #{prepaymentPeriod}
			</if>
			order by t.create_time desc
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			@@ -264,6 +273,9 @@
			</if>
			<if test="deductFrom !=null and deductFrom != ''">
			, t.deduct_from= #{deductFrom}
			</if>
			<if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
			, t.prepayment_period = #{prepaymentPeriod}
			</if>
			where 1=1
			<if test="configId !=null and configId != ''">
			@@ -341,6 +353,9 @@
			<if test="deductFrom !=null and deductFrom != ''">
			and t.deduct_from = #{deductFrom}
			</if>
			<if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
			and t.prepayment_period = #{prepaymentPeriod}
			</if>
			</select>

			<!-- 保存费用配置信息 add by wuxw 2018-07-03 -->
			@@ -348,9 +363,11 @@
			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)
			computing_formula_text, deduct_from, pay_online, scale, decimal_place, units,
			prepayment_period)
			values (#{feeTypeCd}, #{computingFormula}, #{additionalAmount}, '0', #{squarePrice}, #{isDefault}, #{configId},
			#{feeFlag}, #{feeName}, #{startTime}, #{endTime}, #{communityId}, '-1', #{billType}, #{paymentCd},
			#{paymentCycle}, #{computingFormulaText}, #{deductFrom}, #{payOnline},#{scale},#{decimalPlace},#{units})
			#{paymentCycle}, #{computingFormulaText}, #{deductFrom}, #{payOnline}, #{scale}, #{decimalPlace},
			#{units}, #{prepaymentPeriod})
			</insert>
			</mapper>