diff --git a/src/main/java/cfs/fine/dao/mapper/FinePenaltyRent_mapper.xml b/src/main/java/cfs/fine/dao/mapper/FinePenaltyRent_mapper.xml index a9169a4..533bf12 100644 --- a/src/main/java/cfs/fine/dao/mapper/FinePenaltyRent_mapper.xml +++ b/src/main/java/cfs/fine/dao/mapper/FinePenaltyRent_mapper.xml @@ -113,7 +113,9 @@ F.SERO_LEN, D.UPDATER, D.UPDATE_DATE - FROM PENALTY_HEAD_INFO_DAMO H, PENALTY_RENT_DETAIL_INFO D, DEFAULT_FARE_READ_INFO_DAMO F + FROM PENALTY_HEAD_INFO_DAMO H + , PENALTY_RENT_DETAIL_INFO D + , DEFAULT_FARE_READ_INFO_DAMO F WHERE D.CAR_NO = H.CAR_NO AND D.ENC_RESIDENT_NO = H.ENC_RESIDENT_NO AND D.worker_id = F.worker_id @@ -126,7 +128,7 @@ AND D.FARE_OFFICE_ID = #{fareOfficeId} - AND to_CHAR(D.ALTER_DATE,'YYYYMMDD') BETWEEN #{penaltyDateFrom} AND #{penaltyDateTo} + AND TO_CHAR(D.ALTER_DATE,'YYYYMMDD') BETWEEN #{penaltyDateFrom} AND #{penaltyDateTo} AND (D.NOTICE_WRONG_ID IS NULL OR D.NOTICE_WRONG_ID = '99') AND D.MOTION_ID LIKE '13'