From db689e5e2cb730b2cf08796fa224084f00758a71 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 12 三月 2022 17:05:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
index c1bba6a..df4f150 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
@@ -7,10 +7,10 @@
<!-- 淇濆瓨璐圭敤淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessFeeInfo" parameterType="Map">
insert into business_pay_fee(
- amount,operate,income_obj_id,fee_type_cd,start_time,end_time,community_id,b_id,fee_id,user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type
+ amount,operate,income_obj_id,fee_type_cd,start_time,end_time,community_id,b_id,fee_id,user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type,batch_id
) values (
#{amount},#{operate},#{incomeObjId},#{feeTypeCd},#{startTime},#{endTime},#{communityId},#{bId},#{feeId},#{userId},#{payerObjId},
- #{feeFlag},#{state},#{configId},#{payerObjType}
+ #{feeFlag},#{state},#{configId},#{payerObjType},#{batchId}
)
</insert>
@@ -21,7 +21,7 @@
feeTypeCd,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,t.fee_id,t.fee_id feeId,t.user_id,t.user_id userId,t.payer_obj_id,t.payer_obj_id
payerObjId,t.fee_flag,t.fee_flag feeFlag,t.state,t.config_id,t.config_id
- configId,t.payer_obj_type,t.payer_obj_type payerObjType
+ configId,t.payer_obj_type,t.payer_obj_type payerObjType,t.batch_id,t.batch_id batchId
from business_pay_fee t
where 1 =1
<if test="amount !=null and amount != ''">
@@ -51,9 +51,6 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
@@ -76,10 +73,10 @@
<!-- 淇濆瓨璐圭敤淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveFeeInfoInstance" parameterType="Map">
insert into pay_fee(
- amount,income_obj_id,fee_type_cd,start_time,status_cd,end_time,community_id,b_id,fee_id,user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type
+ amount,income_obj_id,fee_type_cd,start_time,status_cd,end_time,community_id,b_id,fee_id,user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type,batch_id
) select
t.amount,t.income_obj_id,t.fee_type_cd,t.start_time,'0',t.end_time,t.community_id,t.b_id,t.fee_id,t.user_id,t.payer_obj_id
- ,t.fee_flag,t.state,t.config_id,t.payer_obj_type
+ ,t.fee_flag,t.state,t.config_id,t.payer_obj_type,t.batch_id
from business_pay_fee t where 1=1
<if test="amount !=null and amount != ''">
and t.amount= #{amount}
@@ -105,9 +102,6 @@
</if>
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
- </if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
</if>
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
@@ -142,7 +136,9 @@
configStartTime,pfc.end_time configEndTime,pfc.payment_cd paymentCd,pfc.payment_cycle paymentCycle,td4.name
billTypeName,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.price mwPrice
+ mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price
+ mwPrice,
+ pfa2.`value` ownerName,t.batch_id,t.batch_id batchId
from pay_fee t
INNER join pay_fee_config pfc on t.config_id = pfc.config_id and
pfc.status_cd = '0'
@@ -155,6 +151,7 @@
td4.table_columns = 'bill_type'
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 = '390008' and pfa2.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
<if test="ownerId != null and ownerId != ''">
@@ -203,9 +200,6 @@
</if>
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
- </if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
</if>
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
@@ -351,9 +345,6 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
@@ -391,16 +382,18 @@
t.community_id communityId,
t.config_id configId,
t.cur_bill curBill,
+ td.name curBillName,
c.fee_name feeName
from bill t
left join pay_fee_config c on t.config_id = c.config_id and c.community_id = t.community_id and c.status_cd =
'0'
- where 1 =1
+ left join t_dict td on td.table_name = 'bill' and td.table_columns = 'cur_bill' and t.cur_bill = td.status_cd
+ where 1 = 1
<if test="billId !=null and billId != ''">
and t.bill_id= #{billId}
</if>
<if test="billName !=null and billName != ''">
- and t.bill_name= #{billName}
+ and t.bill_name like '%${billName}%'
</if>
<if test="receivable !=null and receivable != ''">
and t.receivable= #{receivable}
@@ -440,7 +433,7 @@
and t.bill_id= #{billId}
</if>
<if test="billName !=null and billName != ''">
- and t.bill_name= #{billName}
+ and t.bill_name like '%${billName}%'
</if>
<if test="receivable !=null and receivable != ''">
and t.receivable= #{receivable}
@@ -485,7 +478,8 @@
t.create_time createTime,
t.deadline_time deadlineTime,
pf.payer_obj_id payObjId,
- td.`name` feeTypeName
+ td.name feeTypeName,
+ td2.name stateName
from bill_owe_fee t
<if test="curBill !=null and curBill != ''">
inner join bill b on t.bill_id = b.bill_id and b.community_id = t.community_id and b.cur_bill = #{curBill}
@@ -493,7 +487,9 @@
left join pay_fee pf on t.fee_id = pf.fee_id and t.community_id = pf.community_id and pf.status_cd = '0'
left join t_dict td on pf.fee_type_cd = td.status_cd and td.table_name = 'pay_fee_config' and td.table_columns =
'fee_type_cd'
- where 1 =1
+ left join t_dict td2 on t.state = td2.status_cd and td2.table_name = 'bill_owe_fee' and td2.table_columns =
+ 'state'
+ where 1 = 1
<if test="oweId !=null and oweId != ''">
and t.owe_id= #{oweId}
</if>
@@ -523,7 +519,7 @@
</foreach>
</if>
<if test="ownerName != null and ownerName != ''">
- and t.owner_name = #{ownerName}
+ and t.owner_name like '%${ownerName}%'
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -564,7 +560,7 @@
and t.owner_id = #{ownerId}
</if>
<if test="ownerName != null and ownerName != ''">
- and t.owner_name = #{ownerName}
+ and t.owner_name like '%${ownerName}%'
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -655,9 +651,6 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
@@ -742,9 +735,6 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
@@ -776,11 +766,11 @@
<!-- 鎵归噺鎻掑叆璐圭敤 -->
<insert id="insertFees" parameterType="Map">
insert into pay_fee (amount,status_cd,income_obj_id,fee_type_cd,start_time,end_time,community_id,b_id,fee_id,
- user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type)
+ user_id,payer_obj_id,fee_flag,state,config_id,payer_obj_type,batch_id)
VALUES
<foreach collection="payFeePos" item="item" separator=",">
(#{item.amount},'0',#{item.incomeObjId},#{item.feeTypeCd},#{item.startTime},#{item.endTime},#{item.communityId},
- '-1',#{item.feeId},#{item.userId},#{item.payerObjId},#{item.feeFlag},#{item.state},#{item.configId},#{item.payerObjType})
+ '-1',#{item.feeId},#{item.userId},#{item.payerObjId},#{item.feeFlag},#{item.state},#{item.configId},#{item.payerObjType},#{item.batchId})
</foreach>
</insert>
@@ -850,7 +840,8 @@
<select id="computeEveryOweFee" parameterType="Map" resultType="Map">
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.computing_formula_text computingFormulaText,
+ pf.community_id communityId,pfc.computing_formula computingFormula,pfc.computing_formula_text
+ computingFormulaText,
pfc.square_price
squarePrice,pfc.additional_amount additionalAmount
from pay_fee pf
@@ -871,4 +862,13 @@
</if>
</select>
+
+ <!-- 鏍规嵁鎵规鍒犻櫎璐圭敤 add by wuxw 2018-07-03 -->
+ <update id="deleteFeesByBatch" parameterType="Map">
+ update pay_fee t set t.status_cd = '1'
+ where 1=1
+ and t.batch_id= #{batchId}
+ and t.community_id= #{communityId}
+
+ </update>
</mapper>
--
Gitblit v1.8.0