合同的日期调整

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);
 

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>