From 4db6f6c10f263566527c095999c0480550455f9e Mon Sep 17 00:00:00 2001 From: mxr612 Date: Tue, 10 Jun 2025 11:54:25 +0800 Subject: [PATCH] =?UTF-8?q?[Build=201.4.0]=20fix:=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E6=99=8B=E5=8D=87=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BB=A5=E5=A4=84=E7=90=86=E7=BC=BA=E5=A4=B1=E5=A4=87?= =?UTF-8?q?=E6=B3=A8?= 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 da482a6..a0351cf 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['变动批注']}"] + History_pd.loc[len(History_pd)] = [prow["工资执行时间"], prow["新职务"], "", "", "", "", "晋升", f"任{prow['新职务']} {prow['变动批注'] if pd.notna(prow['变动批注']) else ''}"] try: calctime=row["晋档起始"] + relativedelta(minute=1) while True: # 添加晋档记录