diff --git a/main.py b/main.py index 64322f7..2a68d22 100644 --- a/main.py +++ b/main.py @@ -106,7 +106,7 @@ def fill_basic_info(ws, row):# 填充基本信息 ws.cell(row=6, column=4, value=row["原职时间"]) ws.cell(row=6, column=6, value=row["原职年限"]) ws.cell(row=7, column=2, value=row["学历"]) - ws.cell(row=7, column=4, value=row["工龄"]) + ws.cell(row=7, column=4, value=row["学龄"]) ws.cell(row=7, column=6, value=row["套改年限"]) ws.cell(row=7, column=7, value=row["职务工资"]) ws.cell(row=7, column=8, value=row["职务工资金额"]) @@ -231,7 +231,7 @@ for index, row in BaseData.iterrows(): # 汇总 ws.cell(row=6+index, column=4, value=row["出生年月"]) ws.cell(row=6+index, column=5, value=row["参加工作时间"]) ws.cell(row=6+index, column=6, value=row["学历"]) - ws.cell(row=6+index, column=7, value=relativedelta(nowtime, row["入职时间"]).years+row["工龄调增"]-row["工龄调减"]) + ws.cell(row=6+index, column=7, value=relativedelta(nowtime.year(), 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["工龄调减"]) diff --git a/规则需求.md b/规则需求.md index 8f8df81..1e1e26a 100644 --- a/规则需求.md +++ b/规则需求.md @@ -20,7 +20,7 @@ - [ ] 二档起始 - [ ] 五档起始 - [ ] 带输入格式检测(修正、提示) -- [ ] doc: 打包成exe教程 +- [x] doc: 打包成exe教程 [completion:: 2025-05-27] - [x] feat: 【赠送】输出log到文件 [completion:: 2025-05-27] - [ ] fix: 工龄列改为学龄,不参与任何计算。 汇总工龄 = 当年年份-参加工作时间年份+工龄调增-工龄调减+1