From 5cdb6e3d029840bad4a1624f01579ccc83a7bad4 Mon Sep 17 00:00:00 2001 From: mxr612 Date: Tue, 10 Jun 2025 11:49:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=99=8B=E5=8D=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91=E4=BB=A5?= =?UTF-8?q?=E6=8F=90=E5=8D=87=E5=87=86=E7=A1=AE=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新晋升信息的排序方式，新增对“工资执行时间”的排序，确保获取最新的职务和任职时间 - 调整相关代码以保持一致性，提升数据处理的准确性 --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)# 填充晋升信息 # 根据规则匹配职级薪资