From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-db/src/main/resources/mapper/report/ReportOwnerPayFeeServiceDaoImplMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportOwnerPayFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportOwnerPayFeeServiceDaoImplMapper.xml
index 13563ee..a9f6cdf 100644
--- a/java110-db/src/main/resources/mapper/report/ReportOwnerPayFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportOwnerPayFeeServiceDaoImplMapper.xml
@@ -21,6 +21,9 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
</if>
+ <if test="pfYear !=null and pfYear != ''">
+ and t.pf_year= #{pfYear}
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
@@ -61,6 +64,15 @@
</if>
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and ff.floor_num = #{floorNum}
+ </if>
+ <if test="unitNum !=null and unitNum != ''">
+ and bu.unit_num = #{unitNum}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num = #{roomNum}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -156,6 +168,15 @@
<if test="feeId !=null and feeId != ''">
and t.fee_id= #{feeId}
</if>
+ <if test="floorNum !=null and floorNum != ''">
+ and ff.floor_num = #{floorNum}
+ </if>
+ <if test="unitNum !=null and unitNum != ''">
+ and bu.unit_num = #{unitNum}
+ </if>
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num = #{roomNum}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0