962a3fb6 by 周伟奇

fix zhifubao

1 parent a5da8759
...@@ -589,7 +589,7 @@ CLASSIFY_LIST = [ ...@@ -589,7 +589,7 @@ CLASSIFY_LIST = [
589 589
590 ('中国农业银行账户活期交易明细清单', (1, 2, 4, 5, None, 3, 6, None, None, None, None, None, None)), 590 ('中国农业银行账户活期交易明细清单', (1, 2, 4, 5, None, 3, 6, None, None, None, None, None, None)),
591 ('平安银行个人账户交易明细清单-版式二', (2, None, 3, 4, None, 5, None, 6, None, None, None, None, None)), 591 ('平安银行个人账户交易明细清单-版式二', (2, None, 3, 4, None, 5, None, 6, None, None, None, None, None)),
592 ('支付宝收支明细证明', (8, None, 5, None, None, 3, 2, None, None, None, None, None, None)), 592 ('支付宝收支明细证明', (8, None, 5, None, None, 3, 2, None, None, None, 1, None, None)),
593 593
594 ('其他', OTHER_TUPLE), 594 ('其他', OTHER_TUPLE),
595 595
......
...@@ -118,8 +118,8 @@ class BSWorkbook(Workbook): ...@@ -118,8 +118,8 @@ class BSWorkbook(Workbook):
118 find_count = len(header_col_list) 118 find_count = len(header_col_list)
119 if find_count < 2: 119 if find_count < 2:
120 find_count = 0 120 find_count = 0
121 elif classify == consts.NEW_ZHIFUBAO_CLASSIFY and find_count < 3: 121 # elif classify == consts.NEW_ZHIFUBAO_CLASSIFY and find_count < 3:
122 find_count = 0 122 # find_count = 0
123 else: 123 else:
124 for idx, header_col in header_col_list: 124 for idx, header_col in header_col_list:
125 sheet_header_info.setdefault(ws.title, {}).setdefault(header_col, idx) 125 sheet_header_info.setdefault(ws.title, {}).setdefault(header_col, idx)
...@@ -150,7 +150,7 @@ class BSWorkbook(Workbook): ...@@ -150,7 +150,7 @@ class BSWorkbook(Workbook):
150 key=lambda x: sheet_header_info[x][consts.FIND_COUNT_KEY]) 150 key=lambda x: sheet_header_info[x][consts.FIND_COUNT_KEY])
151 best_sheet_info = sheet_header_info.get(sheet_order_list[0]) 151 best_sheet_info = sheet_header_info.get(sheet_order_list[0])
152 max_find_count = best_sheet_info.get(consts.FIND_COUNT_KEY, 0) 152 max_find_count = best_sheet_info.get(consts.FIND_COUNT_KEY, 0)
153 if max_find_count == 0: 153 if max_find_count == 0 or classify == consts.NEW_ZHIFUBAO_CLASSIFY:
154 if special_nhzs: 154 if special_nhzs:
155 classify = consts.SPECIAL_NYZS_CLASSIFY 155 classify = consts.SPECIAL_NYZS_CLASSIFY
156 for key, value in consts.CLASSIFY_MAP.items(): 156 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!