From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
index fa2e3bb..4522290 100644
--- a/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
@@ -337,7 +337,7 @@
and pf.payer_obj_type = '3333'
and t.community_id= #{communityId}
and t.cur_month_time < #{endDate}
- and (t.receivable_amount - t.received_amount - t.discount_amount) > 0
+ and t.detail_id = '-1'
group by a.room_id
) a
</select>
@@ -1046,16 +1046,17 @@
<!-- 瀵硅薄瀹炴敹 -->
<select id="getObjReceivedFee" parameterType="Map" resultType="Map">
- select pf.payer_obj_id payerObjId, pf.fee_type_cd feeTypeCd,pf.fee_name feeName,
+ select pf.payer_obj_id payerObjId, pf.fee_type_cd feeTypeCd,pfc.fee_name feeName,
DATE_FORMAT(t.start_time,'%Y-%m-%d') startTime,DATE_FORMAT(t.end_time,'%Y-%m-%d') endTime,t.received_amount receivedAmount
from pay_fee_detail t
left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
where 1=1
- and t.payer_obj_type = '3333'
+ and pf.payer_obj_type = '3333'
and t.community_id = #{communityId}
and t.create_time > #{startDate}
and t.create_time < #{endDate}
- and t.payer_obj_id in
+ and pf.payer_obj_id in
<foreach collection="objIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
--
Gitblit v1.8.0