[Build 1.1.6] fix: 修正工龄计算逻辑,使用参加工作时间替代入职时间

- 更新工龄计算公式,确保使用正确的时间字段进行计算
- 调整相关单元格的值设置,提升数据准确性
This commit is contained in:
Miu Li 2025-06-02 16:32:02 +08:00
parent 758047085c
commit b04495a621

View File

@ -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=4, value=format_time(row["出生年月"], "出生年月"))
ws.cell(row=6+index, column=5, 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=6, value=row["学历"])
ws.cell(row=6+index, column=7, value=nowtime.year-row["入职时间"].year+row["工龄调增"]-row["工龄调减"]+1) 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=8, value=nowtime.year-row["参加工作时间"].year)
ws.cell(row=6+index, column=9, value=row["工龄调增"]) ws.cell(row=6+index, column=9, value=row["工龄调增"])
ws.cell(row=6+index, column=10, 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=11, value=row["Latest_Role"])