From 3f4948a093237990407b4deaa77506c720dbb859 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 18 五月 2020 15:27:16 +0800
Subject: [PATCH] Merge branch 'back' of https://github.com/java110/MicroCommunity into back
---
java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 103 insertions(+), 7 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
index 7bcd452..fd0d7ad 100644
--- a/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml
@@ -7,9 +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
+ 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
) values (
- #{amount},#{operate},#{incomeObjId},#{feeTypeCd},#{startTime},#{endTime},#{communityId},#{bId},#{feeId},#{userId},#{payerObjId}
+ #{amount},#{operate},#{incomeObjId},#{feeTypeCd},#{startTime},#{endTime},#{communityId},#{bId},#{feeId},#{userId},#{payerObjId},
+ #{feeFlag},#{state},#{configId},#{payerObjType}
)
</insert>
@@ -19,7 +20,7 @@
select t.amount,t.operate,t.income_obj_id,t.income_obj_id incomeObjId,t.fee_type_cd,t.fee_type_cd
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
+ 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
from business_pay_fee t
where 1 =1
<if test="amount !=null and amount != ''">
@@ -55,6 +56,18 @@
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="feeFlag !=null and feeFlag != ''">
+ and t.fee_flag= #{feeFlag}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
+ </if>
+ <if test="payerObjType !=null and payerObjType != ''">
+ and t.payer_obj_type = #{payerObjType}
+ </if>
</select>
@@ -62,9 +75,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
+ 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
) 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
from business_pay_fee t where 1=1
<if test="amount !=null and amount != ''">
and t.amount= #{amount}
@@ -97,6 +111,19 @@
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="feeFlag !=null and feeFlag != ''">
+ and t.fee_flag= #{feeFlag}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
+ </if>
+
+ <if test="payerObjType !=null and payerObjType != ''">
+ and t.payer_obj_type = #{payerObjType}
+ </if>
</insert>
@@ -106,11 +133,24 @@
select t.amount,t.income_obj_id,t.income_obj_id incomeObjId,t.fee_type_cd,t.fee_type_cd
feeTypeCd,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,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,pfc.square_price squarePrice,pfc.additional_amount additionalAmount
- from pay_fee t,pay_fee_config pfc
+ userId,t.payer_obj_id,t.payer_obj_id payerObjId,pfc.square_price squarePrice,pfc.additional_amount
+ additionalAmount,t.fee_flag,t.fee_flag feeFlag,t.state,t.config_id,t.config_id configId,
+ pfc.fee_name feeName,td1.name feeTypeCdName,td2.name stateName,td3.name feeFlagName,pfc.computing_formula computingFormula,
+ t.payer_obj_type,t.payer_obj_type payerObjType,pfc.is_default isDefault,pfc.start_time configStartTime,pfc.end_time configEndTime
+ from pay_fee t,pay_fee_config pfc,t_dict td1,t_dict td2,t_dict td3
where 1 =1
and t.fee_type_cd = pfc.fee_type_cd
+ and t.config_id = pfc.config_id
and pfc.status_cd = '0'
+ and pfc.fee_type_cd = td1.status_cd
+ and td1.table_name = 'pay_fee_config'
+ and td1.table_columns = 'fee_type_cd'
+ and t.state = td2.status_cd
+ and td2.table_name = 'pay_fee'
+ and td2.table_columns = 'state'
+ and t.fee_flag = td3.status_cd
+ and td3.table_name = 'pay_fee'
+ and td3.table_columns = 'fee_flag'
<if test="amount !=null and amount != ''">
and t.amount= #{amount}
</if>
@@ -154,6 +194,25 @@
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
+ <if test="payerObjIds != null ">
+ and t.payer_obj_id in
+ <foreach collection="payerObjIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="feeFlag !=null and feeFlag != ''">
+ and t.fee_flag= #{feeFlag}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
+ </if>
+ <if test="payerObjType !=null and payerObjType != ''">
+ and t.payer_obj_type = #{payerObjType}
+ </if>
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -191,6 +250,12 @@
<if test="payerObjId !=null and payerObjId != ''">
, t.payer_obj_id= #{payerObjId}
</if>
+ <if test="state !=null and state != ''">
+ , t.state= #{state}
+ </if>
+ <if test="feeFlag !=null and feeFlag != ''">
+ , t.fee_flag= #{feeFlag}
+ </if>
where 1=1
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -204,10 +269,20 @@
<!-- 鏌ヨ璐圭敤鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryFeesCount" parameterType="Map" resultType="Map">
select count(1) count
- from pay_fee t,pay_fee_config pfc
+ from pay_fee t,pay_fee_config pfc,t_dict td1,t_dict td2,t_dict td3
where 1 =1
and t.fee_type_cd = pfc.fee_type_cd
+ and t.config_id = pfc.config_id
and pfc.status_cd = '0'
+ and pfc.fee_type_cd = td1.status_cd
+ and td1.table_name = 'pay_fee_config'
+ and td1.table_columns = 'fee_type_cd'
+ and t.state = td2.status_cd
+ and td2.table_name = 'pay_fee'
+ and td2.table_columns = 'state'
+ and t.fee_flag = td3.status_cd
+ and td3.table_name = 'pay_fee'
+ and td3.table_columns = 'fee_flag'
<if test="amount !=null and amount != ''">
and t.amount= #{amount}
</if>
@@ -235,6 +310,9 @@
<if test="arrearsEndTime != null">
and t.end_time < #{arrearsEndTime}
</if>
+ <if test="noArrearsEndTime != null">
+ and t.end_time > #{noArrearsEndTime}
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
and pfc.community_id= #{communityId}
@@ -251,6 +329,24 @@
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
+ <if test="payerObjIds != null ">
+ and t.payer_obj_id in
+ <foreach collection="payerObjIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="feeFlag !=null and feeFlag != ''">
+ and t.fee_flag= #{feeFlag}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id= #{configId}
+ </if>
+ <if test="payerObjType !=null and payerObjType != ''">
+ and t.payer_obj_type = #{payerObjType}
+ </if>
</select>
--
Gitblit v1.8.0