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/fee/PayFeeDetailMonthServiceDaoImplMapper.xml | 63 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeDetailMonthServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeDetailMonthServiceDaoImplMapper.xml
index ca7a9c2..2a010e9 100644
--- a/java110-db/src/main/resources/mapper/fee/PayFeeDetailMonthServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeDetailMonthServiceDaoImplMapper.xml
@@ -12,7 +12,8 @@
fee_name,config_id
) values (
#{detailMonth},#{detailYear},#{detailId},#{receivableAmount},#{discountAmount},#{remark},#{receivedAmount},#{communityId},#{feeId},#{monthId},
- #{objName},#{objId},#{ownerName},#{ownerId},#{link},#{state},#{payFeeTime},#{curMonthTime}, #{feeName},#{configId}
+ #{objName},#{objId},#{ownerName},#{ownerId},#{link},#{state},#{payFeeTime},#{curMonthTime},
+ #{feeName},#{configId}
)
</insert>
@@ -21,14 +22,14 @@
insert into pay_fee_detail_month(
detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id,
obj_name,obj_id,owner_name,owner_id,link,state,pay_fee_time,cur_month_time,
- fee_name,config_id
+ fee_name,config_id,deadline_time
) values
<foreach collection="payFeeDetailMonthPos" item="item" index="index" separator=",">
(
#{item.detailMonth},#{item.detailYear},#{item.detailId},#{item.receivableAmount},#{item.discountAmount},
#{item.remark},#{item.receivedAmount},#{item.communityId},#{item.feeId},#{item.monthId},
#{item.objName},#{item.objId},#{item.ownerName},#{item.ownerId},#{item.link},#{item.state},#{item.payFeeTime},#{item.curMonthTime},
- #{item.feeName},#{item.configId}
+ #{item.feeName},#{item.configId},#{item.deadlineTime}
)
</foreach>
</insert>
@@ -39,7 +40,9 @@
detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.discount_amount,t.discount_amount
discountAmount,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
receivedAmount,t.community_id,t.community_id communityId,t.fee_id,t.fee_id feeId,t.month_id,t.month_id monthId,
- t.obj_name objName,t.obj_id objId,t.owner_name ownerName,t.owner_id ownerId,t.link,t.state,t.pay_fee_time payFeeTime
+ t.obj_name objName,t.obj_id objId,t.owner_name ownerName,t.owner_id ownerId,t.link,t.state,t.pay_fee_time
+ payFeeTime,
+ t.cur_month_time curMonthTime,t.deadline_time deadlineTime
from pay_fee_detail_month t
where 1 =1
<if test="detailMonth !=null and detailMonth != ''">
@@ -162,6 +165,22 @@
</if>
</update>
+ <!-- 鍒犻櫎绂绘暎鏁版嵁 -->
+ <update id="deletePayFeeDetailMonthInfo" parameterType="Map">
+ delete from pay_fee_detail_month
+ where 1=1
+ and community_id= #{communityId}
+ <if test="monthId !=null and monthId != ''">
+ and month_id= #{monthId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and fee_id= #{feeId}
+ </if>
+ <if test="detailId !=null and detailId != ''">
+ and detail_id= #{detailId}
+ </if>
+ </update>
+
<!-- 鏌ヨ鏈堢即璐硅〃鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryPayFeeDetailMonthsCount" parameterType="Map" resultType="Map">
select count(1) count
@@ -225,7 +244,9 @@
detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.discount_amount,t.discount_amount
discountAmount,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
receivedAmount,t.community_id,t.community_id communityId,t.fee_id,t.fee_id feeId,t.month_id,t.month_id monthId,
- t.obj_name objName,t.obj_id objId,t.owner_name ownerName,t.owner_id ownerId,t.link,t.state,t.pay_fee_time payFeeTime
+ t.obj_name objName,t.obj_id objId,t.owner_name ownerName,t.owner_id ownerId,t.link,t.state,t.pay_fee_time
+ payFeeTime,
+ t.cur_month_time curMonthTime
from pay_fee_detail_month t
where 1 =1
<if test="detailMonth !=null and detailMonth != ''">
@@ -279,11 +300,41 @@
<if test="payFeeTime !=null and payFeeTime != ''">
and t.pay_fee_time= #{payFeeTime}
</if>
- order by t.detail_year ,t.detail_month
+ order by t.detail_year desc,t.detail_month desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
</select>
+ <!-- 鏌ヨ闇�瑕佺鏁ｇ殑缂磋垂璁板綍 -->
+ <select id="getWaitDispersedFeeDetail" parameterType="Map" resultType="Map">
+ select t.prime_rate,t.prime_rate primeRate,
+ t.detail_id,t.detail_id detailId,
+ t.receivable_amount,t.receivable_amount receivableAmount,
+ t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
+ t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId ,t.create_time createTime,
+ 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,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value`
+ payerObjName,
+ t.cashier_id cashierId,t.cashier_name cashierName
+ from pay_fee_detail t
+ left join pay_fee_detail_month pfdm on t.fee_id = pfdm.fee_id and pfdm.detail_id = t.detail_id and
+ pfdm.status_cd = '0' and t.community_id = pfdm.community_id
+ 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'
+ 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 t.status_cd = '0'
+ and t.state in ('1000','1400')
+ and t.community_id = #{communityId}
+ and t.fee_id = #{feeId}
+ and pfdm.detail_id is null
+ </select>
</mapper>
--
Gitblit v1.8.0