diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index 5085eda64..c53a8e197 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -1445,8 +1445,24 @@ and a.payment_status in ('0','2') - and a.payment_70_due_date is not null - and DATE(a.payment_70_due_date) CURDATE() + and ( + case + when a.settle_type = '2' and a.credit_period = 7 then DATE(DATE_ADD(a.payment_due_date, INTERVAL 7 DAY)) + when a.settle_type = '2' and a.credit_period = 15 then DATE(DATE_ADD(a.payment_due_date, INTERVAL 15 DAY)) + when a.settle_type = '2' and a.credit_period = 30 then LAST_DAY(DATE_ADD(a.payment_due_date, INTERVAL 1 MONTH)) + when a.settle_type = '2' and a.credit_period in (35,45) then LAST_DAY(a.payment_due_date) + else DATE(a.payment_due_date) + end + ) is not null + and DATE( + case + when a.settle_type = '2' and a.credit_period = 7 then DATE(DATE_ADD(a.payment_due_date, INTERVAL 7 DAY)) + when a.settle_type = '2' and a.credit_period = 15 then DATE(DATE_ADD(a.payment_due_date, INTERVAL 15 DAY)) + when a.settle_type = '2' and a.credit_period = 30 then LAST_DAY(DATE_ADD(a.payment_due_date, INTERVAL 1 MONTH)) + when a.settle_type = '2' and a.credit_period in (35,45) then LAST_DAY(a.payment_due_date) + else DATE(a.payment_due_date) + end + ) CURDATE()