[Build 1.4.0] fix: 修正晋升记录添加逻辑以处理缺失备注

- 更新晋升记录的添加逻辑,确保在备注缺失时不产生多余空格
- 提升数据的准确性和可读性
This commit is contained in:
Miu Li 2025-06-10 11:54:25 +08:00
parent 5cdb6e3d02
commit 4db6f6c10f

View File

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