diff --git a/dags/split_subkonto2.py b/dags/split_subkonto2.py index 28ef0cd..df2b97d 100644 --- a/dags/split_subkonto2.py +++ b/dags/split_subkonto2.py @@ -256,9 +256,9 @@ def read_dict_subkonto2_db(**kwargs): , osv.date_begin as date_begin , osv.date_end as date_end FROM public.oborotno_salbdovaya_vedomostb osv - LEFT JOIN public.dict_subkonto_two as dst + LEFT JOIN public.dict_subkonto_sec as dst ON dst.subkonto2 = osv.subkonto2 - WHERE osv.subkonto2 NOT IN (SELECT dst2.subkonto2 FROM public.dict_subkonto_two dst2) + WHERE osv.subkonto2 NOT IN (SELECT dst2.subkonto2 FROM public.dict_subkonto_sec dst2) AND (osv.nomer IS NULL OR osv.date_begin IS NULL OR osv.date_end IS NULL) and (osv.schet like '%%01%%' or osv.schet like '%%03%%') """ @@ -279,7 +279,7 @@ def split_subkonto_from_1C(**kwargs): osv.schet as schet , osv.subkonto2 as subkonto2 from public.oborotno_salbdovaya_vedomostb osv - where osv.subkonto2 not in (select dst2.subkonto2 from public.dict_subkonto_two dst2) + where osv.subkonto2 not in (select dst2.subkonto2 from public.dict_subkonto_sec dst2) and (osv.schet like '%%01%%' or osv.schet like '%%03%%') """, engine) if df.empty: @@ -321,18 +321,18 @@ def merge_dict_and_split_1C(**kwargs): engine = get_db_engine() with engine.begin() as conn: - conn.execute('CREATE TEMP TABLE temp_dict_subkonto_two (schet text null, subkonto2 text null, nomer text null, date_begin text null, date_end text null)') - result_df.to_sql('temp_dict_subkonto_two', con=conn, if_exists='append', index=False, method='multi') + conn.execute('CREATE TEMP TABLE temp_dict_subkonto_sec (schet text null, subkonto2 text null, nomer text null, date_begin text null, date_end text null)') + result_df.to_sql('temp_dict_subkonto_sec', con=conn, if_exists='append', index=False, method='multi') conn.execute( ''' - INSERT INTO public.dict_subkonto_two (schet, subkonto2, nomer, date_begin, date_end) + INSERT INTO public.dict_subkonto_sec (schet, subkonto2, nomer, date_begin, date_end) SELECT DISTINCT schet , subkonto2 , nomer , date_begin , date_end - FROM temp_dict_subkonto_two''' + FROM temp_dict_subkonto_sec''' ) return 'Данные загружены!'