Lianxun_Java.git

			@@ -122,7 +122,7 @@
			importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount,
			mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time
			curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value` payerObjName,
			t.cashier_id cashierId,t.cashier_name cashierName
			t.cashier_id cashierId,t.cashier_name cashierName,pfc.fee_flag feeFlag
			from pay_fee_detail t
			left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
			left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
			@@ -137,7 +137,12 @@
			where 1 =1
			<if test="configId != null and configId != ''">
			and pf.config_id = #{configId}
			</if>
			<if test="payerObjId != null and payerObjId != ''">
			and pf.payer_obj_id = #{payerObjId}
			</if>
			<if test="payerObjType != null and payerObjType != ''">
			and pf.payer_obj_type = #{payerObjType}
			</if>
			<if test="ownerId != null and ownerId != ''">
			and pfao.value = #{ownerId}
			@@ -251,17 +256,20 @@
			<select id="queryFeeDetailsCount" parameterType="Map" resultType="Map">
			select count(1) count
			from pay_fee_detail t
			<if test="configId != null and configId != ''">
			inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
			</if>
			left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
			<if test="ownerId != null and ownerId != ''">
			left join pay_fee_attrs pfa on pfa.fee_id = t.fee_id and pfa.spec_cd = '390007' and pfa.status_cd = '0'
			</if>
			where 1 =1
			<if test="configId != null and configId != ''">
			and pf.config_id = #{configId}
			</if>
			<if test="payerObjId != null and payerObjId != ''">
			and pf.payer_obj_id = #{payerObjId}
			</if>
			<if test="payerObjType != null and payerObjType != ''">
			and pf.payer_obj_type = #{payerObjType}
			</if>
			<if test="ownerId != null and ownerId != ''">
			and pfa.value = #{ownerId}
			</if>