From 48c9414db4b7c44a43524115570796025d38a653 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 16:37:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeManualCollectionDetailServiceDaoImplMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeManualCollectionDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeManualCollectionDetailServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index aa80ff7..219db50
--- a/java110-db/src/main/resources/mapper/fee/FeeManualCollectionDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeManualCollectionDetailServiceDaoImplMapper.xml
@@ -19,9 +19,11 @@
<select id="getFeeManualCollectionDetailInfo" parameterType="Map" resultType="Map">
select 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.state,t.community_id,t.community_id
- communityId,t.collection_id,t.collection_id collectionId,t.fee_id,t.fee_id feeId,td.name stateName
+ communityId,t.collection_id,t.collection_id collectionId,t.fee_id,t.fee_id feeId,td.name stateName,
+ pf.config_id configId
from fee_manual_collection_detail t
left join t_dict td on t.state = td.status_cd and td.table_name = 'fee_manual_collection_detail' and td.table_columns = 'state'
+ left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and pf.community_id = t.community_id
where 1 =1
<if test="amount !=null and amount != ''">
and t.amount= #{amount}
@@ -139,5 +141,17 @@
</select>
+ <select id="queryFeeManualCollectionDetailTotalFee" parameterType="Map" resultType="Map">
+ select sum(t.amount) totalFee
+ from fee_manual_collection_detail t
+ where 1 =1
+ <if test="collectionId !=null and collectionId != ''">
+ and t.collection_id= #{collectionId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0