bn_user
/
sigma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновить dags/split_subkonto2.py

This commit is contained in:
bn_user 2025-09-08 12:18:44 +00:00
parent 421badf8c9
commit ca35090f7d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dags/split_subkonto2.py
View File

@ -255,7 +255,7 @@ def read_dict_subkonto2_db(**kwargs):
left join public.dict_subkonto_two as dst left join public.dict_subkonto_two as dst
on dst.subkonto2 = osv.subkonto2 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 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) """, engine)
return df.to_dict(orient='records') 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() 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')) 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['naimenovanie'] = result_df['naimenovanie_split']
result_df['nomer'] = np.where( result_df['nomer'] = np.where(