diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index f3a7f8cfd..abd20d6a6 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -353,8 +353,6 @@ when a.settle_type = '2' and a.credit_period = 30 and a.settle_day = '1' - and b.trade_date = ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH) - and b.trade_date DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH) and NOT EXISTS ( SELECT 1 FROM emis_settle_invoice_record f @@ -371,7 +369,12 @@ end ) ) + then case + when b.trade_date = ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH) + and b.trade_date DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH) then ifnull(d.pay_money,0) + else 0 + end when a.settle_type='2' and a.credit_period = ]]> 30 and b.trade_date ]]> a.payment_due_date @@ -1053,8 +1056,6 @@ when a.settle_type = '2' and a.credit_period = 30 and a.settle_day = '1' - and b.trade_date = ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH) - and b.trade_date DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH) and NOT EXISTS ( SELECT 1 FROM emis_settle_invoice_record f @@ -1071,7 +1072,12 @@ end ) ) + then case + when b.trade_date = ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH) + and b.trade_date DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH) then ifnull(d.pay_money,0) + else 0 + end when a.settle_type='2' and a.credit_period = ]]> 30 and b.trade_date ]]> a.payment_due_date