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/FeeDetailServiceDaoImplMapper.xml | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
index c93b101..394e0b5 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
@@ -10,9 +10,17 @@
business_pay_fee_detail(
operate,prime_rate,detail_id,
receivable_amount,cycles,remark,
- received_amount,community_id,b_id,fee_id,state,start_time,end_time) values (
+ received_amount,community_id,b_id,fee_id,state,start_time,end_time
+ <if test="createTime != null">
+ ,create_time
+ </if>
+ ) values (
#{operate},#{primeRate},#{detailId},#{receivableAmount},
- #{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId},#{state},#{startTime},#{endTime})
+ #{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId},#{state},#{startTime},#{endTime}
+ <if test="createTime != null">
+ ,#{createTime}
+ </if>
+ )
</insert>
@@ -65,9 +73,9 @@
<insert id="saveFeeDetailInfoInstance" parameterType="Map">
insert into
pay_fee_detail(
- prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time)
+ prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time,create_time)
select
- t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id,state,t.start_time,t.end_time
+ t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id,state,t.start_time,t.end_time,t.create_time
from business_pay_fee_detail t where 1=1
and t.operate= 'ADD'
<if test="primeRate !=null and primeRate != ''">
@@ -167,6 +175,15 @@
<if test="curYear != null and curYear != ''">
and DATE_FORMAT(DATE_SUB(t.end_time,INTERVAL 1 DAY),'%Y') = #{curYear}
</if>
+ <if test="states != null">
+ and t.state in
+ <foreach collection="states" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -264,6 +281,9 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
</if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
<if test="startTime !=null ">
and t.create_time >= #{startTime}
</if>
--
Gitblit v1.8.0