diff --git a/main.py b/main.py index 91c18c8..cb87010 100644 --- a/main.py +++ b/main.py @@ -291,16 +291,16 @@ for index, row in BaseData.iterrows(): # 汇总 ws.cell(row=6+index, column=1, value=index+1) ws.cell(row=6+index, column=2, value=row["姓名"]) ws.cell(row=6+index, column=3, value=row["性别"]) + ws.cell(row=6+index, column=4, value=format_time(row["出生年月"])) + ws.cell(row=6+index, column=5, value=format_time(row["参加工作时间"])) ws.cell(row=6+index, column=6, value=row["学历"]) ws.cell(row=6+index, column=7, value=relativedelta(nowtime, row["入职时间"]).years+row["工龄调增"]-row["工龄调减"]+1) ws.cell(row=6+index, column=8, value=relativedelta(nowtime, row["入职时间"]).years) ws.cell(row=6+index, column=9, value=row["工龄调增"]) ws.cell(row=6+index, column=10, value=row["工龄调减"]) ws.cell(row=6+index, column=11, value=row["Latest_Role"]) - ws.cell(row=6+index, column=13, value=row["职务2"]) - ws.cell(row=6, column=8, value=format_time(row["出生年月"])) - ws.cell(row=6, column=10, value=format_time(row["参加工作时间"])) ws.cell(row=6+index, column=12, value=format_time(row["Latest_Prom"])) + ws.cell(row=6+index, column=13, value=row["职务2"]) ws.cell(row=6+index, column=14, value=format_time(row["日期2"])) except Exception as e: logging.error(f"{row['身份证号码']}:{e}") diff --git a/个人台账/.gitkeep b/个人台账/.gitkeep new file mode 100644 index 0000000..e69de29