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 | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 270 insertions(+), 9 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
index 7438f94..4759a4e 100644
--- a/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
@@ -249,7 +249,7 @@
and t.community_id= #{communityId}
and t.pay_fee_time > #{startDate}
and t.pay_fee_time < #{endDate}
- and t.cur_month_time > #{endDate}
+ and t.cur_month_time >= #{endDate}
</select>
<!-- 鏌ヨ瀹炴敹璐圭敤 -->
@@ -479,7 +479,7 @@
and t.community_id= a.community_id
and t.pay_fee_time > #{startDate}
and t.pay_fee_time < #{endDate}
- and t.cur_month_time > #{endDate}
+ and t.cur_month_time >= #{endDate}
<if test="configIds !=null ">
and t.config_id in
<foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
@@ -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'
@@ -581,7 +605,7 @@
1=1
and a.status_cd = '0'
and pf.payer_obj_type = '3333'
- and t.community_id= a.community_id
+ and t.community_id= #{communityId}
and t.cur_month_time < #{endDate}
and t.detail_id = '-1'
<if test="configIds !=null ">
@@ -665,7 +689,7 @@
and t.community_id= #{communityId}
and t.pay_fee_time > #{startDate}
and t.pay_fee_time < #{endDate}
- and t.cur_month_time > #{endDate}
+ and t.cur_month_time >= #{endDate}
and t.detail_id != '-1'
<if test="configIds !=null ">
and t.config_id in
@@ -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
@@ -968,13 +1018,16 @@
(
select count(1) from (
select bu.floor_id,br.room_id
- from building_room br
- INNER JOIN pay_fee pf on br.room_id = pf.payer_obj_id and pf.payer_obj_type = '3333' and pf.status_cd = '0'
+ from pay_fee_detail t
+ INNER JOIN pay_fee pf1 on t.fee_id = pf1.fee_id and pf1.payer_obj_type='3333' and pf1.status_cd = '0'
+ LEFT JOIN building_room br on pf1.payer_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 br.status_cd = '0'
- and br.community_id= #{communityId}
+ and t.status_cd = '0'
+ and t.community_id = #{communityId}
+ and t.create_time > #{startDate}
+ and t.create_time < #{endDate}
group by bu.floor_id,br.room_id
) b
where b.floor_id = a.floor_id
@@ -1121,7 +1174,8 @@
LEFT JOIN building_room br on pf.payer_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
- bu.floor_id = #{floorId}
+ 1=1
+ and bu.floor_id = #{floorId}
and t.community_id = #{communityId}
and t.create_time > #{startDate}
and t.create_time < #{endDate}
@@ -1182,5 +1236,212 @@
and t.detail_id != '-1'
and t.status_cd = '0'
</select>
+ <!-- 鏌ヨ鏈堟敹鍏ユ暟鎹� -->
+ <select id="getMonthReceivedDetailCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from pay_fee_detail_month t
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and pf.payer_obj_type = '3333'
+ left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.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'
+ 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}
+ and t.detail_id != '-1'
+ and t.community_id = #{communityId}
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pf.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="floorId != null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ <if test="objName != null and objName != ''">
+ and t.obj_name like concat('%',#{objName},'%')
+ </if>
+ <if test="ownerName != null and ownerName != ''">
+ and t.owner_name like concat('%',#{ownerName},'%')
+ </if>
+ <if test="link != null and link != ''">
+ and t.link = #{link}
+ </if>
+ </select>
+
+ <!-- 鏈堝疄鏀� 鏌ヨ-->
+ <select id="getMonthReceivedDetailInfo" parameterType="Map" resultType="Map">
+ select concat(f.floor_num,'-',bu.unit_num,'-',br.room_num) objName,t.owner_name ownerName,t.link,t.fee_name feeName, pfd.start_time startTime,pfd.end_time endTime,
+ pfd.pay_order_id payOrderId,pfd.cashier_name cashierName,
+ t.receivable_amount receivableAmount,t.received_amount receivedAmount,pfd.create_time createTime
+ from pay_fee_detail_month t
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and pf.payer_obj_type = '3333'
+ left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.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'
+ 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}
+ and t.detail_id != '-1'
+ and t.community_id = #{communityId}
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pf.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="floorId != null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ <if test="objName != null and objName != ''">
+ and t.obj_name like concat('%',#{objName},'%')
+ </if>
+ <if test="ownerName != null and ownerName != ''">
+ and t.owner_name like concat('%',#{ownerName},'%')
+ </if>
+ <if test="link != null and link != ''">
+ and t.link = #{link}
+ </if>
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
+ <!-- 鏈堝疄鏀舵�婚噾棰� 鏌ヨ-->
+ <select id="getMonthReceivedDetailAmount" parameterType="Map" resultType="Map">
+ select ifnull(sum(t.received_amount),0.0) amount
+ from pay_fee_detail_month t
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and pf.payer_obj_type = '3333'
+ left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.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'
+ left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ where 1=1
+ and t.status_cd = '0'
+ and t.cur_month_time >= #{startDate}
+ and t.cur_month_time < #{endDate}
+ and t.detail_id != '-1'
+ and t.community_id = #{communityId}
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pf.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="floorId != null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ <if test="objName != null and objName != ''">
+ and t.obj_name like concat('%',#{objName},'%')
+ </if>
+ <if test="ownerName != null and ownerName != ''">
+ and t.owner_name like concat('%',#{ownerName},'%')
+ </if>
+ <if test="link != null and link != ''">
+ and t.link = #{link}
+ </if>
+ </select>
+
+ <!-- 鏌ヨ鏈堟瑺璐规暟鎹� -->
+ <select id="getMonthOweDetailCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from pay_fee_detail_month t
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and pf.payer_obj_type = '3333'
+ left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.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'
+ left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ where 1=1
+ and t.status_cd = '0'
+ and t.cur_month_time >= #{startDate}
+ and t.cur_month_time < #{endDate}
+ and t.detail_id = '-1'
+ and t.community_id = #{communityId}
+ and t.receivable_amount > 0
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pf.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="floorId != null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ <if test="objName != null and objName != ''">
+ and t.obj_name like concat('%',#{objName},'%')
+ </if>
+ <if test="ownerName != null and ownerName != ''">
+ and t.owner_name like concat('%',#{ownerName},'%')
+ </if>
+ <if test="link != null and link != ''">
+ and t.link = #{link}
+ </if>
+ </select>
+
+ <!-- 鏈堝疄鏀� 鏌ヨ-->
+ <select id="getMonthOweDetailInfo" parameterType="Map" resultType="Map">
+ select concat(f.floor_num,'-',bu.unit_num,'-',br.room_num) objName,t.owner_name ownerName,t.link,t.fee_name feeName, pf.end_time startTime,t.deadline_time endTime,
+ t.receivable_amount receivableAmount,t.received_amount receivedAmount
+ from pay_fee_detail_month t
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and pf.payer_obj_type = '3333'
+ left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.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'
+ left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ where 1=1
+ and t.status_cd = '0'
+ and t.cur_month_time >= #{startDate}
+ and t.cur_month_time < #{endDate}
+ and t.detail_id = '-1'
+ and t.receivable_amount > 0
+ and t.community_id = #{communityId}
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pf.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="floorId != null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ <if test="objName != null and objName != ''">
+ and t.obj_name like concat('%',#{objName},'%')
+ </if>
+ <if test="ownerName != null and ownerName != ''">
+ and t.owner_name like concat('%',#{ownerName},'%')
+ </if>
+ <if test="link != null and link != ''">
+ and t.link = #{link}
+ </if>
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
+ <!-- 鏈堟瑺璐规�婚噾棰� 鏌ヨ-->
+ <select id="getMonthOweDetailAmount" parameterType="Map" resultType="Map">
+ select ifnull(sum(t.receivable_amount),0.0) amount
+ from pay_fee_detail_month t
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and pf.payer_obj_type = '3333'
+ left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.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'
+ left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ where 1=1
+ and t.status_cd = '0'
+ and t.cur_month_time >= #{startDate}
+ and t.cur_month_time < #{endDate}
+ and t.detail_id = '-1'
+ and t.community_id = #{communityId}
+ and t.receivable_amount > 0
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pf.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="floorId != null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ <if test="objName != null and objName != ''">
+ and t.obj_name like concat('%',#{objName},'%')
+ </if>
+ <if test="ownerName != null and ownerName != ''">
+ and t.owner_name like concat('%',#{ownerName},'%')
+ </if>
+ <if test="link != null and link != ''">
+ and t.link = #{link}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.8.0