diff --git a/main.py b/main.py index 21dbb58..da482a6 100644 --- a/main.py +++ b/main.py @@ -225,7 +225,7 @@ for index, row in BaseData.iterrows(): # 查找晋升信息 promote = Promote[Promote["身份证号"] == row["身份证号码"]] 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_Prom"] = promote.iloc[0]["任职时间"] # 把原职务取出来 @@ -236,7 +236,7 @@ for index, row in BaseData.iterrows(): 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)# 填充晋升信息 # 根据规则匹配职级薪资