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 11:52:48 +00:00
parent 16ac0d33e4
commit 458fc4a554
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dags/split_subkonto2.py
View File

@ -214,7 +214,7 @@ def parse_contract_cell(cell_text):
"subkonto2": None, "subkonto2": None,
"naimenovanie": None, "naimenovanie": None,
"nomer": None, "nomer": None,
"date_bedin": None, "date_begin": None,
"date_end": None "date_end": None
}) })
@ -238,7 +238,7 @@ def parse_contract_cell(cell_text):
"subkonto2": cell_text, "subkonto2": cell_text,
"naimenovanie": title if title == None else title.lower(), "naimenovanie": title if title == None else title.lower(),
"nomer": number, "nomer": number,
"date_bedin": date_norm, "date_begin": date_norm,
"date_end": None "date_end": None
}) })
@ -249,7 +249,7 @@ def read_dict_subkonto2_db(**kwargs):
osv.subkonto2 as subkonto2 osv.subkonto2 as subkonto2
, dst.naimenovanie as naimenovanie , dst.naimenovanie as naimenovanie
, osv.nomer as nomer , osv.nomer as nomer
, osv.date_bedin as date_begin , osv.date_begin as date_begin
, osv.date_end as date_end , osv.date_end as date_end
from public.oborotno_salbdovaya_vedomostb osv from public.oborotno_salbdovaya_vedomostb osv
left join public.dict_subkonto_two as dst left join public.dict_subkonto_two as dst
@ -288,15 +288,15 @@ def merge_dict_and_split_1C(**kwargs):
result_df['nomer_dict'] result_df['nomer_dict']
) )
result_df['date_bedin'] = np.where( result_df['date_begin'] = np.where(
result_df['date_bedin_dict'].isna(), result_df['date_begin_dict'].isna(),
result_df['date_bedin_split'], result_df['date_begin_split'],
result_df['date_bedin_dict'] result_df['date_begin_dict']
) )
result_df['date_end'] = result_df['date_end_dict'] result_df['date_end'] = result_df['date_end_dict']
result_df = result_df[['subkonto2', 'naimenovanie', 'nomer', 'date_bedin', 'date_end']] result_df = result_df[['subkonto2', 'naimenovanie', 'nomer', 'date_begin', 'date_end']]
return result_df.to_dict(orient='records') return result_df.to_dict(orient='records')
with DAG( with DAG(