From 21db947816cfb431bbd40fa12ef9bbc326d56e64 Mon Sep 17 00:00:00 2001
From: mxr612 <work@mxr612.io>
Date: Thu, 12 Jun 2025 21:17:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B4=A5=E8=B4=B4?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E8=AF=BB=E5=8F=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增read_allowance函数用于从Excel中读取津贴规则数据，并整合到全局变量Allowance中。该功能作为规则加载的一部分被集成到load_rule函数中。
---
 main.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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("规则加载完成")
 
 # 获取配置类函数