From 89897b7c2dee5dd79b3cbdfe8c6dfaa0abcfd580 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 02 二月 2021 13:15:43 +0800
Subject: [PATCH] 加入月考勤功能
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 322 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 248 insertions(+), 74 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index a70d143..9114d70 100644
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -25,6 +25,7 @@
oweAmount,t.community_id,t.community_id communityId,t.fee_create_time,t.fee_create_time
feeCreateTime,t.obj_type,t.obj_type objType
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
<if test="receivableAmount !=null and receivableAmount != ''">
and t.receivable_amount= #{receivableAmount}
@@ -166,6 +167,7 @@
<select id="queryReportFeeMonthStatisticssCount" parameterType="Map" resultType="Map">
select count(1) count
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
<if test="receivableAmount !=null and receivableAmount != ''">
and t.receivable_amount= #{receivableAmount}
@@ -229,6 +231,7 @@
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}
@@ -275,12 +278,15 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryReportFeeSummary" parameterType="Map" resultType="Map">
- select t.fee_year feeYear,t.fee_month feeMonth,SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount)
+ select t.fee_year feeYear,t.fee_month feeMonth,t.create_time createTime,SUM(t.receivable_amount)
+ receivableAmount,SUM(t.received_amount)
receivedAmount,SUM(t.owe_amount) oweAmount
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}
@@ -335,6 +341,7 @@
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}
@@ -381,12 +388,15 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryReportFloorUnitFeeSummary" parameterType="Map" resultType="Map">
- select t.fee_year feeYear,t.fee_month feeMonth, f.floor_num floorNum, bu.unit_num unitNum,
+ select t.fee_year feeYear,t.fee_month feeMonth, f.floor_num floorNum, bu.unit_num unitNum,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
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}
@@ -436,12 +446,17 @@
<select id="queryFeeBreakdownCount" parameterType="Map" resultType="Map">
select count(1) count
from (
- select t.fee_name,pfc.start_time
+ select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,pfc.start_time feeCreateTime,t.create_time
+ createTime,SUM(t.receivable_amount)
+ receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount) oweAmount
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}
@@ -465,13 +480,16 @@
and t.fee_id= #{feeId}
</if>
<if test="configId !=null and configId != ''">
- and t.config_id= #{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}
@@ -488,13 +506,18 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryFeeBreakdown" parameterType="Map" resultType="Map">
- select t.fee_name feeName,pfc.start_time feeCreateTime,SUM(t.receivable_amount)
+ select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,pfc.start_time feeCreateTime,t.create_time
+ createTime,SUM(t.receivable_amount)
receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount) oweAmount
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}
@@ -518,13 +541,16 @@
and t.fee_id= #{feeId}
</if>
<if test="configId !=null and configId != ''">
- and t.config_id= #{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}
@@ -550,6 +576,8 @@
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}
@@ -597,13 +625,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,t.deadline_time
- deadlineTime,SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount) receivedAmount,
- SUM(t.owe_amount) oweAmount
+ deadlineTime,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
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'
+ 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}
@@ -658,6 +687,7 @@
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}
@@ -709,6 +739,7 @@
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}
@@ -756,13 +787,16 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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,SUM(t.receivable_amount)
+ 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
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'
+ 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}
@@ -815,63 +849,7 @@
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
- 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'
- 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>
- ) t
- </select>
-
- <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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,
- 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
+ t.receivable_amount receivableAmount,t.received_amount receivedAmount,d.name
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'
@@ -880,6 +858,9 @@
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'
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'
@@ -905,7 +886,7 @@
and t.fee_id= #{feeId}
</if>
<if test="configId !=null and configId != ''">
- and t.config_id= #{configId}
+ and pfc.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
@@ -915,6 +896,75 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="primeRate != null and primeRate != ''">
+ and t.prime_rate = #{primeRate}
+ </if>
+ <if test="startTime !=null">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.create_time <= #{endTime}
+ </if>
+ ) t
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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,
+ 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
+ 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'
+ 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'
+ <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="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="primeRate != null and primeRate != ''">
+ and t.prime_rate = #{primeRate}
</if>
<if test="startTime !=null">
and t.create_time >= #{startTime}
@@ -926,6 +976,127 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
+ </select>
+
+ <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 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'
+ left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
+ 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="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="primeRate != null and primeRate != ''">
+ and t.prime_rate = #{primeRate}
+ </if>
+ <if test="startTime !=null">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.create_time <= #{endTime}
+ </if>
+ </select>
+
+ <select id="queryPayFeeDetailSum" 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,
+ 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,
+ 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 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'
+ 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'
+ <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="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="primeRate != null and primeRate != ''">
+ and t.prime_rate = #{primeRate}
+ </if>
+ <if test="startTime !=null">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.create_time <= #{endTime}
+ </if>
+ group by fdr.discount_small_type
+ order by t.create_time desc
</select>
<select id="queryDeadlineFeeCount" parameterType="Map" resultType="Map">
@@ -941,6 +1112,8 @@
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}
@@ -996,6 +1169,8 @@
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}
@@ -1111,6 +1286,7 @@
count(t.obj_id) objCount
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
AND t.status_cd = '0'
@@ -1124,6 +1300,7 @@
<select id="queryOwePaymentCount" parameterType="Map" resultType="Map">
select t.fee_name feeName,count( distinct t.obj_id) objCount
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 t.community_id = #{communityId}
and t.owe_amount > 0
group by t.config_id,t.fee_name
@@ -1131,8 +1308,9 @@
</select>
<select id="queryAllPaymentCount" parameterType="Map" resultType="Map">
- select t.fee_name feeName,count(distinct .obj_id) objCount
+ select t.fee_name feeName,count(distinct t.obj_id) objCount
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 t.community_id = #{communityId}
group by t.config_id,t.fee_name
order by objCount desc
@@ -1169,6 +1347,8 @@
and t.bill_type = td3.status_cd
and td3.table_name = 'pay_fee_config'
and td3.table_columns = 'bill_type'
+ and t.is_default = 'F'
+ and t.status_cd = '0'
<if test="feeTypeCd !=null and feeTypeCd != ''">
and t.fee_type_cd= #{feeTypeCd}
</if>
@@ -1178,14 +1358,8 @@
<if test="additionalAmount !=null and additionalAmount != ''">
and t.additional_amount= #{additionalAmount}
</if>
- <if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
- </if>
<if test="squarePrice !=null and squarePrice != ''">
and t.square_price= #{squarePrice}
- </if>
- <if test="isDefault !=null and isDefault != ''">
- and t.is_default= #{isDefault}
</if>
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
--
Gitblit v1.8.0