From 915bd806a7d55306a9b85ee510626100cccd8080 Mon Sep 17 00:00:00 2001
From: mxr612 <work@mxr612.io>
Date: Tue, 10 Jun 2025 23:03:14 +0800
Subject: [PATCH] =?UTF-8?q?[Build=201.4.1]=20fix:=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E6=99=8B=E5=8D=87=E8=AE=B0=E5=BD=95=E6=97=B6=E9=97=B4=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=E4=BB=A5=E7=A1=AE=E4=BF=9D=E5=87=86?=
 =?UTF-8?q?=E7=A1=AE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新晋升记录的时间添加逻辑，确保在记录中正确计算“工资执行时间”与“任职时间”的关系
- 提升数据的准确性和一致性
---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index a0351cf..f1f4517 100644
--- a/main.py
+++ b/main.py
@@ -244,7 +244,7 @@ for index, row in BaseData.iterrows():
         # 添加入职记录
         History_pd.loc[len(History_pd)] = [row["入职时间"], row["初始职务"], "", row["入职时的初始级别"], "", "", "套改/定级", ""]
         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:
             calctime=row["晋档起始"] + relativedelta(minute=1)
             while True: # 添加晋档记录