From 6aede8002364e245bc103b0285b476cc8a1c1f21 Mon Sep 17 00:00:00 2001 From: mxr612 Date: Sat, 14 Jun 2025 16:16:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=B7=A5=E9=BE=84?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5=E5=BC=95=E7=94=A8=E4=BB=A5?= =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E5=87=86=E7=A1=AE=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在add_history函数中将工龄计算字段从“参加工作时间”更新为“入职时间”,以确保计算逻辑的准确性 - 优化历史记录更新逻辑,提升数据一致性 --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 57e9998..fe76a97 100644 --- a/main.py +++ b/main.py @@ -304,7 +304,7 @@ def add_history(History_pd, row, promote): for rule in Rule_Level: if row["入职时间"] < rule["start"]: History_pd.loc[len(History_pd),["变动后时间","变动原因"]] = [rule["start"], "工资调标"] - calctime = row["参加工作时间"] + calctime = row["入职时间"] while True: calctime += relativedelta(years=1) if calctime > NOWTIME: