From e7d1c43c8106682fffbf2d49f801be374ea6cc88 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 09 十一月 2021 13:25:56 +0800
Subject: [PATCH] 优化代码
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index 82ba74c..3826781 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -616,10 +616,10 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and pfc.start_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- and t.create_time <= #{endTime}
+ and pfc.start_time <= #{endTime}
</if>
group by t.config_id,t.fee_name,pfc.start_time
) t
@@ -676,10 +676,10 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and pfc.start_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- 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
@@ -738,10 +738,10 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and pfc.start_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- and t.create_time <= #{endTime}
+ and pfc.start_time <= #{endTime}
</if>
order by t.create_time desc
</select>
@@ -802,7 +802,7 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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,max(t.deadline_time)
+ 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
from report_fee_month_statistics t
@@ -811,6 +811,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'
+ 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
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -851,7 +852,7 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
- group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name
+ group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,pfa.`value`,br.built_up_area
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -961,13 +962,14 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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,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'
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'
+ left join pay_fee_attrs pfa on pf.fee_id = pfa.fee_id and pfa.spec_cd = '390008' and pfa.status_cd ='0'
where 1=1
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -1002,7 +1004,7 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
- group by t.fee_name,t.payer_obj_id,t.payer_obj_name
+ group by t.fee_name,t.payer_obj_id,t.payer_obj_name,pfa.`value`,br.built_up_area
HAVING oweAmount > 0
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -1066,7 +1068,7 @@
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.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'
@@ -1137,14 +1139,14 @@
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
+ t.detail_id,t.detail_id detailId,pf.payer_obj_id
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.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'
@@ -1385,10 +1387,10 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and t.deadline_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- and t.create_time <= #{endTime}
+ and t.deadline_time <= #{endTime}
</if>
) t
</select>
@@ -1471,10 +1473,10 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and t.end_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- and t.create_time <= #{endTime}
+ and t.end_time <= #{endTime}
</if>
) t
</select>
@@ -1875,7 +1877,7 @@
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'
+ left join owner_car oc on t.payer_obj_id = oc.car_id and oc.car_type_cd='1001'
where 1 = 1
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -2198,7 +2200,7 @@
select t.floor_num
from f_floor t
where 1=1
- and t.community_id= #{communityId}
+ and t.community_id= #{communityId}
GROUP BY t.floor_num
) tt
</select>
--
Gitblit v1.8.0