From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 206 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
index 1c6a411..c98f9ba 100644
--- a/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml
@@ -967,7 +967,7 @@
) roomCount,
(
select count(1) from (
- select a.floor_id,br.room_id
+ select bu.floor_id,br.room_id
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'
@@ -978,7 +978,6 @@
and t.community_id = #{communityId}
and t.create_time > #{startDate}
and t.create_time < #{endDate}
- and pf1.fee_type_cd = td.status_cd
group by bu.floor_id,br.room_id
) b
where b.floor_id = a.floor_id
@@ -1125,7 +1124,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}
@@ -1186,5 +1186,208 @@
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'
+ 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="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'
+ 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>
+ <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