From b2b5bdf6f42597e582da96aa56707e1f68d3936e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:41:44 +0800
Subject: [PATCH] 优化 费用

---
 java110-db/src/main/resources/mapper/report/ReportOwnerPayFeeServiceDaoImplMapper.xml |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 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..c060b0f 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>
@@ -47,7 +50,10 @@
         LEFT JOIN f_floor ff on bu.floor_id = ff.floor_id and ff.status_cd = '0'
         left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and oc.car_type_cd='1001'
         left join contract con on t.payer_obj_id = con.contract_id and t.payer_obj_type = '7777' and con.status_cd = '0'
-        where t.end_time > NOW()
+        where 1=1
+        <if test="feeEndTime !=null and feeEndTime != ''">
+            and t.end_time &gt; #{feeEndTime}
+        </if>
         and t.state = '2008001'
         and t.status_cd = '0'
         <if test="configId !=null and configId != ''">
@@ -61,6 +67,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 ">
@@ -141,7 +156,10 @@
         LEFT JOIN f_floor ff on bu.floor_id = ff.floor_id and ff.status_cd = '0'
         left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and oc.car_type_cd='1001'
         left join contract con on t.payer_obj_id = con.contract_id and t.payer_obj_type = '7777' and con.status_cd = '0'
-        where t.end_time > NOW()
+        where 1=1
+        <if test="feeEndTime !=null and feeEndTime != ''">
+            and t.end_time &gt; #{feeEndTime}
+        </if>
         and t.state = '2008001'
         and t.status_cd = '0'
         <if test="configId !=null and configId != ''">
@@ -156,6 +174,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