From db55c4b35bc881286e8a1c4797127f63bb2f7499 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 26 二月 2021 13:07:35 +0800
Subject: [PATCH] 优化实收计算错误问题

---
 java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
index 0427b3d..c3d6568 100644
--- a/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeServiceDaoImplMapper.xml
@@ -15,6 +15,12 @@
         <if test="endTime != null">
             and t.create_time &lt; #{endTime}
         </if>
+        <if test="curStartYear != null and curStartYear != ''">
+            and DATE_FORMAT(t.start_time,'%Y') = #{curStartYear}
+        </if>
+        <if test="curEndYear != null and curEndYear != ''">
+            and DATE_FORMAT(t.end_time,'%Y') = #{curEndYear}
+        </if>
     </select>
 
     <!-- 鏌ヨ鎴垮眿涓暟 add by wuxw 2018-07-03 -->
@@ -61,6 +67,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="feeFlag !=null and feeFlag != ''">
+            and t.fee_flag= #{feeFlag}
+        </if>
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

--
Gitblit v1.8.0