594149a3 by 周伟奇

Merge branch 'feature/e-bank'

2 parents ddd5b3c9 40f5e56c
......@@ -118,8 +118,6 @@ class BSWorkbook(Workbook):
find_count = len(header_col_list)
if find_count < 2:
find_count = 0
# elif classify == consts.NEW_ZHIFUBAO_CLASSIFY and find_count < 3:
# find_count = 0
else:
for idx, header_col in header_col_list:
sheet_header_info.setdefault(ws.title, {}).setdefault(header_col, idx)
......@@ -151,6 +149,7 @@ class BSWorkbook(Workbook):
best_sheet_info = sheet_header_info.get(sheet_order_list[0])
max_find_count = best_sheet_info.get(consts.FIND_COUNT_KEY, 0)
if max_find_count == 0 or classify == consts.NEW_ZHIFUBAO_CLASSIFY:
# if max_find_count == 0:
if special_nhzs:
classify = consts.SPECIAL_NYZS_CLASSIFY
for key, value in consts.CLASSIFY_MAP.items():
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!