From 781c2e20a4bb844dae3f4eafbf5f0e494b942ea8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 25 五月 2023 18:07:08 +0800
Subject: [PATCH] optimize
---
java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
index f4af346..60ba9a7 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
@@ -23,6 +23,7 @@
<if test="startTime != null">
and t.create_time > #{startTime}
</if>
+ and t.status_cd = '0'
<if test="endTime != null">
and t.create_time < #{endTime}
</if>
@@ -63,7 +64,9 @@
storeTypeCd,
t.community_id communityId,pfa.value importFeeName,ifd.end_time importFeeEndTime,mw.cur_degrees
curDegrees,mw.pre_degrees preDegrees,
- mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime
+ mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price mwPrice,
+ pfa2.`value` ownerTel, pfa3.`value` ownerName,br.room_area roomArea,
+ pfc.pay_online payOnline,pfc.scale,pfc.decimal_place decimalPlace,pfc.units,br.room_rent roomRent
from pay_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'
@@ -72,6 +75,8 @@
left join s_store ss on t.income_obj_id = ss.store_id and ss.status_cd = '0'
LEFT JOIN pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002' and pfa.status_cd = '0'
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 pay_fee_attrs pfa2 on t.fee_id = pfa2.fee_id and pfa2.spec_cd = '390009' and pfa2.status_cd = '0'
+ LEFT JOIN pay_fee_attrs pfa3 on t.fee_id = pfa3.fee_id and pfa3.spec_cd = '390008' and pfa3.status_cd = '0'
left join import_fee_detail ifd on t.fee_id = ifd.fee_id and ifd.status_cd = '0' and t.fee_flag = '2006012'
LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and mw.community_id = t.community_id
where t.status_cd = '0'
@@ -86,6 +91,9 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
</if>
<if test="feeFlag !=null and feeFlag != ''">
and t.fee_flag= #{feeFlag}
@@ -105,7 +113,8 @@
startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,
td1.name feeTypeCdName,td2.name feeFlagName,t.bill_type billType,t.bill_type,td3.name billTypeName,
t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle,
- t.computing_formula_text,t.computing_formula_text computingFormulaText
+ t.computing_formula_text,t.computing_formula_text computingFormulaText,
+ t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units
from pay_fee_config t,t_dict td1,t_dict td2,t_dict td3
where 1 =1
and t.fee_type_cd = td1.status_cd
--
Gitblit v1.8.0