From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
index 7414611..b02eb26 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>
@@ -48,8 +49,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 +64,8 @@
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
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 +74,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'
@@ -87,6 +91,9 @@
<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}
</if>
@@ -95,5 +102,85 @@
</if>
</select>
+ <!-- 鏌ヨ璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
+ <select id="getFeeConfigs" parameterType="com.java110.dto.fee.FeeConfigDto"
+ resultType="com.java110.dto.fee.FeeConfigDto">
+ select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.computing_formula,t.computing_formula
+ 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,
+ 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
+ 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
+ and td1.table_name = 'pay_fee_config'
+ and td1.table_columns = 'fee_type_cd'
+ and t.fee_flag = td2.status_cd
+ and td2.table_name = 'pay_fee_config'
+ and td2.table_columns = 'fee_flag'
+ and t.bill_type = td3.status_cd
+ and td3.table_name = 'pay_fee_config'
+ and td3.table_columns = 'bill_type'
+ <if test="feeTypeCd !=null and feeTypeCd != ''">
+ and t.fee_type_cd= #{feeTypeCd}
+ </if>
+ <if test="computingFormula !=null and computingFormula != ''">
+ and t.computing_formula= #{computingFormula}
+ </if>
+ <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}
+ </if>
+ <if test="feeFlag !=null and feeFlag != ''">
+ and t.fee_flag= #{feeFlag}
+ </if>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name like '%${feeName}%'
+ </if>
+ <if test="startTime !=null ">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null ">
+ and t.end_time= #{endTime}
+ </if>
+ <if test="valid !=null and valid == 1">
+ and t.end_time > now()
+ </if>
+ <if test="curTime !=null ">
+ and t.end_time > #{curTime}
+ and t.start_time < #{curTime}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="paymentCd !=null and paymentCd != ''">
+ and t.payment_cd= #{paymentCd}
+ </if>
+ <if test="paymentCycle !=null and paymentCycle != ''">
+ and t.payment_cycle= #{paymentCycle}
+ </if>
+ <if test="billType !=null and billType != ''">
+ and t.bill_type= #{billType}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0