diff --git a/dags/split_subkonto2.py b/dags/split_subkonto2.py index a39f8ef..a3b93f0 100644 --- a/dags/split_subkonto2.py +++ b/dags/split_subkonto2.py @@ -283,9 +283,9 @@ def merge_dict_and_split_1C(**kwargs): result_df['naimenovanie'] = result_df['naimenovanie_split'] result_df['nomer'] = np.where( - (result_df['nomer_dict'].isna()) | (result_df['nomer_split'] != result_df['nomer_dict']), - result_df['nomer_split'], - result_df['nomer_dict'] + (result_df['nomer_dict'].notna()) | (result_df['nomer_split'] != result_df['nomer_dict']), + result_df['nomer_dict'], + result_df['nomer_split'] ) result_df['date_begin'] = np.where( @@ -293,7 +293,7 @@ def merge_dict_and_split_1C(**kwargs): result_df['date_begin_split'], result_df['date_begin_dict'] ) - + result_df['date_end'] = result_df['date_end_dict'] result_df = result_df[['subkonto2', 'naimenovanie', 'nomer', 'date_begin', 'date_end']]