Merge remote-tracking branch 'origin/master'

# Conflicts:
#	BiddingKG/dl/interface/Preprocessing.py

BiddingKG/dl/interface/Preprocessing.py

@@ -794,7 +794,7 @@ def tableToText(soup):
     def getTableText(inner_table,head_list,key_direct=False):
         # packPattern = "(标包|[标包][号段名])"
         packPattern = "(标包|标的|[标包][号段名]|((项目|物资|设备|场次|标段|标的|产品)(名称)))"  # 2020/11/23 大网站规则，补充采购类包名
-        rankPattern = "(排名|排序|名次|序号|评标结果|评审结果|是否中标|推荐意见|评标情况|推荐顺序|选取(情况|说明)|备注)"  # 2020/11/23 大网站规则，添加序号为排序  2024/4/22 372839375 表头：备注，内容： 排名：1
+        rankPattern = "(排名|排序|名次|序号|评标结果|评审结果|是否中标|推荐意见|评标情况|推荐顺序|选取(情况|说明))"  # 2020/11/23 大网站规则，添加序号为排序
         entityPattern = "((候选|[中投]标|报价)(单位|公司|人|供应商))|供应商名称"
         moneyPattern = "([中投]标|报价)(金额|价)"
         height = len(inner_table)

BiddingKG/dl/interface/predictor.py

@@ -4631,7 +4631,8 @@ class ProjectLabel():
         sub_project_names = [] # 标段名称
         try:
             for k,v in prem[0]['prem'].items():
-                sub_project_names.append(k)
+                # sub_project_names.append(k)
+                sub_project_names.append(v.get("name",""))
                 for link in v['roleList']:
                     if link['role_name'] == 'tenderee' and tenderee == "":
                         tenderee = link['role_text']