From 08d8b029b10706b135713424e9b2a1b6e3839372 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 23 八月 2020 22:40:01 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
index 08257e2..8e84390 100644
--- a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
@@ -753,13 +753,13 @@
</insert>
- <select id="computeBillOweFeeCount" parameterType="Map">
+ <select id="computeBillOweFeeCount" parameterType="Map" resultType="Map">
select count(1) count
from pay_fee pf
INNER JOIN pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.bill_type in ('001','002','003') and
pfc.status_cd = '0' and pf.community_id = pfc.community_id
- inner join bill_owe_fee bof on pf.fee_id = bof.fee_id and bof.community_id = pf.community_id and bof.state =
- '1000'
+ inner join bill_owe_fee bof on pf.fee_id = bof.fee_id and bof.community_id = pf.community_id and bof.state ='1000' and bof.amount_owed > 0
+ inner join bill b on bof.bill_id = b.bill_id and b.community_id = bof.community_id and b.cur_bill = 'T'
where pf.status_cd = '0'
and pf.state = '2008001'
and pf.community_id = #{communityId}
@@ -767,18 +767,19 @@
and pf.payer_obj_id= #{payerObjId}
</if>
<if test="payerObjType !=null and payerObjType != ''">
- and t.payer_obj_type = #{payerObjType}
+ and pf.payer_obj_type = #{payerObjType}
</if>
</select>
- <select id="computeBillOweFee" parameterType="Map">
+ <select id="computeBillOweFee" parameterType="Map" resultType="Map">
select pfc.fee_name feeName,pf.fee_id feeId,pf.end_time endTime,bof.amount_owed amountOwed,bof.payer_obj_name
- roomName,bof.owner_name ownerName,bof.owner_tel ownerTel
+ roomName,bof.owner_name ownerName,bof.owner_tel ownerTel,pf.payer_obj_id payerObjId,pf.payer_obj_type payerObjType,
+ pf.community_id communityId
from pay_fee pf
INNER JOIN pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.bill_type in ('001','002','003') and
pfc.status_cd = '0' and pf.community_id = pfc.community_id
- inner join bill_owe_fee bof on pf.fee_id = bof.fee_id and bof.community_id = pf.community_id and bof.state =
- '1000'
+ inner join bill_owe_fee bof on pf.fee_id = bof.fee_id and bof.community_id = pf.community_id and bof.state ='1000' and bof.amount_owed > 0
+ inner join bill b on bof.bill_id = b.bill_id and b.community_id = bof.community_id and b.cur_bill = 'T'
where pf.status_cd = '0'
and pf.state = '2008001'
and pf.community_id = #{communityId}
@@ -786,12 +787,15 @@
and pf.payer_obj_id= #{payerObjId}
</if>
<if test="payerObjType !=null and payerObjType != ''">
- and t.payer_obj_type = #{payerObjType}
+ and pf.payer_obj_type = #{payerObjType}
+ </if>
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
</if>
</select>
- <select id="computeEveryOweFeeCount" parameterType="Map">
+ <select id="computeEveryOweFeeCount" parameterType="Map" resultType="Map">
select count(1) count
from pay_fee pf
INNER JOIN pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.bill_type = '004' and pfc.status_cd = '0'
@@ -809,7 +813,8 @@
</select>
<select id="computeEveryOweFee" parameterType="Map" resultType="Map">
- select pfc.fee_name feeName,pf.fee_id feeId,pf.end_time endTime,bof.amount_owed amountOwed,bof.payer_obj_name payObjName
+ select pfc.fee_name feeName,pf.fee_id feeId,pf.end_time endTime,pf.payer_obj_id payerObjId,pf.payer_obj_type payerObjType,
+ pf.community_id communityId,pfc.computing_formula computingFormula,pfc.square_price squarePrice,pfc.additional_amount additionalAmount
from pay_fee pf
INNER JOIN pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.bill_type = '004' and pfc.status_cd = '0'
and pf.community_id = pfc.community_id
@@ -823,6 +828,9 @@
<if test="payerObjType !=null and payerObjType != ''">
and pf.payer_obj_type = #{payerObjType}
</if>
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0