From fe38d95a78a1119c7db895a09bc540a4f490444f Mon Sep 17 00:00:00 2001 From: bn_user Date: Tue, 9 Sep 2025 06:10:43 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20dags/split=5Fsubkonto2.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/split_subkonto2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dags/split_subkonto2.py b/dags/split_subkonto2.py index 09957da..200b78d 100644 --- a/dags/split_subkonto2.py +++ b/dags/split_subkonto2.py @@ -254,7 +254,7 @@ def read_dict_subkonto2_db(**kwargs): from public.oborotno_salbdovaya_vedomostb osv left join public.dict_subkonto_two as dst on dst.subkonto2 = osv.subkonto2 - where osv.subkonto2 not in (select dst2.subkonto2 from dict_subkonto_two dst2) + where osv.subkonto2 not in (select dst2.subkonto2 from public.dict_subkonto_two dst2) and (osv.nomer is null or osv.date_begin is null or osv.date_end is null) """, engine) return df.to_dict(orient='records') @@ -265,7 +265,7 @@ def split_subkonto_from_1C(**kwargs): select distinct osv.subkonto2 as subkonto2 from public.oborotno_salbdovaya_vedomostb osv - where osv.subkonto2 not in (select dst2.subkonto2 from dict_subkonto_two dst2) + where osv.subkonto2 not in (select dst2.subkonto2 from public.dict_subkonto_two dst2) """, engine) result_df = df['subkonto2'].apply(parse_contract_cell) return result_df.to_dict(orient='records') @@ -304,7 +304,7 @@ def merge_dict_and_split_1C(**kwargs): engine = get_db_engine() with engine.begin() as conn: #conn.exucute('CREATE TEMP TABLE temp_dict_subkonto_two as SELECT * FROM public.dict_subkonto_two where 1=0') - result_df.to_sql('public.dict_subkonto_two', con=conn, if_exists='append', index=False, method='multi') + result_df.to_sql('dict_subkonto_two', con=conn, if_exists='append', index=False, method='multi') #conn.execute('INSERT INTO public.dict_subkonto_two SELECT * FROM temp_dict_subkonto_two') return result_df.to_dict('Данные загружены!')