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 753bf93..c18cb38 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 @@ -41,72 +41,73 @@ FROM pli_rent_contract_info i LEFT JOIN pli_rent_blacklist b ON i.LESSEE_ID_CARD = b.ID_CARD - - - AND i.GRID_ID = #{gridId} - - - AND i.VILLAGE_ID = #{villageId} - - - AND i.BUILD_ID = #{buildId} - - - AND i.UNIT_ID = #{unitId} - - - AND i.HOME_ID = #{homeId} - - - AND i.STATE = #{state} - - - AND i.LESSOR_NAME = #{lessorName} - - - AND i.LESSOR_ID_CARD = #{lessorIdCard} - - - AND i.LESSOR_MOBILE = #{lessorMobile} - - - AND i.LESSEE_NAME = #{lesseeName} - - - AND i.LESSEE_ID_CARD = #{lesseeIdCard} - - - AND i.LESSEE_MOBILE = #{lesseeMobile} - - - AND i.REVIEW_DATE >= #{reviewStartTime} - - - AND i.REVIEW_DATE <= #{reviewEndTime} - - - AND i.SIGN_DATE >= #{startTime} - - - AND i.SIGN_DATE <= #{endTime} - - - - 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() - - - + WHERE + i.DEL_FLAG = '0' + AND b.DEL_FLAG = '0' + + AND i.GRID_ID = #{gridId} + + + AND i.VILLAGE_ID = #{villageId} + + + AND i.BUILD_ID = #{buildId} + + + AND i.UNIT_ID = #{unitId} + + + AND i.HOME_ID = #{homeId} + + + AND i.STATE = #{state} + + + AND i.LESSOR_NAME = #{lessorName} + + + AND i.LESSOR_ID_CARD = #{lessorIdCard} + + + AND i.LESSOR_MOBILE = #{lessorMobile} + + + AND i.LESSEE_NAME = #{lesseeName} + + + AND i.LESSEE_ID_CARD = #{lesseeIdCard} + + + AND i.LESSEE_MOBILE = #{lesseeMobile} + + + AND i.REVIEW_DATE >= #{reviewStartTime} + + + AND i.REVIEW_DATE <= #{reviewEndTime} + + + AND i.SIGN_DATE >= #{startTime} + + + AND i.SIGN_DATE <= #{endTime} + + + + 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() + + \ No newline at end of file