From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index b2b250a..c46db49
--- a/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml
@@ -47,6 +47,12 @@
<if test="collectionId !=null and collectionId != ''">
and t.collection_id= #{collectionId}
</if>
+ <if test="collectionIds !=null ">
+ and t.collection_id in
+ <foreach collection="collectionIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
order by t.collection_year
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -74,9 +80,7 @@
, t.received_amount= #{receivedAmount}
</if>
- <if test="collectionId !=null and collectionId != ''">
- , t.collection_id= #{collectionId}
- </if>
+
where 1=1
<if test="detailId !=null and detailId != ''">
and t.detail_id= #{detailId}
@@ -84,6 +88,9 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ <if test="collectionId !=null and collectionId != ''">
+ and t.collection_id= #{collectionId}
+ </if>
</update>
--
Gitblit v1.8.0