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

[Build 1.4.1] fix: 修正晋升记录时间处理逻辑以确保准确性

Browse Source 
- 更新晋升记录的时间添加逻辑，确保在记录中正确计算“工资执行时间”与“任职时间”的关系
- 提升数据的准确性和一致性
This commit is contained in:
Miu Li 2025-06-10 23:03:14 +08:00
parent 4db6f6c10f
commit 915bd806a7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.py
View File

@ -244,7 +244,7 @@ for index, row in BaseData.iterrows():
# 添加入职记录 # 添加入职记录
History_pd.loc[len(History_pd)] = [row["入职时间"], row["初始职务"], "", row["入职时的初始级别"], "", "", "套改/定级", ""] History_pd.loc[len(History_pd)] = [row["入职时间"], row["初始职务"], "", row["入职时的初始级别"], "", "", "套改/定级", ""]
for index, prow in promote.iterrows(): # 添加晋升记录 for index, prow in promote.iterrows(): # 添加晋升记录
History_pd.loc[len(History_pd)] = [prow["工资执行时间"], prow["新职务"], "", "", "", "", "晋升", f"任{prow['新职务']} {prow['变动批注'] if pd.notna(prow['变动批注']) else ''}"] History_pd.loc[len(History_pd)] = [prow["工资执行时间"]+relativedelta(hours=prow["任职时间"].month,minutes=prow["任职时间"].day), prow["新职务"], "", "", "", "", "晋升", f"任{prow['新职务']} {prow['变动批注'] if pd.notna(prow['变动批注']) else ''}"]
try: try:
calctime=row["晋档起始"] + relativedelta(minute=1) calctime=row["晋档起始"] + relativedelta(minute=1)
while True: # 添加晋档记录 while True: # 添加晋档记录