Lianxun_Java.git

			@@ -7,10 +7,10 @@
			<!-- 保存费用信息 add by wuxw 2018-07-03 -->
			<insert id="saveBusinessFeeInfo" parameterType="Map">
			insert into business_pay_fee(
			amount,operate,income_obj_id,fee_type_cd,start_time,end_time,community_id,b_id,fee_id,user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type
			amount,operate,income_obj_id,fee_type_cd,start_time,end_time,community_id,b_id,fee_id,user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type,batch_id
			) values (
			#{amount},#{operate},#{incomeObjId},#{feeTypeCd},#{startTime},#{endTime},#{communityId},#{bId},#{feeId},#{userId},#{payerObjId},
			#{feeFlag},#{state},#{configId},#{payerObjType}
			#{feeFlag},#{state},#{configId},#{payerObjType},#{batchId}
			)
			</insert>

			@@ -21,7 +21,7 @@
			feeTypeCd,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.fee_id,t.fee_id feeId,t.user_id,t.user_id userId,t.payer_obj_id,t.payer_obj_id
			payerObjId,t.fee_flag,t.fee_flag feeFlag,t.state,t.config_id,t.config_id
			configId,t.payer_obj_type,t.payer_obj_type payerObjType
			configId,t.payer_obj_type,t.payer_obj_type payerObjType,t.batch_id,t.batch_id batchId
			from business_pay_fee t
			where 1 =1
			<if test="amount !=null and amount != ''">
			@@ -51,9 +51,6 @@
			<if test="feeId !=null and feeId != ''">
			and t.fee_id= #{feeId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>
			<if test="payerObjId !=null and payerObjId != ''">
			and t.payer_obj_id= #{payerObjId}
			</if>
			@@ -76,10 +73,10 @@
			<!-- 保存费用信息至 instance表中 add by wuxw 2018-07-03 -->
			<insert id="saveFeeInfoInstance" parameterType="Map">
			insert into pay_fee(
			amount,income_obj_id,fee_type_cd,start_time,status_cd,end_time,community_id,b_id,fee_id,user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type
			amount,income_obj_id,fee_type_cd,start_time,status_cd,end_time,community_id,b_id,fee_id,user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type,batch_id
			) select
			t.amount,t.income_obj_id,t.fee_type_cd,t.start_time,'0',t.end_time,t.community_id,t.b_id,t.fee_id,t.user_id,t.payer_obj_id
			,t.fee_flag,t.state,t.config_id,t.payer_obj_type
			,t.fee_flag,t.state,t.config_id,t.payer_obj_type,t.batch_id
			from business_pay_fee t where 1=1
			<if test="amount !=null and amount != ''">
			and t.amount= #{amount}
			@@ -105,9 +102,6 @@
			</if>
			<if test="feeId !=null and feeId != ''">
			and t.fee_id= #{feeId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>
			<if test="payerObjId !=null and payerObjId != ''">
			and t.payer_obj_id= #{payerObjId}
			@@ -135,22 +129,24 @@
			feeTypeCd,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time
			endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId,t.user_id,t.user_id
			userId,t.payer_obj_id,t.payer_obj_id payerObjId,pfc.square_price squarePrice,pfc.additional_amount
			additionalAmount,t.fee_flag,t.fee_flag feeFlag,t.state,t.config_id,t.config_id configId,
			additionalAmount,pfc.fee_flag,pfc.fee_flag feeFlag,t.state,t.config_id,t.config_id configId,
			pfc.fee_name feeName,td1.name feeTypeCdName,td2.name stateName,td3.name feeFlagName,pfc.computing_formula
			computingFormula,pfc.computing_formula_text computingFormulaText,
			pfc.bill_type billType,t.payer_obj_type,t.payer_obj_type payerObjType,pfc.is_default isDefault,pfc.start_time
			configStartTime,pfc.end_time configEndTime,pfc.payment_cd paymentCd,pfc.payment_cycle paymentCycle,td4.name
			billTypeName,pfa.value importFeeName,ifd.end_time importFeeEndTime,mw.cur_degrees curDegrees,mw.pre_degrees
			preDegrees,
			mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price mwPrice,
			pfa2.`value` ownerName
			mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,pfa1.`value` maxEndTime,mw.price
			mwPrice,
			pfa2.`value` ownerName,t.batch_id,t.batch_id batchId,
			pfc.pay_online payOnline,pfc.scale,pfc.decimal_place decimalPlace,pfc.units
			from pay_fee t
			INNER join pay_fee_config pfc on t.config_id = pfc.config_id and
			pfc.status_cd = '0'
			left join t_dict td1 on pfc.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.state = td2.status_cd and td2.table_name = 'pay_fee' and td2.table_columns = 'state'
			left join t_dict td3 on t.fee_flag = td3.status_cd and td3.table_name = 'pay_fee' and td3.table_columns =
			left join t_dict td3 on pfc.fee_flag = td3.status_cd and td3.table_name = 'pay_fee' and td3.table_columns =
			'fee_flag'
			left join t_dict td4 on pfc.bill_type = td4.status_cd and td4.table_name = 'pay_fee_config' and
			td4.table_columns = 'bill_type'
			@@ -206,13 +202,10 @@
			<if test="feeId !=null and feeId != ''">
			and t.fee_id= #{feeId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>
			<if test="payerObjId !=null and payerObjId != ''">
			and t.payer_obj_id= #{payerObjId}
			</if>
			<if test="payerObjIds != null ">
			<if test="payerObjIds != null and payerObjIds.length > 0">
			and t.payer_obj_id in
			<foreach collection="payerObjIds" item="item" open="(" close=")" separator=",">
			#{item}
			@@ -230,11 +223,13 @@
			<if test="payerObjType !=null and payerObjType != ''">
			and t.payer_obj_type = #{payerObjType}
			</if>
			<if test="deductFrom !=null and deductFrom != ''">
			and pfc.deduct_from = #{deductFrom}
			</if>
			order by t.create_time desc
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>

			</select>


			@@ -352,9 +347,6 @@
			</if>
			<if test="feeId !=null and feeId != ''">
			and t.fee_id= #{feeId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>
			<if test="payerObjId !=null and payerObjId != ''">
			and t.payer_obj_id= #{payerObjId}
			@@ -662,9 +654,6 @@
			<if test="feeId !=null and feeId != ''">
			and t.fee_id= #{feeId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>
			<if test="payerObjId !=null and payerObjId != ''">
			and t.payer_obj_id= #{payerObjId}
			</if>
			@@ -749,9 +738,6 @@
			<if test="feeId !=null and feeId != ''">
			and t.fee_id= #{feeId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>
			<if test="payerObjId !=null and payerObjId != ''">
			and t.payer_obj_id= #{payerObjId}
			</if>
			@@ -783,11 +769,11 @@
			<!-- 批量插入费用 -->
			<insert id="insertFees" parameterType="Map">
			insert into pay_fee (amount,status_cd,income_obj_id,fee_type_cd,start_time,end_time,community_id,b_id,fee_id,
			user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type)
			user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type,batch_id)
			VALUES
			<foreach collection="payFeePos" item="item" separator=",">
			(#{item.amount},'0',#{item.incomeObjId},#{item.feeTypeCd},#{item.startTime},#{item.endTime},#{item.communityId},
			'-1',#{item.feeId},#{item.userId},#{item.payerObjId},#{item.feeFlag},#{item.state},#{item.configId},#{item.payerObjType})
			'-1',#{item.feeId},#{item.userId},#{item.payerObjId},#{item.feeFlag},#{item.state},#{item.configId},#{item.payerObjType},#{item.batchId})
			</foreach>
			</insert>

			@@ -879,4 +865,13 @@
			</if>
			</select>


			<!-- 根据批次删除费用 add by wuxw 2018-07-03 -->
			<update id="deleteFeesByBatch" parameterType="Map">
			update pay_fee t set t.status_cd = '1'
			where 1=1
			and t.batch_id= #{batchId}
			and t.community_id= #{communityId}

			</update>
			</mapper>