From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 659 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 579 insertions(+), 80 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index df23623..4f3b5c3 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'
@@ -103,6 +104,7 @@
and t.fee_id= #{feeId}
</if>
</update>
+
<!-- 淇敼璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<update id="updateReportFeeMonthStatisticsInfo" parameterType="Map">
@@ -325,8 +327,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'
@@ -387,10 +391,131 @@
</if>
</select>
+ <select id="queryReportFeeSummaryDetailCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ 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'
+ left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ 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'
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and f.floor_id = #{floorId}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="feeYear !=null and feeYear != ''">
+ and t.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and t.fee_month= #{feeMonth}
+ </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>
+ <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>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name= #{feeName}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time <= #{endTime}
+ </if>
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <select id="queryReportFeeSummaryDetail" parameterType="Map" resultType="Map">
+ select t.obj_name objName,t.fee_name feeName,t.fee_year feeYear,t.fee_month feeMonth,t.create_time createTime
+ ,t.config_id configId
+ ,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,
+ t.update_time updateTime,t.his_owe_amount+t.cur_receivable_amount
+ receivableAmount,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'
+ left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ 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'
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and f.floor_id = #{floorId}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="feeYear !=null and feeYear != ''">
+ and t.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and t.fee_month= #{feeMonth}
+ </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>
+ <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>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name= #{feeName}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time <= #{endTime}
+ </if>
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 澶ц 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'
@@ -511,7 +636,8 @@
,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,
+ 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
@@ -575,10 +701,143 @@
</if>
</select>
+ <select id="queryReportFloorUnitFeeSummaryDetailCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ 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'
+ inner join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ 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'
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="unitNum !=null and unitNum != ''">
+ and bu.unit_num= #{unitNum}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and f.floor_id = #{floorId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and f.floor_num = #{floorNum}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="feeYear !=null and feeYear != ''">
+ and t.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and t.fee_month= #{feeMonth}
+ </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>
+ <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>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name= #{feeName}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time <= #{endTime}
+ </if>
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <select id="queryReportFloorUnitFeeSummaryDetail" parameterType="Map" resultType="Map">
+ select t.obj_name objName,t.fee_name feeName,t.fee_year feeYear,t.fee_month feeMonth,t.create_time createTime
+ ,t.config_id configId
+ ,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,
+ t.update_time updateTime,t.his_owe_amount+t.cur_receivable_amount receivableAmount,
+ 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'
+ inner join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ 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'
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="unitNum !=null and unitNum != ''">
+ and bu.unit_num= #{unitNum}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and f.floor_id = #{floorId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and f.floor_num = #{floorNum}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="feeYear !=null and feeYear != ''">
+ and t.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and t.fee_month= #{feeMonth}
+ </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>
+ <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>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name= #{feeName}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time <= #{endTime}
+ </if>
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryReportFloorUnitFeeSummaryMajor" 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
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'
@@ -686,7 +945,7 @@
and pfc.start_time <= #{endTime}
</if>
<if test="yearMonth !=null and yearMonth != ''">
- and concat(t.fee_year,t.fee_month) = #{yearMonth}
+ and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
</if>
group by t.config_id,t.fee_name,pfc.start_time
@@ -697,10 +956,13 @@
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,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,
+ select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,t.config_id configId,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
+ 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'
@@ -753,7 +1015,7 @@
and pfc.start_time <= #{endTime}
</if>
<if test="yearMonth !=null and yearMonth != ''">
- and concat(t.fee_year,t.fee_month) = #{yearMonth}
+ and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
</if>
group by t.config_id,t.fee_name,pfc.start_time
order by t.create_time desc
@@ -761,9 +1023,9 @@
limit #{page}, #{row}
</if>
</select>
- <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) allReceivedAmount
+
+ <select id="queryFeeBreakdownDetailCount" parameterType="Map" resultType="Map">
+ select count(1) count
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'
@@ -815,6 +1077,146 @@
<if test="endTime !=null and endTime != ''">
and pfc.start_time <= #{endTime}
</if>
+ <if test="yearMonth !=null and yearMonth != ''">
+ and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
+ </if>
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03
+ and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
+ -->
+ <select id="queryFeeBreakdownDetail" parameterType="Map" resultType="Map">
+ select t.obj_name objName,t.fee_name feeName,t.fee_year feeYear,t.fee_month feeMonth,t.create_time createTime
+ ,t.config_id configId,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,
+ t.update_time updateTime,t.his_owe_amount+t.cur_receivable_amount receivableAmount,
+ t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount receivedAmount,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'
+ 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 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'
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and f.floor_id = #{floorId}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="feeYear !=null and feeYear != ''">
+ and t.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and t.fee_month= #{feeMonth}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and pfc.config_id= #{configId}
+ </if>
+ <if test="objId !=null and objId != ''">
+ and t.obj_id= #{objId}
+ </if>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name= #{feeName}
+ </if>
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pfc.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and pfc.start_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and pfc.start_time <= #{endTime}
+ </if>
+ <if test="yearMonth !=null and yearMonth != ''">
+ and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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.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'
+ 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 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'
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and f.floor_id = #{floorId}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="feeYear !=null and feeYear != ''">
+ and t.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and t.fee_month= #{feeMonth}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and pfc.config_id= #{configId}
+ </if>
+ <if test="objId !=null and objId != ''">
+ and t.obj_id= #{objId}
+ </if>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name= #{feeName}
+ </if>
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pfc.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and pfc.start_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and pfc.start_time <= #{endTime}
+ </if>
+ <if test="yearMonth !=null and yearMonth != ''">
+ and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
+ </if>
order by t.create_time desc
</select>
@@ -863,10 +1265,10 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and t.fee_create_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- and t.create_time <= #{endTime}
+ and t.deadline_time <= #{endTime}
</if>
group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,t.deadline_time
) t
@@ -874,9 +1276,14 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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)
- 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
+ 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,max(t.update_time) updateTime,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,
+ 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 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'
@@ -884,7 +1291,7 @@
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
left join pay_fee_attrs pfa on pf.fee_id = pfa.fee_id and pfa.spec_cd = '390008' and pfa.status_cd ='0'
- where t.status_cd = '0' and t.receivable_amount >=0 and t.receivable_amount >= 0
+ where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -919,12 +1326,13 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and t.fee_create_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- and t.create_time <= #{endTime}
+ and t.deadline_time <= #{endTime}
</if>
group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,pfa.`value`,br.built_up_area
+ order by pfa.`value`
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -932,8 +1340,14 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryAllFeeDetail" parameterType="Map" resultType="Map">
- select SUM(t.receivable_amount) allReceivableAmount,SUM(t.received_amount) allReceivedAmount,
- SUM(t.owe_amount) allOweAmount from report_fee_month_statistics t
+ 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'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
@@ -974,10 +1388,10 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and t.fee_create_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- and t.create_time <= #{endTime}
+ and t.deadline_time <= #{endTime}
</if>
</select>
@@ -1026,6 +1440,7 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
+ and t.amount_owed > 0
group by t.fee_name,t.payer_obj_id,t.payer_obj_name
HAVING oweAmount > 0
) t
@@ -1034,7 +1449,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'
@@ -1076,8 +1492,10 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
+ and t.amount_owed > 0
group by t.fee_name,t.payer_obj_id,t.payer_obj_name,pfa.`value`,br.built_up_area
HAVING oweAmount > 0
+ order by t.payer_obj_name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -1135,16 +1553,13 @@
t.receivable_amount receivableAmount,t.received_amount receivedAmount,d.name,d2.name feeTypeCdName,
pfc.fee_type_cd feeTypeCd,t.state,d3.name stateName
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'
+ left JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
left join building_room br on pf.payer_obj_id = br.room_id and pf.payer_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'
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
@@ -1205,21 +1620,25 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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'
+ left JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
left join building_room br on pf.payer_obj_id = br.room_id and pf.payer_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'
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'
@@ -1291,8 +1710,8 @@
<select id="queryAllPayFeeDetail" parameterType="Map" resultType="Map">
select SUM(t.receivable_amount) allReceivableAmount,SUM(t.received_amount) allReceivedAmount
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'
+ left JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
left join building_room br on pf.payer_obj_id = br.room_id and pf.payer_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'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
@@ -1351,8 +1770,8 @@
ruleName,pfdd.discount_price,
SUM(pfdd.discount_price) discountPrice
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'
+ left JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
left join building_room br on pf.payer_obj_id = br.room_id and pf.payer_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'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
@@ -1835,6 +2254,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'
@@ -1852,33 +2272,61 @@
</select>
<select id="getReceivableInformation" parameterType="Map" resultType="Map">
- select sum(t.receivable_amount) receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount)
- oweAmount
+ select a.receivableAmount,a.receivedAmount, IF(a.receivableAmount <
+ a.oweReceivedAmount,'0',a.receivableAmount-a.oweReceivedAmount) oweAmount
+ from (
+ select 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+t.his_owe_received_amount) oweReceivedAmount
from report_fee_month_statistics t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
- where t.community_id = #{communityId}
+ where 1=1
+ and t.fee_year= #{feeYear}
+ and t.fee_month= #{feeMonth}
+ and t.community_id = #{communityId}
+ ) a
</select>
<select id="getFloorReceivableInformation" parameterType="Map" resultType="Map">
- select f.floor_num floorNum,f.`name`,sum(t.receivable_amount) receivableAmount,SUM(t.received_amount)
- receivedAmount,SUM(t.owe_amount) oweAmount
+ select a.floorNum,a.`name`,a.receivableAmount,a.receivedAmount, IF(a.receivableAmount <
+ a.oweReceivedAmount,'0',a.receivableAmount-a.oweReceivedAmount) oweAmount
+ from (
+ select f.floor_num floorNum,f.`name`,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+t.his_owe_received_amount) oweReceivedAmount
from report_fee_month_statistics t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
inner join building_room br on br.room_id = t.obj_id and t.obj_type = '3333' and br.community_id =
t.community_id and br.status_cd = '0'
inner join building_unit bu on bu.unit_id = br.unit_id and bu.status_cd = '0'
inner join f_floor f on f.floor_id = bu.floor_id and f.status_cd = '0'
- where t.community_id = #{communityId}
+ where 1=1
+ and t.fee_year= #{feeYear}
+ and t.fee_month= #{feeMonth}
+ and t.community_id = #{communityId}
group by f.floor_num ,f.`name`
+ ) a
</select>
<select id="getFeeConfigReceivableInformation" parameterType="Map" resultType="Map">
- select t.fee_name feeName,sum(t.receivable_amount) receivableAmount,SUM(t.received_amount)
- receivedAmount,SUM(t.owe_amount) oweAmount
+ select a.feeName,a.receivableAmount,a.receivedAmount, IF(a.receivableAmount <
+ a.oweReceivedAmount,'0',a.receivableAmount-a.oweReceivedAmount) oweAmount
+ from (
+ select t.fee_name feeName,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+t.his_owe_received_amount) oweReceivedAmount
from report_fee_month_statistics t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
- where t.community_id = #{communityId}
+ left join building_room br on br.room_id = t.obj_id and t.obj_type = '3333' and br.community_id =
+ t.community_id and br.status_cd = '0'
+ left join building_unit bu on bu.unit_id = br.unit_id and bu.status_cd = '0'
+ left join f_floor f on f.floor_id = bu.floor_id and f.status_cd = '0'
+ where 1=1
+ and t.fee_year= #{feeYear}
+ and t.fee_month= #{feeMonth}
+ and t.community_id = #{communityId}
group by t.fee_name
+ ) a
</select>
@@ -1909,7 +2357,7 @@
select 1 from pay_fee pf where t.room_id = pf.payer_obj_id and pf.status_cd = '0' and pf.state = '2008001'
)
and t.community_id = #{communityId}
- order by t.create_time desc
+ order by bo.name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -2181,7 +2629,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}
@@ -2192,13 +2641,20 @@
<if test="objName !=null and objName != ''">
and rfms.obj_name= #{objName}
</if>
+ <if test="feeYear !=null and feeYear != ''">
+ and t.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and t.fee_month= #{feeMonth}
+ </if>
GROUP BY t.floor_num
) a,
(select t.floor_num floorNum,SUM(curT.owe_amount) curOweAmount
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}
@@ -2226,7 +2682,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}
@@ -2243,7 +2700,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}
@@ -2279,12 +2737,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
@@ -2296,10 +2755,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}
@@ -2309,10 +2769,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}
@@ -2322,10 +2783,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}
@@ -2335,10 +2797,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}
@@ -2348,7 +2811,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}
@@ -2374,7 +2837,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
@@ -2386,10 +2849,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}
@@ -2399,10 +2863,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}
@@ -2412,7 +2877,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
@@ -2432,7 +2897,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
@@ -2444,10 +2909,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}
@@ -2457,10 +2923,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}
@@ -2470,7 +2937,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
@@ -2524,17 +2991,49 @@
and t.create_time < #{endTime}
and t.fee_id = #{feeId}
<if test="flag == 1">
- and concat(t.detail_year,t.detail_month) = #{yearMonth}
+ and concat(t.detail_year,lpad(t.detail_month,2,0)) = #{yearMonth}
</if>
<if test="flag == 2">
- and concat(t.detail_year,t.detail_month) < #{yearMonth}
+ and concat(t.detail_year,lpad(t.detail_month,2,0)) < #{yearMonth}
</if>
<if test="flag == 3">
- and concat(t.detail_year,t.detail_month) > #{yearMonth}
+ and concat(t.detail_year,lpad(t.detail_month,2,0)) > #{yearMonth}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</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>
+
+ <!-- 鏌ヨ鏃犳晥璐圭敤 add by wuxw 2018-07-03 -->
+ <select id="queryInvalidFeeMonthStatistics" parameterType="Map" resultType="Map">
+ select t.fee_id feeId from pay_fee t
+ inner join pay_fee_config pfc on t.config_id = pfc.config_id
+ inner join report_fee_month_statistics rfms on t.fee_id = rfms.fee_id and rfms.status_cd = '0'
+ where (t.status_cd = '1' or pfc.status_cd = '1')
+ and t.community_id= #{communityId}
+ </select>
+
+ <!--娓呯悊鎶ヨ〃 鏃犳晥鏁版嵁-->
+ <update id="deleteInvalidFee" parameterType="Map">
+ delete from report_fee_month_statistics where fee_id in
+ <foreach collection="feeIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ and community_id = #{communityId}
+ </update>
</mapper>
--
Gitblit v1.8.0