diff --git a/dags/pogasheniya.py b/dags/pogasheniya.py index 759b48d..b5b4f8c 100644 --- a/dags/pogasheniya.py +++ b/dags/pogasheniya.py @@ -36,22 +36,22 @@ def pogasheniya(**kwargs): query = """ SELECT osv.schet - , osv.uid_subkonto2 uid_dogovor - , osv.subkonto2 name + , osv.uid_subkonto2 as uid_dogovor + , osv.subkonto2 as name , osv.nomer , osv.date_begin , osv.date_end FROM oborotno_salbdovaya_vedomostb osv LEFT JOIN pogasheniya p on p.uid_dogovor = osv.uid_subkonto2 and p.schet = osv.schet - WHERE p.uid_dogovor is null and (osv.schet::text like '%03%'::text OR osv.schet::text like '%01%'::text) + WHERE p.uid_dogovor is null and (osv.schet::text like '%03%' OR osv.schet::text like '%01%') UNION ALL SELECT - '76.07.1' schet - , '00000000-0000-0000-0000-000000000000' uid_dogovor - , 'Лизинг' name - , osv.agreement_num - , osv.agreement_date - , osv.redemption_date + '76.07.1' as schet + , '00000000-0000-0000-0000-000000000000' as uid_dogovor + , 'Лизинг' as name + , osv.agreement_num as nomer + , osv.agreement_date as date_begin + , osv.redemption_date as date_end FROM lizingi_garantii osv LEFT JOIN pogasheniya p on p.nomer = osv.agreement_num WHERE p.uid_dogovor is null