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 | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index be9ef1f..439c6fe 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -776,7 +776,8 @@
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_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'
@@ -1161,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
@@ -1224,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'
@@ -1238,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'
@@ -1854,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'
@@ -2569,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