Lianxun_Java.git

			@@ -10,9 +10,17 @@
			business_pay_fee_detail(
			operate,prime_rate,detail_id,
			receivable_amount,cycles,remark,
			received_amount,community_id,b_id,fee_id,state,start_time,end_time) values (
			received_amount,community_id,b_id,fee_id,state,start_time,end_time
			<if test="createTime != null">
			,create_time
			</if>
			) values (
			#{operate},#{primeRate},#{detailId},#{receivableAmount},
			#{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId},#{state},#{startTime},#{endTime})
			#{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId},#{state},#{startTime},#{endTime}
			<if test="createTime != null">
			,#{createTime}
			</if>
			)
			</insert>


			@@ -65,9 +73,9 @@
			<insert id="saveFeeDetailInfoInstance" parameterType="Map">
			insert into
			pay_fee_detail(
			prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time)
			prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time,create_time)
			select
			t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id,state,t.start_time,t.end_time
			t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id,state,t.start_time,t.end_time,t.create_time
			from business_pay_fee_detail t where 1=1
			and t.operate= 'ADD'
			<if test="primeRate !=null and primeRate != ''">
			@@ -109,13 +117,15 @@
			t.receivable_amount,t.receivable_amount receivableAmount,
			t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
			t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId ,t.create_time createTime,
			t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value` importFeeName,pfc.fee_name feeName
			t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value` importFeeName,pfc.fee_name feeName,
			mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime
			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'
			left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
			LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and mw.community_id = t.community_id
			<if test="ownerId != null and ownerId != ''">
			left join pay_fee_attrs pfao on pfa.fee_id = t.fee_id and pfao.spec_cd = '390007' and pfao.status_cd = '0'
			left join pay_fee_attrs pfao on pfao.fee_id = t.fee_id and pfao.spec_cd = '390007' and pfao.status_cd = '0'
			</if>
			left join t_dict d on t.state = d.status_cd and d.table_name = 'pay_fee_detail' and d.table_columns = 'state'
			where 1 =1
			@@ -164,6 +174,15 @@
			</if>
			<if test="curYear != null and curYear != ''">
			and DATE_FORMAT(DATE_SUB(t.end_time,INTERVAL 1 DAY),'%Y') = #{curYear}
			</if>
			<if test="states != null">
			and t.state in
			<foreach collection="states" item="item" open="(" close=")" separator=",">
			#{item}
			</foreach>
			</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 ">
			@@ -262,6 +281,9 @@
			<if test="feeId !=null and feeId != ''">
			and t.fee_id= #{feeId}
			</if>
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="startTime !=null ">
			and t.create_time >= #{startTime}
			</if>