From 2968473e9cd8e6bc36476a83cf85d479972f906c Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 28 Apr 2022 10:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=9A=84=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RentContractInfoServiceImpl.java     |  9 +------
 .../mapper/rent/RentContractInfoDao.xml       | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
index bb47a4f..285ff8f 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
@@ -94,10 +94,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         String lesseeMobile = (String) params.get("lesseeMobile");
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
-        String reviewStartTime = (String) params.get("reviewStartTime");
-        String reviewEndTime = (String) params.get("reviewEndTime");
-        String signStartTime = (String) params.get("signStartTime");
-        String signEndTime = (String) params.get("signEndTime");
+
         String endDate = (String) params.get("endDate");
 
         QueryWrapper<RentContractInfoEntity> wrapper = new QueryWrapper<>();
@@ -114,10 +111,6 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         wrapper.eq(StringUtils.isNotBlank(lesseeName), "LESSEE_NAME", lesseeName);
         wrapper.eq(StringUtils.isNotBlank(lesseeIdCard), "LESSEE_ID_CARD", lesseeIdCard);
         wrapper.eq(StringUtils.isNotBlank(lesseeMobile), "LESSEE_MOBILE", lesseeMobile);
-        wrapper.ge(StringUtils.isNotBlank(reviewStartTime), "REVIEW_DATE", reviewStartTime);
-        wrapper.le(StringUtils.isNotBlank(reviewEndTime), "REVIEW_DATE", reviewEndTime);
-        wrapper.ge(StringUtils.isNotBlank(signStartTime), "SIGN_DATE", signStartTime);
-        wrapper.le(StringUtils.isNotBlank(signEndTime), "SIGN_DATE", signEndTime);
 
         wrapper.eq(StringUtils.isNotBlank(endDate), "END_DATE", endDate);
 
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml
index 0e27096..753bf93 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml
@@ -84,14 +84,28 @@
             <if test="reviewEndTime != null and reviewEndTime != ''">
                 AND i.REVIEW_DATE &lt;= #{reviewEndTime}
             </if>
-            <if test="signStartTime != null and signStartTime != ''">
-                AND i.SIGN_DATE >= #{signStartTime}
+            <if test="startTime != null and startTime != ''">
+                AND i.SIGN_DATE >= #{startTime}
             </if>
-            <if test="signEndTime != null and signEndTime != ''">
-                AND i.SIGN_DATE &lt;= #{signEndTime}
+            <if test="endTime != null and endTime != ''">
+                AND i.SIGN_DATE &lt;= #{endTime}
             </if>
             <if test="endDate != null and endDate != ''">
-                AND REFERENCE_ID = #{endDate}
+                <if test="endDate == '0' or endDate == 0">
+                    AND DATE( i.END_DATE ) &lt;= DATE_ADD( curdate(), INTERVAL 1 MONTH )
+                    AND DATE( i.END_DATE ) > CURDATE()
+                </if>
+                <if test="endDate == '1' or endDate == 1">
+                    AND DATE( i.END_DATE ) &lt;= DATE_ADD( curdate(), INTERVAL 2 MONTH )
+                    AND DATE( i.END_DATE ) > CURDATE()
+                </if>
+                <if test="endDate == '2' or endDate == 2">
+                    AND DATE( i.END_DATE ) &lt;= DATE_ADD( curdate(), INTERVAL 3 MONTH )
+                    AND DATE( i.END_DATE ) > CURDATE()
+                </if>
+                <if test="endDate == '3' or endDate == 3">
+                    AND DATE( i.END_DATE ) &lt;= CURDATE()
+                </if>
             </if>
         </where>
     </select>