From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 1010 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 932 insertions(+), 78 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index f0aae7a..dfcab70
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -8,10 +8,10 @@
<insert id="saveReportFeeMonthStatisticsInfo" parameterType="Map">
insert into report_fee_month_statistics(
receivable_amount,statistics_id,update_time,remark,obj_name,received_amount,fee_year,fee_month,fee_id,config_id,
- obj_id,fee_name,owe_amount,community_id,fee_create_time,obj_type,deadline_time
+ obj_id,fee_name,owe_amount,community_id,fee_create_time,obj_type,deadline_time,cur_max_time
) values (
#{receivableAmount},#{statisticsId},#{updateTime},#{remark},#{objName},#{receivedAmount},#{feeYear},#{feeMonth},
- #{feeId},#{configId},#{objId},#{feeName},#{oweAmount},#{communityId},#{feeCreateTime},#{objType},#{deadlineTime}
+ #{feeId},#{configId},#{objId},#{feeName},#{oweAmount},#{communityId},#{feeCreateTime},#{objType},#{deadlineTime},#{curMaxTime}
)
</insert>
@@ -23,7 +23,7 @@
feeYear,t.fee_month,t.fee_month feeMonth,t.fee_id,t.fee_id feeId,t.config_id,t.config_id
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
+ feeCreateTime,t.obj_type,t.obj_type objType,t.cur_max_time curMaxTime
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'
where 1 =1
@@ -92,11 +92,8 @@
<if test="statisticsId !=null and statisticsId != ''">
and t.statistics_id= #{statisticsId}
</if>
- <if test="feeYear !=null ">
- and t.fee_year <= #{feeYear}
- </if>
- <if test="feeMonth !=null ">
- and t.fee_month <= #{feeMonth}
+ <if test="curMaxTime !=null ">
+ and t.cur_max_time <= #{curMaxTime}
</if>
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
@@ -148,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>
@@ -158,9 +153,11 @@
, t.obj_type= #{objType}
</if>
where 1=1
- <if test="statisticsId !=null and statisticsId != ''">
- and t.statistics_id= #{statisticsId}
+ and t.statistics_id= #{statisticsId}
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
</if>
+
</update>
<!-- 鏌ヨ璐圭敤鏈堢粺璁℃暟閲� add by wuxw 2018-07-03 -->
@@ -286,7 +283,6 @@
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}
@@ -330,6 +326,58 @@
group by t.fee_year,t.fee_month
<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.receivable_amount)
+ allReceivableAmount,SUM(t.received_amount)
+ allReceivedAmount,SUM(t.owe_amount) allOweAmount
+ 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="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 t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.create_time <= #{endTime}
</if>
</select>
@@ -443,6 +491,59 @@
</if>
</select>
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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
+ 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="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="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 t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.create_time <= #{endTime}
+ </if>
+ </select>
+
<select id="queryFeeBreakdownCount" parameterType="Map" resultType="Map">
select count(1) count
from (
@@ -457,8 +558,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'
+ where t.status_cd = '0' and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -496,10 +596,10 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null">
- and t.create_time >= #{startTime}
+ and pfc.start_time >= #{startTime}
</if>
<if test="endTime !=null">
- and t.create_time <= #{endTime}
+ and pfc.start_time <= #{endTime}
</if>
group by t.config_id,t.fee_name,pfc.start_time
) t
@@ -507,8 +607,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryFeeBreakdown" parameterType="Map" resultType="Map">
- select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,pfc.start_time feeCreateTime,t.create_time
- createTime,SUM(t.receivable_amount)
+ 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
from report_fee_month_statistics t
inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
@@ -518,8 +618,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'
+ where t.status_cd = '0' and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -557,15 +656,74 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null">
- and t.create_time >= #{startTime}
+ and pfc.start_time >= #{startTime}
</if>
<if test="endTime !=null">
- and t.create_time <= #{endTime}
+ and pfc.start_time <= #{endTime}
</if>
group by t.config_id,t.fee_name,pfc.start_time
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
+ </select>
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <select id="queryFeeBreakdownMajor" 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
+ 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' and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 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 pfc.start_time >= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and pfc.start_time <= #{endTime}
+ </if>
+ order by t.create_time desc
</select>
<select id="queryFeeDetailCount" parameterType="Map" resultType="Map">
@@ -578,7 +736,6 @@
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}
@@ -634,7 +791,7 @@
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'
+ where t.status_cd = '0' and t.receivable_amount >=0 and t.receivable_amount >= 0
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -734,14 +891,15 @@
<select id="queryOweFeeDetailCount" parameterType="Map" resultType="Map">
select count(1) count
from (
- select t.obj_name objName,t.fee_name feeName,pfc.start_time,SUM(t.owe_amount) oweAmount
- from report_fee_month_statistics t
+ 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
+ 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.obj_id = br.room_id and t.obj_type = '3333' and br.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'
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'
+ where 1=1
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -752,13 +910,7 @@
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}
+ and t.payer_obj_name= #{objName}
</if>
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
@@ -767,7 +919,7 @@
and t.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
- and t.obj_id= #{objId}
+ and t.payer_obj_id= #{objId}
</if>
<if test="feeName !=null and feeName != ''">
and t.fee_name= #{feeName}
@@ -781,24 +933,22 @@
<if test="endTime !=null">
and t.create_time <= #{endTime}
</if>
- group by t.config_id,t.fee_name,pfc.start_time,t.obj_id,t.obj_name
+ group by t.fee_name,t.payer_obj_id,t.payer_obj_name
HAVING oweAmount > 0
) t
</select>
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryOweFeeDetail" parameterType="Map" resultType="Map">
- select t.obj_name objName,t.fee_name feeName,t.fee_create_time feeCreateTime,t.create_time
- createTime,SUM(t.receivable_amount)
- receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount) oweAmount
- from report_fee_month_statistics t
+ 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
+ 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.obj_id = br.room_id and t.obj_type = '3333' and br.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'
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'
+ where 1=1
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -809,13 +959,7 @@
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}
+ and t.payer_obj_name= #{objName}
</if>
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
@@ -824,7 +968,7 @@
and t.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
- and t.obj_id= #{objId}
+ and t.payer_obj_id= #{objId}
</if>
<if test="feeName !=null and feeName != ''">
and t.fee_name= #{feeName}
@@ -838,10 +982,54 @@
<if test="endTime !=null">
and t.create_time <= #{endTime}
</if>
- group by t.config_id,t.fee_name,pfc.start_time,t.obj_id,t.obj_name
+ group by t.fee_name,t.payer_obj_id,t.payer_obj_name
HAVING oweAmount > 0
<if test="page != -1 and page != null ">
limit #{page}, #{row}
+ </if>
+ </select>
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <select id="queryOweFeeDetailMajor" parameterType="Map" resultType="Map">
+ select SUM(t.amount_owed) oweAmount
+ 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'
+ 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 1=1
+ <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.payer_obj_name= #{objName}
+ </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="objId !=null and objId != ''">
+ and t.payer_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 t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.create_time <= #{endTime}
</if>
</select>
@@ -850,7 +1038,8 @@
from (
select pfc.fee_name feeName,f.floor_num floorNum,bu.unit_num unitNum,br.room_num roomNum,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,d.name
+ 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'
@@ -864,6 +1053,10 @@
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
+ = "fee_type_cd"
+ left join t_dict d3 on t.state = d3.status_cd and d3.table_name = "pay_fee_detail" and d3.table_columns =
+ "state"
where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -890,7 +1083,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}
@@ -900,6 +1093,12 @@
</if>
<if test="primeRate != null and primeRate != ''">
and t.prime_rate = #{primeRate}
+ </if>
+ <if test="state != null and state != ''">
+ and t.state = #{state}
+ </if>
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pfc.fee_type_cd = #{feeTypeCd}
</if>
<if test="startTime !=null">
and t.create_time >= #{startTime}
@@ -916,20 +1115,29 @@
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
+ 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
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 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.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' 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_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'
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
+ = "fee_type_cd"
+ left join t_dict d3 on t.state = d3.status_cd and d3.table_name = "pay_fee_detail" and d3.table_columns =
+ "state"
+ LEFT JOIN contract co on pf.payer_obj_id = co.contract_id and co.status_cd = '0' and pf.payer_obj_type='7777'
+ LEFT JOIN c_business cb on t.b_id = cb.b_id
where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -956,7 +1164,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}
@@ -966,6 +1174,12 @@
</if>
<if test="primeRate != null and primeRate != ''">
and t.prime_rate = #{primeRate}
+ </if>
+ <if test="state != null and state != ''">
+ and t.state = #{state}
+ </if>
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pfc.fee_type_cd = #{feeTypeCd}
</if>
<if test="startTime !=null">
and t.create_time >= #{startTime}
@@ -987,9 +1201,9 @@
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.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
- where t.status_cd = '0'
+ where t.status_cd = '0' and t.state not in ('1100','1300')
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -1015,7 +1229,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}
@@ -1047,14 +1261,14 @@
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.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' 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"
- where t.status_cd = '0'
+ where t.status_cd = '0' and t.state not in ('1100','1300')
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -1080,7 +1294,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}
@@ -1115,7 +1329,6 @@
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}
@@ -1229,7 +1442,8 @@
left join building_room br on t.payer_obj_id = br.room_id and t.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 f.floor_id = bu.floor_id and f.status_cd = '0'
- left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and
+ oc.car_type_cd='1001'
where t.state = '2008001'
and t.status_cd = '0'
<if test="communityId !=null and communityId != ''">
@@ -1253,7 +1467,8 @@
left join building_room br on t.payer_obj_id = br.room_id and t.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 f.floor_id = bu.floor_id and f.status_cd = '0'
- left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and
+ oc.car_type_cd='1001'
where t.state = '2008001'
and t.status_cd = '0'
<if test="communityId !=null and communityId != ''">
@@ -1466,9 +1681,11 @@
</select>
<select id="getRepairWithOutPage" parameterType="Map" resultType="Map">
- select r.staff_id staffId,r.staff_name staffName,r.state, t.name stateName, count(*) amount from r_repair_user r
+ select r.staff_id staffId,r.staff_name staffName,r.state, t.name stateName,u.score, count(*) amount from
+ r_repair_user r
left join t_dict t on t.table_name="r_repair_user" and t.table_columns="state" and t.status_cd=r.state
- where r.state != "10005" and r.status_cd = "0"
+ left join u_user u on u.user_id = r.staff_id and u.status_cd = '0'
+ where r.state != '10005' and r.status_cd = '0'
<if test="ruId != null and ruId != ''">
and r.ru_id = #{ruId}
</if>
@@ -1522,9 +1739,10 @@
</select>
<select id="queryRepairForStaff" parameterType="Map" resultType="Map">
- SELECT r.staff_id staffId,r.staff_name staffName FROM r_repair_user r
- WHERE r.state!='10005' AND
- r.repair_event!='payUser' AND r.repair_event!="startUser"
+ SELECT r.staff_id staffId,r.staff_name staffName,r.state FROM r_repair_user r
+ 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'
<if test="communityId != null and communityId !=''">
and r.community_id = #{communityId}
</if>
@@ -1547,10 +1765,12 @@
</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 f.floor_num floorNum,f.`name`,sum(t.receivable_amount) receivableAmount,SUM(t.received_amount)
+ receivedAmount,SUM(t.owe_amount) oweAmount
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_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}
@@ -1558,11 +1778,645 @@
</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 t.fee_name feeName,sum(t.receivable_amount) receivableAmount,SUM(t.received_amount)
+ receivedAmount,SUM(t.owe_amount) oweAmount
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 t.community_id = #{communityId}
group by t.fee_name
</select>
+
+ <!-- 鏌ヨ鏈敹璐规埧灞嬬粺璁℃暟閲� add by wuxw 2018-07-03 -->
+ <select id="queryNoFeeRoomsCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from building_room t
+ inner join building_unit bu on t.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'
+ where t.status_cd = '0'
+ and not exists(
+ 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}
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <select id="queryNoFeeRooms" parameterType="Map" resultType="Map">
+ select f.floor_num floorNum,bu.unit_num unitNum,t.room_num roomNum,t.room_id roomId,bo.owner_id ownerId,bo.name
+ ownerName,bo.link
+ from building_room t
+ inner join building_unit bu on t.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'
+ left join building_owner_room_rel borr on borr.room_id = t.room_id and borr.status_cd ='0'
+ left join building_owner bo on borr.owner_id = bo.member_id and bo.status_cd = '0'
+ where t.status_cd = '0'
+ and not exists(
+ 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
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
+ <!-- 鏌ヨ鎶奸噾 -->
+ <select id="queryPayFeeDeposit" parameterType="Map" resultType="Map">
+ select t.amount,t.income_obj_id,t.income_obj_id incomeObjId,t.fee_type_cd,t.fee_type_cd
+ feeTypeCd,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time
+ endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId,t.user_id,t.user_id
+ userId,t.payer_obj_id,t.payer_obj_id payerObjId,pfc.square_price squarePrice,pfc.additional_amount
+ additionalAmount,t.fee_flag,t.fee_flag feeFlag,t.state,t.config_id,t.config_id configId,
+ pfc.fee_name feeName,td1.name feeTypeCdName,td2.name stateName,td3.name feeFlagName,pfc.computing_formula
+ computingFormula,pfc.computing_formula_text computingFormulaText,
+ pfc.bill_type billType,t.payer_obj_type,t.payer_obj_type payerObjType,pfc.is_default isDefault,pfc.start_time
+ configStartTime,pfc.end_time configEndTime,pfc.payment_cd paymentCd,pfc.payment_cycle paymentCycle,td4.name
+ billTypeName,t.create_time createTime,td5.name payerObjTypeName,pfd.state detailState,td6.name
+ detailStateName,pfa1.`value` deadlineTime
+ ,pfo.`value` ownerName,f.floor_num floorNum,bu.unit_num unitNum,br.room_num roomNum,oc.car_num carNum
+ from pay_fee t
+ INNER join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0' and pfc.fee_type_cd =
+ '888800010006'
+ left join pay_fee_detail pfd on t.fee_id = pfd.fee_id and pfd.status_cd = '0' and pfd.state != '1300'
+ left join t_dict td1 on pfc.fee_type_cd = td1.status_cd and td1.table_name = 'pay_fee_config' and
+ td1.table_columns = 'fee_type_cd'
+ left join t_dict td2 on t.state = td2.status_cd and td2.table_name = 'pay_fee' and td2.table_columns = 'state'
+ left join t_dict td3 on t.fee_flag = td3.status_cd and td3.table_name = 'pay_fee' and td3.table_columns =
+ 'fee_flag'
+ left join t_dict td4 on pfc.bill_type = td4.status_cd and td4.table_name = 'pay_fee_config' and
+ td4.table_columns = 'bill_type'
+ left join t_dict td5 on t.payer_obj_type = td5.status_cd and td5.table_name = 'pay_fee' and
+ td5.table_columns = 'payer_obj_type'
+ left join t_dict td6 on pfd.state = td6.status_cd and td6.table_name = 'pay_fee_detail' and
+ td6.table_columns = 'state'
+ left join pay_fee_attrs pfo on t.fee_id = pfo.fee_id and pfo.spec_cd = '390008'
+ LEFT JOIN pay_fee_attrs pfa1 on t.fee_id = pfa1.fee_id and pfa1.spec_cd = '390010' and pfa1.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'
+ 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 t.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
+ where 1 = 1
+ <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="amount != null and amount != ''">
+ and t.amount = #{amount}
+ </if>
+ <if test="incomeObjId != null and incomeObjId != ''">
+ and t.income_obj_id = #{incomeObjId}
+ </if>
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and t.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="startTime != null and startTime != ''">
+ and t.start_time = #{startTime}
+ </if>
+ <if test="endTime != null and endTime != ''">
+ and t.end_time = #{endTime}
+ </if>
+ <if test="statusCd != null and statusCd != ''">
+ and t.status_cd = #{statusCd}
+ </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="userId != null and userId != ''">
+ and t.user_id = #{userId}
+ </if>
+ <if test="payerObjId != null and payerObjId != ''">
+ and t.payer_obj_id = #{payerObjId}
+ </if>
+ <if test="squarePrice != null and squarePrice != ''">
+ and pfc.square_price = #{squarePrice}
+ </if>
+ <if test="additionalAmount != null and additionalAmount != ''">
+ and pfc.additional_amount = #{additionalAmount}
+ </if>
+ <if test="feeFlag != null and feeFlag != ''">
+ and t.fee_flag = #{feeFlag}
+ </if>
+ <if test="state != null and state != ''">
+ and t.state = #{state}
+ </if>
+ <if test="configId != null and configId != ''">
+ and t.config_id = #{configId}
+ </if>
+ <if test="feeName != null and feeName != ''">
+ and pfc.fee_name = #{feeName}
+ </if>
+ <if test="computingFormula != null and computingFormula != ''">
+ and pfc.computing_formula = #{computingFormula}
+ </if>
+ <if test="computingFormulaText != null and computingFormulaText != ''">
+ and pfc.computing_formula_text = #{computingFormulaText}
+ </if>
+ <if test="billType != null and billType != ''">
+ and pfc.bill_type = #{billType}
+ </if>
+ <if test="payerObjType != null and payerObjType != ''">
+ and t.payer_obj_type = #{payerObjType}
+ </if>
+ <if test="isDefault != null and isDefault != ''">
+ and pfc.is_default = #{isDefault}
+ </if>
+ <if test="configStartTime != null and configStartTime != ''">
+ and pfc.start_time = #{configStartTime}
+ </if>
+ <if test="configEndTime != null and configEndTime != ''">
+ and pfc.end_time = #{configEndTime}
+ </if>
+ <if test="paymentCd != null and paymentCd != ''">
+ and pfc.payment_cd = #{paymentCd}
+ </if>
+ <if test="paymentCycle != null and paymentCycle != ''">
+ and pfc.payment_cycle = #{paymentCycle}
+ </if>
+ <if test="feeStartTime != null and feeStartTime != ''">
+ and t.create_time >= #{feeStartTime}
+ </if>
+ <if test="feeEndTime != null and feeEndTime != ''">
+ and t.create_time <= #{feeEndTime}
+ </if>
+ <if test="detailState != null and detailState != ''">
+ and pfd.state = #{detailState}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
+ <!-- 鏌ヨ鎶奸噾閫�璐规�婚噾棰� -->
+ <select id="queryFeeDepositAmount" parameterType="Map" resultType="Map">
+ select SUM(pfc.additional_amount) allAmount,pfd.state detailState
+ from pay_fee t
+ INNER join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0' and pfc.fee_type_cd =
+ '888800010006'
+ left join pay_fee_detail pfd on t.fee_id = pfd.fee_id and pfd.status_cd = '0' and pfd.state != '1300'
+ left join t_dict td1 on pfc.fee_type_cd = td1.status_cd and td1.table_name = 'pay_fee_config' and
+ td1.table_columns = 'fee_type_cd'
+ left join t_dict td2 on t.state = td2.status_cd and td2.table_name = 'pay_fee' and td2.table_columns = 'state'
+ left join t_dict td3 on t.fee_flag = td3.status_cd and td3.table_name = 'pay_fee' and td3.table_columns =
+ 'fee_flag'
+ left join t_dict td4 on pfc.bill_type = td4.status_cd and td4.table_name = 'pay_fee_config' and
+ td4.table_columns = 'bill_type'
+ left join t_dict td5 on t.payer_obj_type = td5.status_cd and td5.table_name = 'pay_fee' and
+ td5.table_columns = 'payer_obj_type'
+ left join t_dict td6 on pfd.state = td6.status_cd and td6.table_name = 'pay_fee_detail' and
+ td6.table_columns = 'state'
+ left join pay_fee_attrs pfo on t.fee_id = pfo.fee_id and pfo.spec_cd = '390008'
+ LEFT JOIN pay_fee_attrs pfa1 on t.fee_id = pfa1.fee_id and pfa1.spec_cd = '390010' and pfa1.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'
+ 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 t.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
+ where 1 = 1
+ <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="amount != null and amount != ''">
+ and t.amount = #{amount}
+ </if>
+ <if test="incomeObjId != null and incomeObjId != ''">
+ and t.income_obj_id = #{incomeObjId}
+ </if>
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and t.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="startTime != null and startTime != ''">
+ and t.start_time = #{startTime}
+ </if>
+ <if test="endTime != null and endTime != ''">
+ and t.end_time = #{endTime}
+ </if>
+ <if test="statusCd != null and statusCd != ''">
+ and t.status_cd = #{statusCd}
+ </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="userId != null and userId != ''">
+ and t.user_id = #{userId}
+ </if>
+ <if test="payerObjId != null and payerObjId != ''">
+ and t.payer_obj_id = #{payerObjId}
+ </if>
+ <if test="squarePrice != null and squarePrice != ''">
+ and pfc.square_price = #{squarePrice}
+ </if>
+ <if test="additionalAmount != null and additionalAmount != ''">
+ and pfc.additional_amount = #{additionalAmount}
+ </if>
+ <if test="feeFlag != null and feeFlag != ''">
+ and t.fee_flag = #{feeFlag}
+ </if>
+ <if test="state != null and state != ''">
+ and t.state = #{state}
+ </if>
+ <if test="configId != null and configId != ''">
+ and t.config_id = #{configId}
+ </if>
+ <if test="feeName != null and feeName != ''">
+ and pfc.fee_name = #{feeName}
+ </if>
+ <if test="computingFormula != null and computingFormula != ''">
+ and pfc.computing_formula = #{computingFormula}
+ </if>
+ <if test="computingFormulaText != null and computingFormulaText != ''">
+ and pfc.computing_formula_text = #{computingFormulaText}
+ </if>
+ <if test="billType != null and billType != ''">
+ and pfc.bill_type = #{billType}
+ </if>
+ <if test="payerObjType != null and payerObjType != ''">
+ and t.payer_obj_type = #{payerObjType}
+ </if>
+ <if test="isDefault != null and isDefault != ''">
+ and pfc.is_default = #{isDefault}
+ </if>
+ <if test="configStartTime != null and configStartTime != ''">
+ and pfc.start_time = #{configStartTime}
+ </if>
+ <if test="configEndTime != null and configEndTime != ''">
+ and pfc.end_time = #{configEndTime}
+ </if>
+ <if test="paymentCd != null and paymentCd != ''">
+ and pfc.payment_cd = #{paymentCd}
+ </if>
+ <if test="paymentCycle != null and paymentCycle != ''">
+ and pfc.payment_cycle = #{paymentCycle}
+ </if>
+ <if test="feeStartTime != null and feeStartTime != ''">
+ and t.create_time >= #{feeStartTime}
+ </if>
+ <if test="feeEndTime != null and feeEndTime != ''">
+ and t.create_time <= #{feeEndTime}
+ </if>
+ <if test="detailState != null and detailState != ''">
+ and pfd.state = #{detailState}
+ </if>
+ group by pfd.state
+ </select>
+
+
+ <select id="queryHuaningOweFeeCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from (
+ select a.floorNum,a.oweAmount,b.curOweAmount
+ from
+ (select t.floor_num floorNum,SUM(rfms.owe_amount) oweAmount
+ 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'
+ where t.status_cd = '0'
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and rfms.obj_name= #{objName}
+ </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
+ where t.status_cd = '0'
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="feeYear !=null and feeYear != ''">
+ and curT.fee_year= #{feeYear}
+ </if>
+ GROUP BY t.floor_num
+ ) b
+ where a.floorNum = b.floorNum
+ <if test="floorId !=null and floorId != ''">
+ and a.floor_id = #{floorId}
+ </if>
+ ) t
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <select id="queryHuaningOweFee" parameterType="Map" resultType="Map">
+ select a.floorNum,a.oweAmount,b.curOweAmount
+ from
+ (select t.floor_num floorNum,SUM(rfms.owe_amount) oweAmount
+ 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'
+ where t.status_cd = '0'
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and rfms.obj_name= #{objName}
+ </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
+ where t.status_cd = '0'
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="feeYear !=null and feeYear != ''">
+ and curT.fee_year= #{feeYear}
+ </if>
+ GROUP BY t.floor_num
+ ) b
+ where a.floorNum = b.floorNum
+ <if test="floorId !=null and floorId != ''">
+ and a.floor_id = #{floorId}
+ </if>
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
+
+ <select id="queryHuaningPayFeeCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from (
+ select t.floor_num
+ from f_floor t
+ where 1=1
+ and t.community_id= #{communityId}
+ GROUP BY t.floor_num
+ ) tt
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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
+ 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 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.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 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 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(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 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}
+ 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
+ ) d,
+ (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 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}
+ 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
+ ) e,
+ (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 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}
+ and rfms.fee_month = #{month}
+ group by t.floor_num
+ ) f
+ where a.floorNum = b.floorNum
+ and b.floorNum = c.floorNum
+ and c.floorNum = d.floorNum
+ and d.floorNum = e.floorNum
+ and e.floorNum = f.floorNum
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+ <select id="queryHuaningPayFeeTwoCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from (
+ 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
+ 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 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 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
+ 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 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>
+ </select>
+ <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
+ 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'
+ where t.amount_owed > 0
+ and pfc.fee_type_cd = '888800010001'
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ ) tt
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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
+ 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'
+ where t.amount_owed > 0
+ and pfc.fee_type_cd = '888800010001'
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.8.0