From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
index c98f9ba..4759a4e 100644
--- a/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
@@ -537,6 +537,30 @@
</if>
) curReceivableFee,
(
+ select ifnull(sum(t.receivable_amount),0.0) curReceivedFee
+ from pay_fee_detail_month t
+ INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ LEFT JOIN building_room br on t.obj_id = br.room_id and br.status_cd = '0'
+ left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
+ where
+ 1=1
+ and bu.floor_id = a.floor_id
+ and t.status_cd = '0'
+ and t.community_id= a.community_id
+ and t.cur_month_time >= #{startDate}
+ and t.cur_month_time < #{endDate}
+ and t.detail_id != '-1'
+ <if test="configIds !=null ">
+ and t.config_id in
+ <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pf.fee_type_cd = #{feeTypeCd}
+ </if>
+ ) curReceivedFee,
+ (
select ifnull(sum(t.received_amount),0.0) hisReceivedFee
from pay_fee_detail_month t
INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
@@ -725,6 +749,32 @@
</if>
and pf.fee_type_cd = a.status_cd
) curReceivableFee,
+ (
+ select ifnull(sum(t.receivable_amount),0.0) curReceivedFee
+ from pay_fee_detail_month t
+ INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ <if test="floorId != null and floorId != ''">
+ LEFT JOIN building_room br on t.obj_id = br.room_id and br.status_cd = '0'
+ left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
+ </if>
+ where
+ 1=1
+ <if test="floorId != null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ and t.status_cd = '0'
+ and t.community_id= #{communityId}
+ and t.cur_month_time >= #{startDate}
+ and t.cur_month_time < #{endDate}
+ and t.detail_id != '-1'
+ <if test="configIds !=null ">
+ and t.config_id in
+ <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ and pf.fee_type_cd = a.status_cd
+ ) curReceivedFee,
(
select ifnull(sum(t.received_amount),0.0) hisReceivedFee
from pay_fee_detail_month t
@@ -1195,7 +1245,9 @@
left join building_room br on t.obj_id = br.room_id and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ left join pay_fee_detail_month pfdm on t.fee_id = pfdm.fee_id and t.detail_year = pfdm.detail_year and t.detail_month = pfdm.detail_month and pfdm.detail_id = '-1'
where 1=1
+ and pfdm.month_id is null
and t.status_cd = '0'
and t.cur_month_time >= #{startDate}
and t.cur_month_time < #{endDate}
@@ -1229,7 +1281,9 @@
left join building_room br on t.obj_id = br.room_id and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ left join pay_fee_detail_month pfdm on t.fee_id = pfdm.fee_id and t.detail_year = pfdm.detail_year and t.detail_month = pfdm.detail_month and pfdm.detail_id = '-1'
where 1=1
+ and pfdm.month_id is null
and t.status_cd = '0'
and t.cur_month_time >= #{startDate}
and t.cur_month_time < #{endDate}
--
Gitblit v1.8.0