Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -9,9 +9,27 @@
			<insert id="saveFeeReceiptDetailInfo" parameterType="Map">
			insert into fee_receipt_detail(
			area,amount,fee_name,detail_id,start_time,end_time,community_id,receipt_id,fee_id,cycle,square_price
			<if test="createTime != null">
			,create_time
			</if>
			) values (
			#{area},#{amount},#{feeName},#{detailId},#{startTime},#{endTime},#{communityId},#{receiptId},#{feeId},#{cycle},#{squarePrice}
			<if test="createTime != null">
			,#{createTime}
			</if>
			)
			</insert>


			<!-- 批量插入费用 -->
			<insert id="saveFeeReceiptDetails" parameterType="Map">
			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=",">
			(#{item.area},#{item.amount},#{item.feeName},#{item.detailId},#{item.startTime},#{item.endTime},
			#{item.communityId},#{item.receiptId},#{item.feeId},#{item.cycle},#{item.squarePrice})
			</foreach>
			</insert>


			@@ -20,9 +38,15 @@
			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
			pfd.remark,pf.fee_flag feeFlag,mw.pre_degrees preDegrees,mw.cur_degrees curDegrees,d.name primeRate,
			pfc.units,pfd.pay_order_id payOrderId
			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_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 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 t.community_id = mw.community_id
			left join t_dict d on pfd.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and d.table_columns='prime_rate'
			where 1 =1
			<if test="area !=null and area != ''">
			and t.area= #{area}
			@@ -35,6 +59,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}
			@@ -51,6 +81,12 @@
			<if test="receiptId !=null and receiptId != ''">
			and t.receipt_id= #{receiptId}
			</if>
			<if test="receiptIds !=null">
			and t.receipt_id in
			<foreach collection="receiptIds" item="item" open="(" close=")" separator=",">
			#{item}
			</foreach>
			</if>
			<if test="feeId !=null and feeId != ''">
			and t.fee_id= #{feeId}
			</if>
			@@ -61,6 +97,7 @@
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>


			</select>

			@@ -137,6 +174,18 @@
			<if test="receiptId !=null and receiptId != ''">
			and t.receipt_id= #{receiptId}
			</if>
			<if test="receiptIds !=null">
			and t.receipt_id in
			<foreach collection="receiptIds" item="item" open="(" close=")" separator=",">
			#{item}
			</foreach>
			</if>
			<if test="detailIds !=null">
			and t.detail_id in
			<foreach collection="detailIds" item="item" open="(" close=")" separator=",">
			#{item}
			</foreach>
			</if>
			<if test="feeId !=null and feeId != ''">
			and t.fee_id= #{feeId}
			</if>