From ca35090f7dd57692234da0b2889ba95a0ade9f1b Mon Sep 17 00:00:00 2001 From: bn_user Date: Mon, 8 Sep 2025 12:18:44 +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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dags/split_subkonto2.py b/dags/split_subkonto2.py index 4f7c73f..2b4cfed 100644 --- a/dags/split_subkonto2.py +++ b/dags/split_subkonto2.py @@ -255,7 +255,7 @@ def read_dict_subkonto2_db(**kwargs): 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) - and osv.nomer is null + and (osv.nomer is null or osv.date_begin is null or osv.date_end is null) """, engine) return df.to_dict(orient='records') @@ -280,7 +280,6 @@ def merge_dict_and_split_1C(**kwargs): df_split_subkonto = pd.DataFrame.from_records(split_subkonto) if split_subkonto else pd.DataFrame() result_df = df_split_subkonto.merge(df_dict_subkonto, how='left', on='subkonto2', suffixes=('_split', '_dict')) - return result_df[result_df['subkonto2']=='договор займа №02/11/17'].to_dict(orient='records') result_df['naimenovanie'] = result_df['naimenovanie_split'] result_df['nomer'] = np.where(