fix card *
Showing
1 changed file
with
8 additions
and
4 deletions
... | @@ -295,7 +295,7 @@ class BSWorkbook(Workbook): | ... | @@ -295,7 +295,7 @@ class BSWorkbook(Workbook): |
295 | 295 | ||
296 | def build_meta_sheet(self, card, confidence, code, print_time, start_date, end_date): | 296 | def build_meta_sheet(self, card, confidence, code, print_time, start_date, end_date): |
297 | metadata_rows = self.build_metadata_rows(confidence, code, print_time, start_date, end_date) | 297 | metadata_rows = self.build_metadata_rows(confidence, code, print_time, start_date, end_date) |
298 | ms = self.create_sheet('{0}({1})'.format(self.meta_sheet_title, card[-6:])) | 298 | ms = self.create_sheet('{0}({1})'.format(self.meta_sheet_title, card)) |
299 | for row in metadata_rows: | 299 | for row in metadata_rows: |
300 | ms.append(row) | 300 | ms.append(row) |
301 | return ms | 301 | return ms |
... | @@ -394,7 +394,7 @@ class BSWorkbook(Workbook): | ... | @@ -394,7 +394,7 @@ class BSWorkbook(Workbook): |
394 | for month in sorted(month_mapping.keys()): | 394 | for month in sorted(month_mapping.keys()): |
395 | # 3.1.拷贝数据 | 395 | # 3.1.拷贝数据 |
396 | parts = month_mapping.get(month) | 396 | parts = month_mapping.get(month) |
397 | new_ws = self.create_sheet('{0}({1})'.format(month, card[-6:])) | 397 | new_ws = self.create_sheet('{0}({1})'.format(month, card)) |
398 | new_ws.append(header) | 398 | new_ws.append(header) |
399 | for part in parts: | 399 | for part in parts: |
400 | ws = self.get_sheet_by_name(part[0]) | 400 | ws = self.get_sheet_by_name(part[0]) |
... | @@ -540,6 +540,10 @@ class BSWorkbook(Workbook): | ... | @@ -540,6 +540,10 @@ class BSWorkbook(Workbook): |
540 | # } | 540 | # } |
541 | # } | 541 | # } |
542 | for card, summary in bs_summary.items(): | 542 | for card, summary in bs_summary.items(): |
543 | try: | ||
544 | new_card = card[-6:].replace('*', '') | ||
545 | except Exception as e: | ||
546 | new_card = '异常卡号' | ||
543 | # 1.原表表头收集、按照月份分割 | 547 | # 1.原表表头收集、按照月份分割 |
544 | # 1.1 总结首行信息 | 548 | # 1.1 总结首行信息 |
545 | classify = summary.get('classify', 0) | 549 | classify = summary.get('classify', 0) |
... | @@ -571,7 +575,7 @@ class BSWorkbook(Workbook): | ... | @@ -571,7 +575,7 @@ class BSWorkbook(Workbook): |
571 | 575 | ||
572 | # 2.元信息提取表 | 576 | # 2.元信息提取表 |
573 | confidence = self.get_confidence(max_find_count) | 577 | confidence = self.get_confidence(max_find_count) |
574 | ms = self.build_meta_sheet(card, | 578 | ms = self.build_meta_sheet(new_card, |
575 | confidence, | 579 | confidence, |
576 | summary.get('code'), | 580 | summary.get('code'), |
577 | summary.get('print_time'), | 581 | summary.get('print_time'), |
... | @@ -584,7 +588,7 @@ class BSWorkbook(Workbook): | ... | @@ -584,7 +588,7 @@ class BSWorkbook(Workbook): |
584 | for month_list in month_mapping.values(): | 588 | for month_list in month_mapping.values(): |
585 | month_list.sort(key=lambda x: x[-1], reverse=is_reverse) | 589 | month_list.sort(key=lambda x: x[-1], reverse=is_reverse) |
586 | 590 | ||
587 | self.build_month_sheet(ms, card, month_mapping, is_reverse, statistics_header_info, max_column, classify) | 591 | self.build_month_sheet(ms, new_card, month_mapping, is_reverse, statistics_header_info, max_column, classify) |
588 | 592 | ||
589 | # 4.删除原表 | 593 | # 4.删除原表 |
590 | for sheet in sheets_list: | 594 | for sheet in sheets_list: | ... | ... |
-
Please register or sign in to post a comment