From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 182 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 138 insertions(+), 44 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index e1c92f7..4814360 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -145,9 +145,7 @@
<if test="oweAmount !=null and oweAmount != ''">
, t.owe_amount= #{oweAmount}
</if>
- <if test="communityId !=null and communityId != ''">
- , t.community_id= #{communityId}
- </if>
+
<if test="feeCreateTime !=null and feeCreateTime != ''">
, t.fee_create_time= #{feeCreateTime}
</if>
@@ -155,10 +153,32 @@
, t.obj_type= #{objType}
</if>
where 1=1
+ and t.statistics_id= #{statisticsId}
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+
+ </update>
+
+ <!-- 淇敼璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <update id="deleteReportFeeMonthStatisticsInfo" parameterType="Map">
+ update report_fee_month_statistics t set t.status_cd = '1'
+ where 1=1
<if test="statisticsId !=null and statisticsId != ''">
and t.statistics_id= #{statisticsId}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
+ </if>
+
</update>
+
<!-- 鏌ヨ璐圭敤鏈堢粺璁℃暟閲� add by wuxw 2018-07-03 -->
<select id="queryReportFeeMonthStatisticssCount" parameterType="Map" resultType="Map">
@@ -277,7 +297,7 @@
<select id="queryReportFeeSummary" parameterType="Map" resultType="Map">
select t.fee_year feeYear,t.fee_month feeMonth,t.create_time createTime,SUM(t.receivable_amount)
receivableAmount,SUM(t.received_amount)
- receivedAmount,SUM(t.owe_amount) oweAmount
+ receivedAmount,SUM(t.owe_amount) oweAmount,max(t.update_time) updateTime
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'
@@ -436,8 +456,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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,t.create_time
- createTime,
+ 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
from report_fee_month_statistics t
INNER JOIN building_room br on t.obj_id = br.room_id and br.status_cd = '0'
@@ -609,7 +629,7 @@
<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
+ receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount) oweAmount,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'
@@ -782,9 +802,9 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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,t.deadline_time
+ select t.obj_name objName,t.fee_name feeName,t.fee_create_time feeCreateTime,max(t.deadline_time)
deadlineTime,t.create_time createTime,SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount)
- receivedAmount,SUM(t.owe_amount) oweAmount
+ receivedAmount,SUM(t.owe_amount) oweAmount,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'
@@ -831,7 +851,7 @@
<if test="endTime !=null">
and t.create_time <= #{endTime}
</if>
- group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,t.deadline_time
+ group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -940,8 +960,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.create_time
- createTime,SUM(t.amount_owed) oweAmount,max(t.deadline_time) deadlineTime
+ select t.payer_obj_name objName,t.fee_name feeName,pf.end_time feeCreateTime,t.update_time
+ updateTime,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'
@@ -1083,7 +1103,7 @@
and pfc.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
- and t.obj_id= #{objId}
+ and pf.payer_obj_id= #{objId}
</if>
<if test="feeName !=null and feeName != ''">
and t.fee_name= #{feeName}
@@ -1164,7 +1184,7 @@
and pfc.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
- and t.obj_id= #{objId}
+ and pf.payer_obj_id = #{objId}
</if>
<if test="feeName !=null and feeName != ''">
and t.fee_name= #{feeName}
@@ -1229,7 +1249,7 @@
and pfc.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
- and t.obj_id= #{objId}
+ and pf.payer_obj_id= #{objId}
</if>
<if test="feeName !=null and feeName != ''">
and t.fee_name= #{feeName}
@@ -1294,7 +1314,7 @@
and pfc.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
- and t.obj_id= #{objId}
+ and pf.payer_obj_id= #{objId}
</if>
<if test="feeName !=null and feeName != ''">
and t.fee_name= #{feeName}
@@ -2272,45 +2292,117 @@
<select id="queryHuaningPayFeeTwoCount" parameterType="Map" resultType="Map">
select count(1) count
from (
- select t.floor_num floorNum,sum(pfdm.receivable_amount) receivableAmount ,
- sum(pfdm.received_amount) receivedAmount,SUM(pfdm1.discount_amount) receivedAmount1,
- SUM(pfdm2.received_amount) receivedAmount2
+ select a.floorNum,d.receivableAmount ,
+ a.receivedAmount,b.receivedAmount1,
+ c.receivedAmount2
+ from
+ (select t.floor_num floorNum,sum(pfd.received_amount) receivedAmount
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 pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
- LEFT join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
- LEFT JOIN pay_fee_detail_month pfdm on pf.fee_id = pfdm.fee_id and pfd.detail_id = pfdm.detail_id and pfdm.status_cd = '0'
+ 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 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
+ and t.status_cd = '0'
+ and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
+ and t.community_id= #{communityId}
+ GROUP BY floor_num
+ ) a,
+ (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 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}
+ where 1=1
+ and t.status_cd = '0'
+ and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
+ and t.community_id= #{communityId}
+ GROUP BY floor_num
+ ) b,
+ (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 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}
where 1=1
- and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
- <if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
- </if>
- GROUP BY t.floor_num
+ and t.status_cd = '0'
+ and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
+ and t.community_id= #{communityId}
+ GROUP BY floor_num
+ ) c,
+ (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 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
+ ) d
+ where a.floorNum = b.floorNum
+ and b.floorNum = c.floorNum
+ and c.floorNum = d.floorNum
) tt
</select>
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryHuaningPayFeeTwo" parameterType="Map" resultType="Map">
- select t.floor_num floorNum,sum(pfdm.receivable_amount) receivableAmount ,
- sum(pfdm.received_amount) receivedAmount,SUM(pfdm1.discount_amount) receivedAmount1,
- SUM(pfdm2.received_amount) receivedAmount2
+ select a.floorNum,d.receivableAmount ,
+ a.receivedAmount,b.receivedAmount1,
+ c.receivedAmount2
+ from
+ (select t.floor_num floorNum,sum(pfd.received_amount) receivedAmount
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 pay_fee pf on pf.payer_obj_id = br.room_id and pf.status_cd = '0'
- LEFT join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
- LEFT JOIN pay_fee_detail_month pfdm on pf.fee_id = pfdm.fee_id and pfd.detail_id = pfdm.detail_id and pfdm.status_cd = '0'
+ 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 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
+ and t.status_cd = '0'
+ and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
+ and t.community_id= #{communityId}
+ GROUP BY floor_num
+ ) a,
+ (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 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}
+ where 1=1
+ and t.status_cd = '0'
+ and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
+ and t.community_id= #{communityId}
+ GROUP BY floor_num
+ ) b,
+ (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 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}
where 1=1
- and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
- <if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
- </if>
- GROUP BY t.floor_num
+ and t.status_cd = '0'
+ and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
+ and t.community_id= #{communityId}
+ GROUP BY floor_num
+ ) c,
+ (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 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
+ ) d
+ where a.floorNum = b.floorNum
+ and b.floorNum = c.floorNum
+ and c.floorNum = d.floorNum
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -2318,7 +2410,8 @@
<select id="queryHuaningOweFeeDetailCount" parameterType="Map" resultType="Map">
select count(1) count
from (
- select t.payer_obj_name payerObjName,br.built_up_area builtUpArea,pfc.square_price squarePrice, t.fee_id feeId,t.end_time startTime,t.deadline_time endTime,t.amount_owed oweAmount
+ select t.payer_obj_name payerObjName,br.built_up_area builtUpArea,pfc.square_price squarePrice, t.fee_id
+ feeId,t.end_time startTime,t.deadline_time endTime,t.amount_owed oweAmount
from report_owe_fee t
left join building_room br on t.payer_obj_id = br.room_id and br.status_cd = '0'
left join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
@@ -2332,7 +2425,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryHuaningOweFeeDetail" parameterType="Map" resultType="Map">
- select t.payer_obj_name payerObjName,br.built_up_area builtUpArea,pfc.square_price squarePrice, t.fee_id feeId,t.end_time startTime,t.deadline_time endTime,t.amount_owed oweAmount
+ select t.payer_obj_name payerObjName,br.built_up_area builtUpArea,pfc.square_price squarePrice, t.fee_id
+ feeId,t.end_time startTime,t.deadline_time endTime,t.amount_owed oweAmount
from report_owe_fee t
left join building_room br on t.payer_obj_id = br.room_id and br.status_cd = '0'
left join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
--
Gitblit v1.8.0