diff --git a/main.py b/main.py index 4c418da..a550ea4 100644 --- a/main.py +++ b/main.py @@ -288,8 +288,8 @@ for index, row in BaseData.iterrows(): # 汇总 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=nowtime.year-row["入职时间"].year+row["工龄调增"]-row["工龄调减"]+1) - ws.cell(row=6+index, column=8, value=nowtime.year-row["入职时间"].year) + ws.cell(row=6+index, column=7, value=nowtime.year-row["参加工作时间"].year+row["工龄调增"]-row["工龄调减"]+1) + ws.cell(row=6+index, column=8, value=nowtime.year-row["参加工作时间"].year) 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"])