mxr612/YansTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix: 将工龄列改为学龄并修正汇总工龄计算

Browse Source 
- 将main.py中的"工龄"字段统一改为"学龄"以符合需求文档要求
- 修正汇总工龄计算公式，增加"+1"的调整项
- 更新需求文档中对应任务的完成状态
This commit is contained in:
Miu Li 2025-05-27 15:32:22 +08:00
parent 5115ec86ad
commit 13c8619cb2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.py
View File

@ -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["工龄调减"])

2
规则需求.md
View File

@ -20,7 +20,7 @@
- [ ] 二档起始
- [ ] 五档起始
- [ ] 带输入格式检测（修正、提示）
- [ ] doc: 打包成exe教程
- [x] doc: 打包成exe教程 [completion:: 2025-05-27]
- [x] feat: 【赠送】输出log到文件 [completion:: 2025-05-27]
- [ ] fix: 工龄列改为学龄，不参与任何计算。
汇总工龄 = 当年年份-参加工作时间年份+工龄调增-工龄调减+1