From cdd0abecb96bb1b6dfa32e8a9cbb406ce3b4ed7d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 17:02:08 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/PayFeeDetailMonthServiceDaoImplMapper.xml | 255 ++++++++++++++++++++++++++------------------------
1 files changed, 134 insertions(+), 121 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeDetailMonthServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeDetailMonthServiceDaoImplMapper.xml
index 179fbb0..0faf2ee 100644
--- a/java110-db/src/main/resources/mapper/fee/PayFeeDetailMonthServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeDetailMonthServiceDaoImplMapper.xml
@@ -5,147 +5,160 @@
<mapper namespace="payFeeDetailMonthServiceDaoImpl">
-
-
-
<!-- 淇濆瓨鏈堢即璐硅〃淇℃伅 add by wuxw 2018-07-03 -->
<insert id="savePayFeeDetailMonthInfo" parameterType="Map">
insert into pay_fee_detail_month(
-detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id
-) values (
-#{detailMonth},#{detailYear},#{detailId},#{receivableAmount},#{discountAmount},#{remark},#{receivedAmount},#{communityId},#{feeId},#{monthId}
-)
+ detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id
+ ) values (
+ #{detailMonth},#{detailYear},#{detailId},#{receivableAmount},#{discountAmount},#{remark},#{receivedAmount},#{communityId},#{feeId},#{monthId}
+ )
</insert>
+
+ <!-- 淇濆瓨鏈堢即璐硅〃淇℃伅 add by wuxw 2018-07-03 -->
+ <insert id="savePayFeeDetailMonthInfos" parameterType="Map">
+ insert into pay_fee_detail_month(
+ detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id
+ ) values
+ <foreach collection="payFeeDetailMonthPos" item="item" index="index" separator=",">
+ (
+ #{item.detailMonth},#{item.detailYear},#{item.detailId},#{item.receivableAmount},#{item.discountAmount},
+ #{item.remark},#{item.receivedAmount},#{item.communityId},#{item.feeId},#{item.monthId}
+ )
+ </foreach>
+ </insert>
+
<!-- 鏌ヨ鏈堢即璐硅〃淇℃伅 add by wuxw 2018-07-03 -->
<select id="getPayFeeDetailMonthInfo" parameterType="Map" resultType="Map">
- select t.detail_month,t.detail_month detailMonth,t.detail_year,t.detail_year detailYear,t.detail_id,t.detail_id detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.discount_amount,t.discount_amount discountAmount,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,t.community_id,t.community_id communityId,t.fee_id,t.fee_id feeId,t.month_id,t.month_id monthId
-from pay_fee_detail_month t
-where 1 =1
-<if test="detailMonth !=null and detailMonth != ''">
- and t.detail_month= #{detailMonth}
-</if>
-<if test="detailYear !=null and detailYear != ''">
- and t.detail_year= #{detailYear}
-</if>
-<if test="detailId !=null and detailId != ''">
- and t.detail_id= #{detailId}
-</if>
-<if test="receivableAmount !=null and receivableAmount != ''">
- and t.receivable_amount= #{receivableAmount}
-</if>
-<if test="discountAmount !=null and discountAmount != ''">
- and t.discount_amount= #{discountAmount}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="receivedAmount !=null and receivedAmount != ''">
- and t.received_amount= #{receivedAmount}
-</if>
-<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
-</if>
-<if test="feeId !=null and feeId != ''">
- and t.fee_id= #{feeId}
-</if>
-<if test="monthId !=null and monthId != ''">
- and t.month_id= #{monthId}
-</if>
-order by t.create_time desc
-<if test="page != -1 and page != null ">
- limit #{page}, #{row}
-</if>
+ select t.detail_month,t.detail_month detailMonth,t.detail_year,t.detail_year detailYear,t.detail_id,t.detail_id
+ detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.discount_amount,t.discount_amount
+ discountAmount,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
+ receivedAmount,t.community_id,t.community_id communityId,t.fee_id,t.fee_id feeId,t.month_id,t.month_id monthId
+ from pay_fee_detail_month t
+ where 1 =1
+ <if test="detailMonth !=null and detailMonth != ''">
+ and t.detail_month= #{detailMonth}
+ </if>
+ <if test="detailYear !=null and detailYear != ''">
+ and t.detail_year= #{detailYear}
+ </if>
+ <if test="detailId !=null and detailId != ''">
+ and t.detail_id= #{detailId}
+ </if>
+ <if test="receivableAmount !=null and receivableAmount != ''">
+ and t.receivable_amount= #{receivableAmount}
+ </if>
+ <if test="discountAmount !=null and discountAmount != ''">
+ and t.discount_amount= #{discountAmount}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="receivedAmount !=null and receivedAmount != ''">
+ and t.received_amount= #{receivedAmount}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ <if test="monthId !=null and monthId != ''">
+ and t.month_id= #{monthId}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
</select>
-
-
<!-- 淇敼鏈堢即璐硅〃淇℃伅 add by wuxw 2018-07-03 -->
<update id="updatePayFeeDetailMonthInfo" parameterType="Map">
- update pay_fee_detail_month t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if>
-<if test="detailMonth !=null and detailMonth != ''">
-, t.detail_month= #{detailMonth}
-</if>
-<if test="detailYear !=null and detailYear != ''">
-, t.detail_year= #{detailYear}
-</if>
-<if test="detailId !=null and detailId != ''">
-, t.detail_id= #{detailId}
-</if>
-<if test="receivableAmount !=null and receivableAmount != ''">
-, t.receivable_amount= #{receivableAmount}
-</if>
-<if test="discountAmount !=null and discountAmount != ''">
-, t.discount_amount= #{discountAmount}
-</if>
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if>
-<if test="receivedAmount !=null and receivedAmount != ''">
-, t.received_amount= #{receivedAmount}
-</if>
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if>
-<if test="feeId !=null and feeId != ''">
-, t.fee_id= #{feeId}
-</if>
- where 1=1 <if test="monthId !=null and monthId != ''">
-and t.month_id= #{monthId}
-</if>
+ update pay_fee_detail_month t set t.status_cd = #{statusCd}
+ <if test="newBId != null and newBId != ''">
+ ,t.b_id = #{newBId}
+ </if>
+ <if test="detailMonth !=null and detailMonth != ''">
+ , t.detail_month= #{detailMonth}
+ </if>
+ <if test="detailYear !=null and detailYear != ''">
+ , t.detail_year= #{detailYear}
+ </if>
+ <if test="detailId !=null and detailId != ''">
+ , t.detail_id= #{detailId}
+ </if>
+ <if test="receivableAmount !=null and receivableAmount != ''">
+ , t.receivable_amount= #{receivableAmount}
+ </if>
+ <if test="discountAmount !=null and discountAmount != ''">
+ , t.discount_amount= #{discountAmount}
+ </if>
+ <if test="remark !=null and remark != ''">
+ , t.remark= #{remark}
+ </if>
+ <if test="receivedAmount !=null and receivedAmount != ''">
+ , t.received_amount= #{receivedAmount}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ , t.community_id= #{communityId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ , t.fee_id= #{feeId}
+ </if>
+ where 1=1
+ <if test="monthId !=null and monthId != ''">
+ and t.month_id= #{monthId}
+ </if>
</update>
<!-- 鏌ヨ鏈堢即璐硅〃鏁伴噺 add by wuxw 2018-07-03 -->
- <select id="queryPayFeeDetailMonthsCount" parameterType="Map" resultType="Map">
- select count(1) count
-from pay_fee_detail_month t
-where 1 =1
-<if test="detailMonth !=null and detailMonth != ''">
- and t.detail_month= #{detailMonth}
-</if>
-<if test="detailYear !=null and detailYear != ''">
- and t.detail_year= #{detailYear}
-</if>
-<if test="detailId !=null and detailId != ''">
- and t.detail_id= #{detailId}
-</if>
-<if test="receivableAmount !=null and receivableAmount != ''">
- and t.receivable_amount= #{receivableAmount}
-</if>
-<if test="discountAmount !=null and discountAmount != ''">
- and t.discount_amount= #{discountAmount}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="receivedAmount !=null and receivedAmount != ''">
- and t.received_amount= #{receivedAmount}
-</if>
-<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
-</if>
-<if test="feeId !=null and feeId != ''">
- and t.fee_id= #{feeId}
-</if>
-<if test="monthId !=null and monthId != ''">
- and t.month_id= #{monthId}
-</if>
+ <select id="queryPayFeeDetailMonthsCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from pay_fee_detail_month t
+ where 1 =1
+ <if test="detailMonth !=null and detailMonth != ''">
+ and t.detail_month= #{detailMonth}
+ </if>
+ <if test="detailYear !=null and detailYear != ''">
+ and t.detail_year= #{detailYear}
+ </if>
+ <if test="detailId !=null and detailId != ''">
+ and t.detail_id= #{detailId}
+ </if>
+ <if test="receivableAmount !=null and receivableAmount != ''">
+ and t.receivable_amount= #{receivableAmount}
+ </if>
+ <if test="discountAmount !=null and discountAmount != ''">
+ and t.discount_amount= #{discountAmount}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="receivedAmount !=null and receivedAmount != ''">
+ and t.received_amount= #{receivedAmount}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ <if test="monthId !=null and monthId != ''">
+ and t.month_id= #{monthId}
+ </if>
- </select>
+ </select>
</mapper>
--
Gitblit v1.8.0