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/ReturnPayFeeServiceDaoImplMapper.xml | 103 ++++++++++++++++++++++++++++++---------------------
1 files changed, 60 insertions(+), 43 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml
index d569a6a..75c28f4 100755
--- a/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml
@@ -1,42 +1,38 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="returnPayFeeServiceDaoImpl">
<!-- 淇濆瓨閫�璐硅〃淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessReturnPayFeeInfo" parameterType="Map">
- insert into
- business_return_pay_fee(
- reason,prime_rate,fee_type_cd,
- pay_time,detail_id,receivable_amount,
- cycles,remark,received_amount,
- fee_id,return_fee_id,operate,
- config_id,state,b_id,community_id) values (
- #{reason},#{primeRate},#{feeTypeCd},#{payTime},#{detailId},#{receivableAmount},
- #{cycles},#{remark},#{receivedAmount},#{feeId},#{returnFeeId},#{operate},#{configId},
- #{state},#{bId},#{communityId})
- </insert>
-
+ insert into business_return_pay_fee(reason, prime_rate, fee_type_cd,
+ pay_time, detail_id, receivable_amount,
+ cycles, remark, received_amount,
+ fee_id, return_fee_id, operate,
+ config_id, state, b_id, community_id)
+ values (#{reason}, #{primeRate}, #{feeTypeCd}, #{payTime}, #{detailId}, #{receivableAmount},
+ #{cycles}, #{remark}, #{receivedAmount}, #{feeId}, #{returnFeeId}, #{operate}, #{configId},
+ #{state}, #{bId}, #{communityId})
+ </insert>
<!-- 鏌ヨ閫�璐硅〃淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessReturnPayFeeInfo" parameterType="Map" resultType="Map">
select
- t.reason,
- t.prime_rate,t.prime_rate primeRate,
- t.fee_type_cd,t.fee_type_cd feeTypeCd,
- t.pay_time,t.pay_time payTime,
- t.detail_id,t.detail_id detailId,
- t.receivable_amount,t.receivable_amount receivableAmount,
- t.cycles,
- t.remark,
- t.received_amount,t.received_amount receivedAmount,
- t.fee_id,t.fee_id feeId,
- t.return_fee_id,t.return_fee_id returnFeeId,
- t.operate,t.config_id,t.config_id configId,
- t.state,
- t.b_id,t.b_id bId,
- t.community_id,t.community_id communityId
+ t.reason,
+ t.prime_rate,t.prime_rate primeRate,
+ t.fee_type_cd,t.fee_type_cd feeTypeCd,
+ t.pay_time,t.pay_time payTime,
+ t.detail_id,t.detail_id detailId,
+ t.receivable_amount,t.receivable_amount receivableAmount,
+ t.cycles,
+ t.remark,
+ t.received_amount,t.received_amount receivedAmount,
+ t.fee_id,t.fee_id feeId,
+ t.return_fee_id,t.return_fee_id returnFeeId,
+ t.operate,t.config_id,t.config_id configId,
+ t.state,
+ t.b_id,t.b_id bId,
+ t.community_id,t.community_id communityId
from business_return_pay_fee t
where 1 =1
<if test="reason !=null and reason != ''">
@@ -87,14 +83,12 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
</select>
-
<!-- 淇濆瓨閫�璐硅〃淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveReturnPayFeeInfoInstance" parameterType="Map">
insert into return_pay_fee(
- reason,prime_rate,fee_type_cd,pay_time,detail_id,receivable_amount,cycles,
+ reason,prime_rate,fee_type_cd,pay_time,detail_id,receivable_amount,cycles,
remark,status_cd,received_amount,fee_id,return_fee_id,config_id,state,b_id,community_id
) select t.reason,t.prime_rate,t.fee_type_cd,t.pay_time,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',
t.received_amount,t.fee_id,t.return_fee_id,t.config_id,t.state,t.b_id,t.community_id
@@ -145,9 +139,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
</insert>
-
<!-- 鏌ヨ閫�璐硅〃淇℃伅 add by wuxw 2018-07-03 -->
<select id="getReturnPayFeeInfo" parameterType="Map" resultType="Map">
@@ -169,6 +161,8 @@
t.b_id,t.b_id bId,
t.community_id,t.community_id communityId,
t.create_time,t.create_time createTime,
+ t.apply_person_id applyPersonId,t.apply_person_name applyPersonName,
+ t.audit_person_id auditPersonId,t.audit_person_name auditPersonName,
d.name feeTypeCdName,
c.name stateName,
pf.payer_obj_type payerObjType,
@@ -176,10 +170,10 @@
from return_pay_fee t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390012' and pfa.status_cd = '0'
- inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns = 'fee_type_cd'
+ inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns =
+ 'fee_type_cd'
inner join t_dict c on t.state = c.status_cd and c.table_name = 'return_pay_fee' and c.table_columns = 'state'
where 1 = 1
-
<if test="reason !=null and reason != ''">
and t.reason= #{reason}
</if>
@@ -194,6 +188,12 @@
</if>
<if test="payTime !=null and payTime != ''">
and t.pay_time= #{payTime}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time <= #{endTime}
</if>
<if test="detailId !=null and detailId != ''">
and t.detail_id= #{detailId}
@@ -230,6 +230,18 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="applyPersonId !=null and applyPersonId != ''">
+ and t.apply_person_id= #{applyPersonId}
+ </if>
+ <if test="applyPersonName !=null and applyPersonName != ''">
+ and t.apply_person_name like concat('%',#{applyPersonName},'%')
+ </if>
+ <if test="auditPersonId !=null and auditPersonId != ''">
+ and t.audit_person_id= #{auditPersonId}
+ </if>
+ <if test="auditPersonName !=null and auditPersonName != ''">
+ and t.audit_person_name like concat('%',#{auditPersonName},'%')
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -268,7 +280,8 @@
fl.floor_num floorNum
from return_pay_fee t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
- inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns = 'fee_type_cd'
+ inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns =
+ 'fee_type_cd'
inner join t_dict c on t.state = c.status_cd and c.table_name = 'return_pay_fee' and c.table_columns = 'state'
left join building_room br on pf.payer_obj_id = br.room_id and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
@@ -359,7 +372,8 @@
pa.num paNum
from return_pay_fee t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
- inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns = 'fee_type_cd'
+ inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns =
+ 'fee_type_cd'
inner join t_dict c on t.state = c.status_cd and c.table_name = 'return_pay_fee' and c.table_columns = 'state'
left join owner_car oc on pf.payer_obj_id = oc.car_id
left join parking_space ps on oc.ps_id = ps.ps_id and ps.status_cd = '0'
@@ -419,7 +433,6 @@
</if>
</select>
-
<!-- 淇敼閫�璐硅〃淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateReturnPayFeeInfoInstance" parameterType="Map">
update return_pay_fee t set t.status_cd = #{statusCd}
@@ -441,7 +454,8 @@
from return_pay_fee t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390012' and pfa.status_cd = '0'
- inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns = 'fee_type_cd'
+ inner join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns =
+ 'fee_type_cd'
inner join t_dict c on t.state = c.status_cd and c.table_name = 'return_pay_fee' and c.table_columns = 'state'
where 1 =1
<if test="payerObjName !=null and payerObjName != ''">
@@ -495,8 +509,11 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
-
+ <if test="startTime !=null and startTime !='' ">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime !=''">
+ and t.create_time <= #{endTime}
+ </if>
</select>
-
</mapper>
--
Gitblit v1.8.0