diff --git a/main.py b/main.py index cd54c5d..12d98df 100644 --- a/main.py +++ b/main.py @@ -29,6 +29,7 @@ Rule_RoleName = [] Level_Limit = pd.DataFrame() Promote_Level = pd.DataFrame() Promote_verify = pd.DataFrame() +Allowance = [] ## 统计量 max_promote = 0 @@ -153,6 +154,22 @@ def read_promote_verify(): # 读取晋升校验 global Promote_verify Promote_verify = pd.read_excel("原数据.xlsx", sheet_name="晋升校验", usecols="A:B") +def read_allowance(): # 读取津贴 + global Allowance + col = 1 + while True: + try: + rule = pd.read_excel("原数据.xlsx", sheet_name="津贴规则",usecols=f"{get_column_letter(col)}:{get_column_letter(col+1)}", header=None) + Allowance.append({ + "start":rule.iloc[0,1], + "end":rule.iloc[1,1], + "rule":pd.read_excel("原数据.xlsx", sheet_name="津贴规则",usecols=f"{get_column_letter(col)}:{get_column_letter(col+1)}",skiprows=2, names=["level","salary"]) + }) + col += 2 + except: + break + Allowance = sorted(Allowance, key=lambda x: x['start']) + def load_people(): read_base_data() read_promote() @@ -164,6 +181,7 @@ def load_rule(): read_rule_role_name() read_level_limit() read_promote_verify() + read_allowance() logging.info("规则加载完成") # 获取配置类函数