From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
index 6b6b93c..9635c24 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
@@ -121,16 +121,18 @@
t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value`
importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount,
mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time
- curReadingTime
+ curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value` payerObjName
from pay_fee_detail t
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and mw.community_id = t.community_id
+ left join pay_fee_attrs pfao1 on pfao1.fee_id = t.fee_id and pfao1.spec_cd = '390012' and pfao1.status_cd = '0'
<if test="ownerId != null and ownerId != ''">
left join pay_fee_attrs pfao on pfao.fee_id = t.fee_id and pfao.spec_cd = '390007' and pfao.status_cd = '0'
</if>
left join t_dict d on t.state = d.status_cd and d.table_name = 'pay_fee_detail' and d.table_columns = 'state'
+ left join t_dict td on t.prime_rate = td.status_cd and td.table_name = 'pay_fee_detail' and td.table_columns = 'prime_rate'
where 1 =1
<if test="configId != null and configId != ''">
and pf.config_id = #{configId}
@@ -307,12 +309,12 @@
<insert id="saveFeeDetail" parameterType="Map">
insert into
pay_fee_detail(
- prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time,payable_amount
+ prime_rate,detail_id,receivable_amount,cycles,remark,received_amount,community_id,fee_id,state,start_time,end_time,payable_amount
<if test="createTime != null and createTime != ''">
,create_time
</if>
)
- values(#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},'0',#{receivedAmount},#{communityId},'-1',#{feeId},#{state},
+ values(#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},#{receivedAmount},#{communityId},#{feeId},#{state},
#{startTime},#{endTime},#{payableAmount}
<if test="createTime != null and createTime != ''">
,#{createTime}
--
Gitblit v1.8.0