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

fix: 优化晋升信息排序逻辑以提升准确性

Browse Source 
- 更新晋升信息的排序方式，新增对“工资执行时间”的排序，确保获取最新的职务和任职时间
- 调整相关代码以保持一致性，提升数据处理的准确性
This commit is contained in:
Miu Li 2025-06-10 11:49:24 +08:00
parent 8d5931db63
commit 5cdb6e3d02
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.py
View File

@ -225,7 +225,7 @@ for index, row in BaseData.iterrows():
# 查找晋升信息 # 查找晋升信息
promote = Promote[Promote["身份证号"] == row["身份证号码"]] promote = Promote[Promote["身份证号"] == row["身份证号码"]]
if not promote.empty: if not promote.empty:
promote = promote.sort_values(by="任职时间", ascending=False).reset_index(drop=True) promote = promote.sort_values(by=["工资执行时间", "任职时间"], ascending=[False, False]).reset_index(drop=True)
BaseData.at[index, "Latest_Role"] = promote.iloc[0]["新职务"] BaseData.at[index, "Latest_Role"] = promote.iloc[0]["新职务"]
BaseData.at[index, "Latest_Prom"] = promote.iloc[0]["任职时间"] BaseData.at[index, "Latest_Prom"] = promote.iloc[0]["任职时间"]
# 把原职务取出来 # 把原职务取出来
@ -236,7 +236,7 @@ for index, row in BaseData.iterrows():
BaseData.at[index, "职务2"] = row["初始职务"] BaseData.at[index, "职务2"] = row["初始职务"]
BaseData.at[index, "日期2"] = row["入职时间"] BaseData.at[index, "日期2"] = row["入职时间"]
promote = promote.sort_values(by="任职时间").reset_index(drop=True) promote = promote.sort_values(by=["工资执行时间", "任职时间"]).reset_index(drop=True)
fill_prompt_info(ws, promote)# 填充晋升信息 fill_prompt_info(ws, promote)# 填充晋升信息
# 根据规则匹配职级薪资 # 根据规则匹配职级薪资