From cdd0abecb96bb1b6dfa32e8a9cbb406ce3b4ed7d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 17:02:08 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
index df81dd5..2dfec81 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
@@ -48,8 +48,8 @@
</select>
<!-- 鏌ヨ 璐圭敤 -->
- <select id="getFees" parameterType="com.java110.dto.report.ReportFeeDto"
- resultType="com.java110.dto.report.ReportFeeDto">
+ <select id="getFees" parameterType="Map"
+ resultType="Map">
select pfc.fee_name feeName,pfc.start_time configStartTime,pfc.end_time configEndTime,pfc.config_id
configId,pfc.fee_type_cd feeTypeCd,
pfc.additional_amount additionalAmount,pfc.bill_type billType,pfc.computing_formula
@@ -63,7 +63,7 @@
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
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'
@@ -102,7 +102,7 @@
computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.status_cd,t.status_cd
statusCd,t.square_price,t.square_price squarePrice,t.is_default,t.is_default isDefault,t.config_id,t.config_id
configId,t.fee_flag,t.fee_flag feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time
- startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
+ 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
@@ -159,9 +159,6 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
- </if>
- <if test="bId !=null and bId != ''">
- and t.b_id= #{bId}
</if>
<if test="paymentCd !=null and paymentCd != ''">
and t.payment_cd= #{paymentCd}
--
Gitblit v1.8.0