feat: 添加五年1级和两年1档年份计算字段

- 在历史记录中新增五年1级年份和两年1档年份的计算逻辑
- 更新变动前时间字段的格式化处理，确保数据一致性

main.py

@@ -48,6 +48,14 @@ def format_time(dt,info):
         logging.warning(f"[{info}]时间格式错误：{dt}")
         return dt
 
+def format_time_ymd(dt,info):
+    try:
+        return dt.strftime("%Y.%m.%d")
+
+    except:
+        logging.warning(f"[{info}]时间格式错误：{dt}")
+        return dt
+
 def to_int(x):
     try:
         return int(x)
@@ -269,14 +277,14 @@ def fill_history_info(ws, History_pd):# 填充历史记录
         for col in range(1, 11): # 复制样式
             ws.cell(row=H_START+index, column=col)._style = ws.cell(row=H_START, column=col)._style
         try:
-            ws.cell(row=H_START+index, column=1, value=format_time(hrow["时间"],"历史时间"))
+            ws.cell(row=H_START+index, column=1, value=format_time(hrow["变动后时间"],"历史时间"))
         except:
             logging.warning(f"历史时间格式错误：{hrow['时间']}")
-        ws.cell(row=H_START+index, column=2, value=hrow["职务"])
+        ws.cell(row=H_START+index, column=2, value=hrow["变动后职务"])
-        ws.cell(row=H_START+index, column=3, value=hrow["职务工资"])
+        ws.cell(row=H_START+index, column=3, value=hrow["变动后职务工资"])
-        ws.cell(row=H_START+index, column=4, value=hrow["级别档次"])
+        ws.cell(row=H_START+index, column=4, value=hrow["变动后级别档次"])
-        ws.cell(row=H_START+index, column=5, value=hrow["级别工资"])
+        ws.cell(row=H_START+index, column=5, value=hrow["变动后级别工资"])
-        ws.cell(row=H_START+index, column=6, value=hrow["工资合计"])
+        ws.cell(row=H_START+index, column=6, value=hrow["变动后工资合计"])
         ws.cell(row=H_START+index, column=7, value=hrow["变动原因"])
         # ws.cell(row=H_START+index, column=8, value=index) # Debug
 
@@ -344,85 +352,117 @@ def main():
                 fill_prompt_info(ws, promote)# 填充晋升信息
                 
             # 根据规则匹配职级薪资
-            History_pd = pd.DataFrame(columns=["时间", "职务", "职务工资", "级别档次", "级别工资", "工资合计", "变动原因", "晋升备注"])
+            History_pd = pd.DataFrame(columns=[
+                "身份证号码", "姓名", # 统一填入
+                "变动后时间", "变动后职务", "变动原因", "晋升备注", # 直接填入
+                "工龄", "五年1级年份", "两年1档年份", # 简单计算更新
+                "变动前时间", "变动前职务", "变动前级别档次", "变动前职务工资", "变动前级别工资", "变动前津贴工资", "变动前工资合计", # 排序后更新
+                "变动后级别档次", "变动后职务工资", "变动后级别工资", "变动后津贴工资", "变动后工资合计"]) # 复杂计算更新
+            
             # 添加入职记录
-            History_pd.loc[len(History_pd)] = [row["入职时间"], row["初始职务"], "", row["入职时的初始级别"], "", "", "套改/定级", ""]
+            History_pd.loc[len(History_pd), ["变动后时间","变动后职务","变动原因","变动后级别档次"]] = [
+                row["入职时间"],row["初始职务"],"套改/定级",row["入职时的初始级别"]]
             for index, prow in promote.iterrows(): # 添加晋升记录
-                History_pd.loc[len(History_pd)] = [prow["工资执行时间"]+relativedelta(hours=prow["任职时间"].month,minutes=prow["任职时间"].day), 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: # 添加晋档记录
+                while True: 
                     calctime += relativedelta(years=row["晋档间隔"]) 
                     if calctime > NOWTIME:
                         break
-                    History_pd.loc[len(History_pd)] = [calctime, "", "", "", "", "", "两年晋档", ""]
+                    History_pd.loc[len(History_pd),["变动后时间","变动原因"]] = [
+                        calctime,"两年晋档"]
                 calctime=row["晋级起始"]
-                while True: # 添加晋级记录
+                # 添加晋级记录
+                while True: 
                     calctime += relativedelta(years=row["晋级间隔"])
                     if calctime > NOWTIME:
                         break
-                    History_pd.loc[len(History_pd)] = [calctime, "", "", "", "", "", "五年晋级", ""]
+                    History_pd.loc[len(History_pd),["变动后时间","变动原因"]] = [
+                        calctime,"五年晋级"]
             except:
                 raise Exception(f"晋级、档起始或间隔时间格式错误：{row['晋级起始']}-{row['晋档起始']}-{row['晋级间隔']}-{row['晋档间隔']}")
-            for rule in Rule_Level: # 工资调标
+            # 工资调标
+            for rule in Rule_Level: 
                 if row["入职时间"] < rule["start"]:
-                    History_pd.loc[len(History_pd)] = [rule["start"], "", "", "", "", "", "工资调标", ""]
+                    History_pd.loc[len(History_pd),["变动后时间","变动原因"]] = [rule["start"], "工资调标"]
-            History_pd = History_pd.sort_values(by="时间").reset_index(drop=True)
+            History_pd["身份证号码"] = row["身份证号码"]
+            History_pd["姓名"] = row["姓名"]
+            History_pd["工龄"] = History_pd.apply(lambda x: calculate_seniority(row, x["变动后时间"].year), axis=1)
+            History_pd["五年1级年份"] = History_pd.apply(lambda x: x["变动后时间"].year - row["晋级起始"].year, axis=1)
+            History_pd["两年1档年份"] = History_pd.apply(lambda x: x["变动后时间"].year - row["晋档起始"].year, axis=1)
+            History_pd = History_pd.sort_values(by="变动后时间").reset_index(drop=True)
 
-            if History_pd.at[0,"时间"] != row["入职时间"]:
+            if History_pd.at[0,"变动后时间"] != row["入职时间"]:
-                raise Exception(f"入职时间晚于其他时间:{row['入职时间']} < {History_pd.at[0,'时间']} ({History_pd.at[0,'变动原因']})")
+                raise Exception(f"入职时间晚于其他时间:{row['入职时间']} < {History_pd.at[0,'变动后时间']} ({History_pd.at[0,'变动原因']})")
-            for index, hrow in History_pd.iterrows(): # 数据计算
+
-                # 调整职务职级
+            # 复杂数据计算
-                if index > 0 and hrow["职务"] == "":
+            for index, hrow in History_pd.iterrows(): 
-                    History_pd.at[index, "职务"] = History_pd.iloc[index-1]["职务"]
+                # 继承上一条复杂计算数据
-                for rule in Rule_RoleName: # 名称变化
+                if index > 0:
-                    if rule["start"] <= hrow["时间"] <= rule["end"]:
+                    History_pd.at[index, "变动前时间"] = History_pd.at[index-1, "变动后时间"]
-                        if History_pd.iloc[index]["职务"] in rule["rule"]["原名称"].values:
+                    History_pd.at[index, "变动前职务"] = History_pd.at[index-1, "变动后职务"]
-                            History_pd.at[index, "职务"] = rule["rule"][rule["rule"]["原名称"] == History_pd.iloc[index]["职务"]]["现名称"].values[0]
+                    History_pd.at[index, "变动前级别档次"] = History_pd.at[index-1, "变动后级别档次"]
-                if index > 0 and hrow["级别档次"] == "":
+                    History_pd.at[index, "变动前职务工资"] = History_pd.at[index-1, "变动后职务工资"]
-                    jb, dc = split_level(History_pd.iloc[index-1]["级别档次"])
+                    History_pd.at[index, "变动前级别工资"] = History_pd.at[index-1, "变动后级别工资"]
+                    History_pd.at[index, "变动前津贴工资"] = History_pd.at[index-1, "变动后津贴工资"]
+                    History_pd.at[index, "变动前工资合计"] = History_pd.at[index-1, "变动后工资合计"]
+                    # 继承名称
+                    if pd.isna(hrow["变动后职务"]):
+                        History_pd.at[index,"变动后职务"] = History_pd.at[index,"变动前职务"]
+                # 名称变化
+                for rule in Rule_RoleName: 
+                    if rule["start"] <= hrow["变动后时间"] <= rule["end"]:
+                        if History_pd.at[index,"变动后职务"] in rule["rule"]["原名称"].values:
+                            History_pd.at[index,"变动后职务"] = rule["rule"][rule["rule"]["原名称"] == History_pd.at[index,"变动后职务"]]["现名称"].values[0]
+                # 级别档次
+                if index > 0:
+                    jb, dc = split_level(History_pd.at[index,"变动前级别档次"])
                     if hrow["变动原因"] == "两年晋档":
-                        History_pd.at[index, "级别档次"] = f"{jb}-{dc+1}"
+                        History_pd.at[index, "变动后级别档次"] = f"{jb}-{dc+1}"
                     elif hrow["变动原因"] == "五年晋级":
-                        if jb-1 < 1 or jb-1 < role_limit(History_pd.iloc[index]["职务"]):
+                        if jb-1 < 1 or jb-1 < role_limit(History_pd.iloc[index]["变动后职务"]):
-                            History_pd.at[index, "级别档次"] = f"{jb}-{dc+1}"
+
+                            History_pd.at[index, "变动后级别档次"] = f"{jb}-{dc+1}"
                         else:
-                            History_pd.at[index, "级别档次"] = f"{jb-1}-{dc-1}"
+                            History_pd.at[index, "变动后级别档次"] = f"{jb-1}-{dc-1}"
                     elif hrow["变动原因"] == "工资调标":
-                        History_pd.at[index, "级别档次"] = f"{jb}-{dc}"
+                        History_pd.at[index, "变动后级别档次"] = f"{jb}-{dc}"
                     elif hrow["变动原因"] == "晋升":
-                        role = History_pd.iloc[index]["职务"]
+                        role = History_pd.iloc[index]["变动后职务"]
                         if role in Promote_Level.keys():
                             new_jb = jb + Promote_Level[role][0]
                             new_dc = dc + Promote_Level[role][1]
                             if pd.isna(new_jb) or pd.isna(new_dc):
-                                print(Promote_Level[role][1])
                                 raise Exception(f"级别档次计算出现NaN值：[{new_jb}]-[{new_dc}]({role})")
                             else:
                                 new_jb = int(new_jb)
                                 new_dc = int(new_dc)
-                            if (History_pd.iloc[index-1]["职务"] in Promote_verify.iloc[:,0].values and 
+                            if (History_pd.at[index,"变动后职务"] in Promote_verify.iloc[:,0].values and 
                                 role in Promote_verify.iloc[:,1].values):
-                                logging.info(f"[{row['身份证号码']}]命中晋升校验规则[{History_pd.iloc[index-1]['职务']}]->[{role}]")
+                                logging.info(f"[{row['身份证号码']}]命中晋升校验规则[{History_pd.at[index,'变动前职务']}]->[{role}]")
-                                History_pd.at[index, "级别档次"] = f"{jb}-{dc}"
+                                History_pd.at[index, "变动后级别档次"] = f"{jb}-{dc}"
                             elif new_jb < role_limit(role):
-                                History_pd.at[index, "级别档次"] = f"{jb}-{dc+1}"
+                                History_pd.at[index, "变动后级别档次"] = f"{jb}-{dc+1}"
                             elif new_jb < 1 or new_dc < 1:
                                 raise Exception(f"级别档次小于0：[{new_jb}]-[{new_dc}]")
                             else:
-                                History_pd.at[index, "级别档次"] = f"{new_jb}-{new_dc}"
+                                History_pd.at[index, "变动后级别档次"] = f"{new_jb}-{new_dc}"
                         else:
                             logging.warning(f"职位[{role}]不存在职级上限规则")
+                    else:
+                        History_pd.at[index, "变动后级别档次"] = History_pd.at[index, "变动前级别档次"]
                 # 计算工资
-                History_pd.at[index, "职务工资"] = role_salary(History_pd.iloc[index]["职务"], hrow["时间"])
+                History_pd.at[index, "变动后职务工资"] = role_salary(History_pd.iloc[index]["变动后职务"], hrow["变动后时间"])
-                History_pd.at[index, "级别工资"] = level_salary(History_pd.iloc[index]["级别档次"], hrow["时间"])
+                History_pd.at[index, "变动后级别工资"] = level_salary(History_pd.iloc[index]["变动后级别档次"], hrow["变动后时间"])
-                History_pd.at[index, "工资合计"] = to_int(History_pd.iloc[index]["职务工资"]) + to_int(History_pd.iloc[index]["级别工资"])
+                History_pd.at[index, "变动后工资合计"] = to_int(History_pd.iloc[index]["变动后职务工资"]) + to_int(History_pd.iloc[index]["变动后级别工资"])
 
             fill_history_info(ws, History_pd)# 填充历史记录
             
             # 将当前人员的历史记录添加到总表中
-            History_pd["身份证号码"] = row["身份证号码"]
-            History_pd["姓名"] = row["姓名"]
             all_history = pd.concat([all_history, History_pd], ignore_index=True)
             
             wb.save(f"个人台账/{row['身份证号码']}_{row['姓名']}.xlsx")
@@ -430,7 +470,8 @@ def main():
             logging.error(f"{row['身份证号码']}:{e}")
 
     # 保存所有历史记录到Excel文件
-    all_history["时间"] = all_history["时间"].apply(lambda x: format_time(x, "历史记录时间"))
+    all_history["变动后时间"] = all_history["变动后时间"].apply(lambda x: format_time_ymd(x, "历史记录时间"))
+    all_history["变动前时间"] = all_history["变动前时间"].apply(lambda x: format_time_ymd(x, "历史记录时间"))
     all_history.to_excel("所有人员历史记录.xlsx", index=False)
     logging.info("所有人员历史记录已保存到'所有人员历史记录.xlsx'")