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 wrapper = new QueryWrapper<>(); @@ -114,10 +111,6 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl AND i.REVIEW_DATE <= #{reviewEndTime} - - AND i.SIGN_DATE >= #{signStartTime} + + AND i.SIGN_DATE >= #{startTime} - - AND i.SIGN_DATE <= #{signEndTime} + + AND i.SIGN_DATE <= #{endTime} - AND REFERENCE_ID = #{endDate} + + AND DATE( i.END_DATE ) <= DATE_ADD( curdate(), INTERVAL 1 MONTH ) + AND DATE( i.END_DATE ) > CURDATE() + + + AND DATE( i.END_DATE ) <= DATE_ADD( curdate(), INTERVAL 2 MONTH ) + AND DATE( i.END_DATE ) > CURDATE() + + + AND DATE( i.END_DATE ) <= DATE_ADD( curdate(), INTERVAL 3 MONTH ) + AND DATE( i.END_DATE ) > CURDATE() + + + AND DATE( i.END_DATE ) <= CURDATE() +