From 745d27feae34022ccb708aba034123e08e4e9e14 Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期二, 28 十二月 2021 22:21:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 210 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
index b79f25a..f96052c 100644
--- a/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
@@ -17,7 +17,23 @@
<select id="getReportOweFeeInfo" parameterType="Map" resultType="Map">
select distinct(t.payer_obj_id) payerObjId
from report_owe_fee t
+ LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+ 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 1 =1
+ and pf.status_cd = '0'
+ <if test="roomSubType !=null and roomSubType != ''">
+ and br.room_sub_type = #{roomSubType}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num = #{roomNum}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id = #{unitId}
+ </if>
<if test="configName !=null and configName != ''">
and t.config_name= #{configName}
</if>
@@ -133,7 +149,7 @@
</if>
</set>
where 1=1
- and t.owe_id= #{oweId}
+ and t.owe_id= #{oweId}
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
@@ -159,7 +175,23 @@
<select id="queryReportOweFeesCount" parameterType="Map" resultType="Map">
select count(distinct(t.payer_obj_id)) count
from report_owe_fee t
+ LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+ 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 1 =1
+ and pf.status_cd = '0'
+ <if test="roomSubType !=null and roomSubType != ''">
+ and br.room_sub_type = #{roomSubType}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num = #{roomNum}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id = #{unitId}
+ </if>
<if test="configName !=null and configName != ''">
and t.config_name= #{configName}
</if>
@@ -229,7 +261,9 @@
communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId,
t.owner_id,t.owner_id ownerId,t.owner_name,t.owner_name ownerName
from report_owe_fee t
- where 1 = 1
+ LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+ where 1 =1
+ and pf.status_cd = '0'
<if test="configName !=null and configName != ''">
and t.config_name= #{configName}
</if>
@@ -263,6 +297,9 @@
</if>
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
+ </if>
+ <if test='hasOweFee !=null and hasOweFee == "Y"'>
+ and t.amount_owed > 0
</if>
<if test="configIds !=null">
and t.config_id in
@@ -309,7 +346,9 @@
from report_owe_fee t
left join building_owner_room_rel borr on borr.room_id = t.payer_obj_id and borr.status_cd = '0'
left join building_owner bo on borr.owner_id = bo.owner_id and bo.owner_type_cd = '1001' and bo.status_cd = '0'
- where 1 = 1
+ LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+ where 1 =1
+ and pf.status_cd = '0'
<if test="configName !=null and configName != ''">
and t.config_name= #{configName}
</if>
@@ -342,6 +381,9 @@
</if>
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
+ </if>
+ <if test='hasOweFee !=null and hasOweFee == "Y"'>
+ and t.amount_owed > 0
</if>
<if test="configIds !=null">
and t.config_id in
@@ -388,7 +430,9 @@
from report_owe_fee t
left join owner_car oc on oc.car_id = t.payer_obj_id and oc.status_cd = '0'
left join building_owner bo on oc.owner_id = bo.owner_id and bo.owner_type_cd = '1001' and bo.status_cd = '0'
- where 1 = 1
+ LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+ where 1 =1
+ and pf.status_cd = '0'
<if test="configName !=null and configName != ''">
and t.config_name= #{configName}
</if>
@@ -422,6 +466,9 @@
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
</if>
+ <if test='hasOweFee !=null and hasOweFee == "Y"'>
+ and t.amount_owed > 0
+ </if>
<if test="configIds !=null">
and t.config_id in
<foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
@@ -455,4 +502,163 @@
</if>
</select>
+
+ <select id="computeReportOweFeeTotalAmount" parameterType="Map" resultType="Map">
+ select sum(t.amount_owed) total
+ from report_owe_fee t
+ LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+ 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 1 =1
+ and pf.status_cd = '0'
+ <if test="roomSubType !=null and roomSubType != ''">
+ and br.room_sub_type = #{roomSubType}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num = #{roomNum}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id = #{unitId}
+ </if>
+ <if test="configName !=null and configName != ''">
+ and t.config_name= #{configName}
+ </if>
+ <if test="deadlineTime !=null and deadlineTime != ''">
+ and t.deadline_time= #{deadlineTime}
+ </if>
+ <if test="ownerTel !=null and ownerTel != ''">
+ and t.owner_tel= #{ownerTel}
+ </if>
+ <if test="updateTime !=null and updateTime != ''">
+ and t.update_time= #{updateTime}
+ </if>
+ <if test="oweId !=null and oweId != ''">
+ and t.owe_id= #{oweId}
+ </if>
+ <if test="ownerId !=null and ownerId != ''">
+ and t.owner_id= #{ownerId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ <if test="amountOwed !=null and amountOwed != ''">
+ and t.amount_owed= #{amountOwed}
+ </if>
+ <if test='hasOweFee !=null and hasOweFee == "Y"'>
+ and t.amount_owed > 0
+ </if>
+ <if test="payerObjName !=null and payerObjName != ''">
+ and t.payer_obj_name= #{payerObjName}
+ </if>
+ <if test="ownerName !=null and ownerName != ''">
+ and t.owner_name= #{ownerName}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
+ </if>
+ <if test="configIds !=null">
+ and t.config_id in
+ <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name= #{feeName}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.end_time= #{endTime}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="payerObjType !=null and payerObjType != ''">
+ and t.payer_obj_type= #{payerObjType}
+ </if>
+ <if test="payerObjId !=null and payerObjId != ''">
+ and t.payer_obj_id= #{payerObjId}
+ </if>
+ </select>
+ <select id="computeReportOweFeeItemAmount" parameterType="Map" resultType="Map">
+ select t.config_name configName,sum(t.amount_owed) totalOweAmount
+ from report_owe_fee t
+ LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+ 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 1 =1
+ and pf.status_cd = '0'
+ <if test="roomSubType !=null and roomSubType != ''">
+ and br.room_sub_type = #{roomSubType}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num = #{roomNum}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and bu.floor_id = #{floorId}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id = #{unitId}
+ </if>
+ <if test="configName !=null and configName != ''">
+ and t.config_name= #{configName}
+ </if>
+ <if test="deadlineTime !=null and deadlineTime != ''">
+ and t.deadline_time= #{deadlineTime}
+ </if>
+ <if test="ownerTel !=null and ownerTel != ''">
+ and t.owner_tel= #{ownerTel}
+ </if>
+ <if test="updateTime !=null and updateTime != ''">
+ and t.update_time= #{updateTime}
+ </if>
+ <if test="oweId !=null and oweId != ''">
+ and t.owe_id= #{oweId}
+ </if>
+ <if test="ownerId !=null and ownerId != ''">
+ and t.owner_id= #{ownerId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ <if test="amountOwed !=null and amountOwed != ''">
+ and t.amount_owed= #{amountOwed}
+ </if>
+ <if test='hasOweFee !=null and hasOweFee == "Y"'>
+ and t.amount_owed > 0
+ </if>
+ <if test="payerObjName !=null and payerObjName != ''">
+ and t.payer_obj_name= #{payerObjName}
+ </if>
+ <if test="ownerName !=null and ownerName != ''">
+ and t.owner_name= #{ownerName}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
+ </if>
+ <if test="configIds !=null">
+ and t.config_id in
+ <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name= #{feeName}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.end_time= #{endTime}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="payerObjType !=null and payerObjType != ''">
+ and t.payer_obj_type= #{payerObjType}
+ </if>
+ <if test="payerObjId !=null and payerObjId != ''">
+ and t.payer_obj_id= #{payerObjId}
+ </if>
+ GROUP BY t.config_id,t.config_name
+ </select>
+
</mapper>
--
Gitblit v1.8.0