From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 193 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 137 insertions(+), 56 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index 72396bc..439c6fe 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -26,7 +26,8 @@
configId,t.obj_id,t.obj_id objId,t.fee_name,t.fee_name feeName,t.owe_amount,t.owe_amount
oweAmount,t.community_id,t.community_id communityId,t.fee_create_time,t.fee_create_time
feeCreateTime,t.obj_type,t.obj_type objType,t.cur_max_time curMaxTime,
- t.his_owe_amount hisOweAmount,t.cur_receivable_amount curReceivableAmount,t.cur_received_amount curReceivedAmount,
+ t.his_owe_amount hisOweAmount,t.cur_receivable_amount curReceivableAmount,t.cur_received_amount
+ curReceivedAmount,
t.his_owe_received_amount hisOweReceivedAmount,t.pre_received_amount preReceivedAmount
from report_fee_month_statistics t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
@@ -325,8 +326,10 @@
,t.config_id configId
</if>
,SUM(t.his_owe_amount) hisOweAmount,SUM(t.cur_receivable_amount) curReceivableAmount,
- SUM(t.cur_received_amount) curReceivedAmount,SUM(t.his_owe_received_amount) hisOweReceivedAmount,SUM(t.pre_received_amount) preReceivedAmount,
- max(t.update_time) updateTime,sum(t.his_owe_amount+t.cur_receivable_amount) receivableAmount,sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) receivedAmount
+ SUM(t.cur_received_amount) curReceivedAmount,SUM(t.his_owe_received_amount)
+ hisOweReceivedAmount,SUM(t.pre_received_amount) preReceivedAmount,
+ max(t.update_time) updateTime,sum(t.his_owe_amount+t.cur_receivable_amount)
+ receivableAmount,sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) receivedAmount
from report_fee_month_statistics t
left join building_room br on t.obj_id = br.room_id and t.obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
@@ -390,7 +393,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 澶ц add by wuxw 2018-07-03 -->
<select id="queryReportFeeSummaryMajor" parameterType="Map" resultType="Map">
select
- sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) allReceivedAmount
+ sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) allReceivedAmount,
+ sum(t.his_owe_received_amount) allHisOweReceivedAmount
from report_fee_month_statistics t
left join building_room br on t.obj_id = br.room_id and t.obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
@@ -478,6 +482,12 @@
<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" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
</if>
@@ -500,8 +510,15 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryReportFloorUnitFeeSummary" parameterType="Map" resultType="Map">
select t.fee_year feeYear,t.fee_month feeMonth, f.floor_num floorNum, bu.unit_num unitNum,max(t.update_time)
- updateTime,
- SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount) oweAmount
+ updateTime
+ <if test="configIds !=null">
+ ,t.config_id configId
+ </if>
+ ,SUM(t.his_owe_amount) hisOweAmount,SUM(t.cur_receivable_amount) curReceivableAmount,
+ SUM(t.cur_received_amount) curReceivedAmount,SUM(t.his_owe_received_amount)
+ hisOweReceivedAmount,SUM(t.pre_received_amount) preReceivedAmount,
+ max(t.update_time) updateTime,sum(t.his_owe_amount+t.cur_receivable_amount) receivableAmount,
+ sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) receivedAmount
from report_fee_month_statistics t
INNER JOIN building_room br on t.obj_id = br.room_id and br.status_cd = '0'
inner join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
@@ -532,6 +549,12 @@
</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" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
@@ -549,6 +572,9 @@
and t.create_time <= #{endTime}
</if>
GROUP BY t.fee_year,t.fee_month,f.floor_num,bu.unit_id,bu.unit_num
+ <if test="configIds !=null">
+ ,t.config_id
+ </if>
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -557,9 +583,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryReportFloorUnitFeeSummaryMajor" parameterType="Map" resultType="Map">
select
- SUM(t.receivable_amount)
- allReceivableAmount,SUM(t.received_amount)
- allReceivedAmount,SUM(t.owe_amount) allOweAmount
+ sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) allReceivedAmount,
+ sum(t.his_owe_received_amount) allHisOweReceivedAmount
from report_fee_month_statistics t
INNER JOIN building_room br on t.obj_id = br.room_id and br.status_cd = '0'
inner join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
@@ -607,12 +632,14 @@
</if>
</select>
+ <!--
+ and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
+ -->
<select id="queryFeeBreakdownCount" parameterType="Map" resultType="Map">
select count(1) count
from (
select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,pfc.start_time feeCreateTime,t.create_time
- createTime,SUM(t.receivable_amount)
- receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount) oweAmount
+ createTime
from report_fee_month_statistics t
inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
left join building_room br on t.obj_id = br.room_id and t.obj_type = '3333' and br.status_cd = '0'
@@ -621,7 +648,7 @@
left join t_dict td on pfc.fee_type_cd = td.status_cd and td.table_name='pay_fee_config' and
td.table_columns='fee_type_cd'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
- where t.status_cd = '0' and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
+ where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -664,15 +691,25 @@
<if test="endTime !=null and endTime != ''">
and pfc.start_time <= #{endTime}
</if>
+ <if test="yearMonth !=null and yearMonth != ''">
+ and concat(t.fee_year,t.fee_month) = #{yearMonth}
+ </if>
+
group by t.config_id,t.fee_name,pfc.start_time
) t
</select>
- <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03
+ and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
+ -->
<select id="queryFeeBreakdown" parameterType="Map" resultType="Map">
- select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,pfc.start_time feeStartTime,pfc.end_time
- feeEndTime,SUM(t.receivable_amount)
- receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount) oweAmount,max(t.update_time) updateTime
+ select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,SUM(t.his_owe_amount)
+ hisOweAmount,SUM(t.cur_receivable_amount) curReceivableAmount,
+ SUM(t.cur_received_amount) curReceivedAmount,SUM(t.his_owe_received_amount)
+ hisOweReceivedAmount,SUM(t.pre_received_amount) preReceivedAmount,
+ max(t.update_time) updateTime,sum(t.his_owe_amount+t.cur_receivable_amount) receivableAmount,
+ sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) receivedAmount,max(t.update_time)
+ updateTime
from report_fee_month_statistics t
inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
left join building_room br on t.obj_id = br.room_id and t.obj_type = '3333' and br.status_cd = '0'
@@ -681,7 +718,7 @@
left join t_dict td on pfc.fee_type_cd = td.status_cd and td.table_name='pay_fee_config' and
td.table_columns='fee_type_cd'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
- where t.status_cd = '0' and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
+ where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -723,6 +760,9 @@
</if>
<if test="endTime !=null and endTime != ''">
and pfc.start_time <= #{endTime}
+ </if>
+ <if test="yearMonth !=null and yearMonth != ''">
+ and concat(t.fee_year,t.fee_month) = #{yearMonth}
</if>
group by t.config_id,t.fee_name,pfc.start_time
order by t.create_time desc
@@ -730,11 +770,15 @@
limit #{page}, #{row}
</if>
</select>
- <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0 -->
<select id="queryFeeBreakdownMajor" parameterType="Map" resultType="Map">
- select SUM(t.receivable_amount)
- allReceivableAmount,SUM(t.received_amount)
- allReceivedAmount,SUM(t.owe_amount) allOweAmount
+ select
+ SUM(t.his_owe_amount + t.cur_receivable_amount) allReceivableAmount,
+ SUM(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) allReceivedAmount,
+ if(SUM(t.his_owe_amount + t.cur_receivable_amount - t.cur_received_amount - t.his_owe_received_amount) < 0,0,
+ SUM(t.his_owe_amount + t.cur_receivable_amount - t.cur_received_amount - t.his_owe_received_amount))
+ allOweAmount,
+ SUM(t.his_owe_received_amount) allHisOweReceivedAmount
from report_fee_month_statistics t
inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
left join building_room br on t.obj_id = br.room_id and t.obj_type = '3333' and br.status_cd = '0'
@@ -743,7 +787,7 @@
left join t_dict td on pfc.fee_type_cd = td.status_cd and td.table_name='pay_fee_config' and
td.table_columns='fee_type_cd'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
- where t.status_cd = '0' and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
+ where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -785,6 +829,9 @@
</if>
<if test="endTime !=null and endTime != ''">
and pfc.start_time <= #{endTime}
+ </if>
+ <if test="yearMonth !=null and yearMonth != ''">
+ and concat(t.fee_year,t.fee_month) = #{yearMonth}
</if>
order by t.create_time desc
</select>
@@ -845,7 +892,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryFeeDetail" parameterType="Map" resultType="Map">
- select t.obj_name objName,t.fee_name feeName,t.fee_create_time feeCreateTime,pfa.`value` ownerName,br.built_up_area builtUpArea ,max(t.deadline_time)
+ select t.obj_name objName,t.fee_name feeName,t.fee_create_time feeCreateTime,pfa.`value`
+ ownerName,br.built_up_area builtUpArea ,max(t.deadline_time)
deadlineTime,t.create_time createTime,SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount)
receivedAmount,SUM(t.owe_amount) oweAmount,max(t.update_time) updateTime
from report_fee_month_statistics t
@@ -1005,7 +1053,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryOweFeeDetail" parameterType="Map" resultType="Map">
select t.payer_obj_name objName,t.fee_name feeName,pf.end_time feeCreateTime,t.update_time
- updateTime,pfa.`value` ownerName,br.built_up_area builtUpArea ,SUM(t.amount_owed) oweAmount,max(t.deadline_time) deadlineTime
+ updateTime,pfa.`value` ownerName,br.built_up_area builtUpArea ,SUM(t.amount_owed) oweAmount,max(t.deadline_time)
+ deadlineTime
from report_owe_fee t
inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
left join building_room br on t.payer_obj_id = br.room_id and t.payer_obj_type = '3333' and br.status_cd = '0'
@@ -1113,9 +1162,6 @@
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.car_type_cd='1001'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
- left join pay_fee_detail_discount pfdd on t.detail_id = pfdd.detail_id and pfdd.status_cd = '0'
- left join fee_discount fd on pfdd.discount_id = fd.discount_id and fd.status_cd = '0'
- left join fee_discount_rule fdr on fd.rule_id = fdr.rule_id and fdr.status_cd = '0'
left join t_dict d on t.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and
d.table_columns="prime_rate"
left join t_dict d2 on pfc.fee_type_cd = d2.status_cd and d2.table_name = "pay_fee_config" and d2.table_columns
@@ -1176,13 +1222,14 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryPayFeeDetail" parameterType="Map" resultType="Map">
- select pfc.fee_name feeName,f.floor_num floorNum,bu.unit_num unitNum,br.room_num roomNum,oc.car_num carNum,
+ select pfc.fee_name feeName,f.floor_num floorNum,bu.unit_num unitNum,br.room_num roomNum,br.built_up_area
+ builtUpArea ,oc.car_num carNum,
pf.payer_obj_type payerObjType,t.start_time startTime,t.end_time endTime,t.create_time createTime,
t.receivable_amount receivableAmount,t.received_amount receivedAmount,pfa.`value`
importFeeName,t.prime_rate,d.name primeRate,fdr.discount_small_type discountSmallType,fdr.rule_name
ruleName,pfdd.discount_price discountPrice,co.contract_code contractCode,pfo.`value` ownerName,cb.o_id oId,
d2.name feeTypeCdName,pfc.fee_type_cd feeTypeCd,t.state,d3.name stateName,t.fee_id feeId,pft.`value` repairId,
- t.detail_id,t.detail_id detailId,pf.payer_obj_id
+ t.detail_id,t.detail_id detailId,pf.payer_obj_id,pfb.value ownerId,concat(pa.num,'鍋滆溅鍦�',ps.num,'杞︿綅') psName
from pay_fee_detail t
INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
@@ -1190,7 +1237,10 @@
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 owner_car oc on pf.payer_obj_id = oc.car_id and oc.car_type_cd='1001'
+ LEFT JOIN parking_space ps on oc.ps_id = ps.ps_id and ps.status_cd = '0'
+ left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
+ left join pay_fee_attrs pfb on t.fee_id = pfb.fee_id and pfb.spec_cd = '390007'
left join pay_fee_attrs pfo on t.fee_id = pfo.fee_id and pfo.spec_cd = '390008'
left join pay_fee_attrs pft on t.fee_id = pft.fee_id and pft.spec_cd = '390001'
left join pay_fee_detail_discount pfdd on t.detail_id = pfdd.detail_id and pfdd.status_cd = '0'
@@ -1806,6 +1856,7 @@
<select id="queryRepairForStaff" parameterType="Map" resultType="Map">
SELECT r.staff_id staffId,r.staff_name staffName,r.state FROM r_repair_user r
+ inner join u_user u on u.user_id = r.staff_id and u.status_cd = '0'
WHERE r.state!='10005' AND r.state!='10009' AND r.state!='11000' AND
r.state!='12000' AND r.state != '10007' AND r.status_cd = '0' AND
r.repair_event != 'payUser' AND r.repair_event != 'startUser' AND r.staff_id != '-1'
@@ -2152,7 +2203,8 @@
from f_floor t
left join building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
left join building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
- LEFT JOIN report_fee_month_statistics rfms on rfms.obj_id = br.room_id and rfms.obj_type = '3333' and rfms.status_cd = '0'
+ LEFT JOIN report_fee_month_statistics rfms on rfms.obj_id = br.room_id and rfms.obj_type = '3333' and
+ rfms.status_cd = '0'
where t.status_cd = '0'
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -2169,7 +2221,8 @@
from f_floor t
left join building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
left join building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
- inner join report_fee_month_statistics curT on curT.obj_id = br.room_id and curT.obj_type = '3333' and curT.status_cd = '0' and curT.community_id = t.community_id
+ inner join report_fee_month_statistics curT on curT.obj_id = br.room_id and curT.obj_type = '3333' and
+ curT.status_cd = '0' and curT.community_id = t.community_id
where t.status_cd = '0'
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -2197,7 +2250,8 @@
from f_floor t
left join building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
left join building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
- LEFT JOIN report_fee_month_statistics rfms on rfms.obj_id = br.room_id and rfms.obj_type = '3333' and rfms.status_cd = '0'
+ LEFT JOIN report_fee_month_statistics rfms on rfms.obj_id = br.room_id and rfms.obj_type = '3333' and
+ rfms.status_cd = '0'
where t.status_cd = '0'
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -2214,7 +2268,8 @@
from f_floor t
left join building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
left join building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
- inner join report_fee_month_statistics curT on curT.obj_id = br.room_id and curT.obj_type = '3333' and curT.status_cd = '0' and curT.community_id = t.community_id
+ inner join report_fee_month_statistics curT on curT.obj_id = br.room_id and curT.obj_type = '3333' and
+ curT.status_cd = '0' and curT.community_id = t.community_id
where t.status_cd = '0'
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -2250,12 +2305,13 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryHuaningPayFee" parameterType="Map" resultType="Map">
- select a.floorNum,f.receivableAmount,a.receivedAmount,b.receivedAmount1,c.receivedAmount2,d.receivedAmount3,e.receivedAmount4
+ select
+ a.floorNum,f.receivableAmount,a.receivedAmount,b.receivedAmount1,c.receivedAmount2,d.receivedAmount3,e.receivedAmount4
from
(select t.floor_num floorNum,sum(pfd.received_amount) receivedAmount
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
where 1=1
@@ -2267,10 +2323,11 @@
(select t.floor_num floorNum,sum(pfdm1.received_amount ) receivedAmount1
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
- LEFT JOIN pay_fee_detail_month pfdm1 on pf.fee_id = pfdm1.fee_id and pfd.detail_id = pfdm1.detail_id and pfdm1.status_cd = '0' and pfdm1.detail_year = #{year} and pfdm1.detail_month < #{month}
+ LEFT JOIN pay_fee_detail_month pfdm1 on pf.fee_id = pfdm1.fee_id and pfd.detail_id = pfdm1.detail_id and
+ pfdm1.status_cd = '0' and pfdm1.detail_year = #{year} and pfdm1.detail_month < #{month}
where 1=1
and t.status_cd = '0'
and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
@@ -2280,10 +2337,11 @@
(select t.floor_num floorNum,sum(pfdm2.received_amount ) receivedAmount2
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
- LEFT JOIN pay_fee_detail_month pfdm2 on pf.fee_id = pfdm2.fee_id and pfd.detail_id = pfdm2.detail_id and pfdm2.status_cd = '0' and pfdm2.detail_year = #{year} and pfdm2.detail_month = #{month}
+ LEFT JOIN pay_fee_detail_month pfdm2 on pf.fee_id = pfdm2.fee_id and pfd.detail_id = pfdm2.detail_id and
+ pfdm2.status_cd = '0' and pfdm2.detail_year = #{year} and pfdm2.detail_month = #{month}
where 1=1
and t.status_cd = '0'
and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
@@ -2293,10 +2351,11 @@
(select t.floor_num floorNum,sum(pfdm3.received_amount ) receivedAmount3
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
- LEFT JOIN pay_fee_detail_month pfdm3 on pf.fee_id = pfdm3.fee_id and pfd.detail_id = pfdm3.detail_id and pfdm3.status_cd = '0' and pfdm3.detail_year = #{nextYear} and pfdm3.detail_month = #{nextMonth}
+ LEFT JOIN pay_fee_detail_month pfdm3 on pf.fee_id = pfdm3.fee_id and pfd.detail_id = pfdm3.detail_id and
+ pfdm3.status_cd = '0' and pfdm3.detail_year = #{nextYear} and pfdm3.detail_month = #{nextMonth}
where 1=1
and t.status_cd = '0'
and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
@@ -2306,10 +2365,11 @@
(select t.floor_num floorNum,sum(pfdm4.received_amount ) receivedAmount4
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
- LEFT JOIN pay_fee_detail_month pfdm4 on pf.fee_id = pfdm4.fee_id and pfd.detail_id = pfdm4.detail_id and pfdm4.status_cd = '0' and pfdm4.detail_year < #{year}
+ LEFT JOIN pay_fee_detail_month pfdm4 on pf.fee_id = pfdm4.fee_id and pfd.detail_id = pfdm4.detail_id and
+ pfdm4.status_cd = '0' and pfdm4.detail_year < #{year}
where 1=1
and t.status_cd = '0'
and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
@@ -2319,7 +2379,7 @@
(select t.floor_num floorNum,SUM(rfms.receivable_amount) receivableAmount
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN report_fee_month_statistics rfms on rfms.obj_id = br.room_id and rfms.status_cd = '0'
where t.community_id = #{communityId}
and rfms.fee_year = #{year}
@@ -2345,7 +2405,7 @@
(select t.floor_num floorNum,sum(pfd.received_amount) receivedAmount
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
where 1=1
@@ -2357,10 +2417,11 @@
(select t.floor_num floorNum,SUM(pfdm1.discount_amount) receivedAmount1
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
- LEFT JOIN pay_fee_detail_month pfdm1 on pf.fee_id = pfdm1.fee_id and pfd.detail_id = pfdm1.detail_id and pfdm1.status_cd = '0' and pfdm1.detail_year = #{year} and pfdm1.detail_month < #{month}
+ LEFT JOIN pay_fee_detail_month pfdm1 on pf.fee_id = pfdm1.fee_id and pfd.detail_id = pfdm1.detail_id and
+ pfdm1.status_cd = '0' and pfdm1.detail_year = #{year} and pfdm1.detail_month < #{month}
where 1=1
and t.status_cd = '0'
and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
@@ -2370,10 +2431,11 @@
(select t.floor_num floorNum,SUM(pfdm2.received_amount) receivedAmount2
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
- LEFT JOIN pay_fee_detail_month pfdm2 on pf.fee_id = pfdm2.fee_id and pfd.detail_id = pfdm2.detail_id and pfdm2.status_cd = '0' and pfdm2.detail_year = #{year} and pfdm2.detail_month > #{month}
+ LEFT JOIN pay_fee_detail_month pfdm2 on pf.fee_id = pfdm2.fee_id and pfd.detail_id = pfdm2.detail_id and
+ pfdm2.status_cd = '0' and pfdm2.detail_year = #{year} and pfdm2.detail_month > #{month}
where 1=1
and t.status_cd = '0'
and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
@@ -2383,7 +2445,7 @@
(select t.floor_num floorNum,SUM(rfms.owe_amount) receivableAmount
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN report_fee_month_statistics rfms on rfms.obj_id = br.room_id and rfms.status_cd = '0'
where t.community_id= #{communityId}
group by t.floor_num
@@ -2403,7 +2465,7 @@
(select t.floor_num floorNum,sum(pfd.received_amount) receivedAmount
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
where 1=1
@@ -2415,10 +2477,11 @@
(select t.floor_num floorNum,SUM(pfdm1.discount_amount) receivedAmount1
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
- LEFT JOIN pay_fee_detail_month pfdm1 on pf.fee_id = pfdm1.fee_id and pfd.detail_id = pfdm1.detail_id and pfdm1.status_cd = '0' and pfdm1.detail_year = #{year} and pfdm1.detail_month < #{month}
+ LEFT JOIN pay_fee_detail_month pfdm1 on pf.fee_id = pfdm1.fee_id and pfd.detail_id = pfdm1.detail_id and
+ pfdm1.status_cd = '0' and pfdm1.detail_year = #{year} and pfdm1.detail_month < #{month}
where 1=1
and t.status_cd = '0'
and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
@@ -2428,10 +2491,11 @@
(select t.floor_num floorNum,SUM(pfdm2.received_amount) receivedAmount2
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
- LEFT JOIN pay_fee_detail_month pfdm2 on pf.fee_id = pfdm2.fee_id and pfd.detail_id = pfdm2.detail_id and pfdm2.status_cd = '0' and pfdm2.detail_year = #{year} and pfdm2.detail_month > #{month}
+ LEFT JOIN pay_fee_detail_month pfdm2 on pf.fee_id = pfdm2.fee_id and pfd.detail_id = pfdm2.detail_id and
+ pfdm2.status_cd = '0' and pfdm2.detail_year = #{year} and pfdm2.detail_month > #{month}
where 1=1
and t.status_cd = '0'
and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
@@ -2441,7 +2505,7 @@
(select t.floor_num floorNum,SUM(rfms.owe_amount) receivableAmount
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
- inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
+ inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
inner JOIN report_fee_month_statistics rfms on rfms.obj_id = br.room_id and rfms.status_cd = '0'
where t.community_id= #{communityId}
group by t.floor_num
@@ -2508,4 +2572,21 @@
</if>
</select>
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <select id="queryRoomAndParkingSpace" parameterType="Map" resultType="Map">
+ select
+ br.room_id roomId,br.room_num roomNum,bu.unit_num unitNum,f.floor_num floorNum,t.owner_id ownerId
+ from building_owner_room_rel t
+ left join building_room br on t.room_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 t.status_cd = '0'
+ and t.owner_id in
+ <foreach collection="ownerIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </select>
+
+
+
</mapper>
--
Gitblit v1.8.0