Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -17,7 +17,7 @@

			<!-- 批量插入费用 -->
			<insert id="saveFeeReceiptDetails" parameterType="Map">
			insert into pay_feefee_receipt_detail(
			insert into fee_receipt_detail(
			area,amount,fee_name,detail_id,start_time,end_time,community_id,receipt_id,fee_id,cycle,square_price )
			VALUES
			<foreach collection="feeReceiptDetailPos" item="item" separator=",">
			@@ -32,11 +32,12 @@
			select t.area,t.amount,t.fee_name,t.fee_name feeName,t.detail_id,t.detail_id detailId,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.receipt_id,t.receipt_id receiptId,t.fee_id,t.fee_id feeId,t.cycle,t.square_price squarePrice,
			pfd.remark,pf.fee_flag feeFlag
			pfd.remark,pf.fee_flag feeFlag,mw.pre_degrees preDegrees,mw.cur_degrees curDegrees
			from fee_receipt_detail t
			left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.status_cd = '0' and t.community_id =
			pfd.community_id
			left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and t.community_id = pf.community_id
			LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and t.community_id = mw.community_id
			where 1 =1

			<if test="area !=null and area != ''">
			@@ -50,6 +51,12 @@
			</if>
			<if test="detailId !=null and detailId != ''">
			and t.detail_id= #{detailId}
			</if>
			<if test="detailIds !=null ">
			and t.detail_id in
			<foreach collection="detailIds" item="item" open="(" close=")" separator=",">
			#{item}
			</foreach>
			</if>
			<if test="startTime !=null and startTime != ''">
			and t.start_time= #{startTime}
			@@ -83,6 +90,7 @@
			limit #{page}, #{row}
			</if>


			</select>