a7e918d7 by 周伟奇

fix date bug

1 parent 154cff10
...@@ -387,18 +387,18 @@ HEADERS_MAPPING.update( ...@@ -387,18 +387,18 @@ HEADERS_MAPPING.update(
387 # "9": "部分格线-竖版-平安电子账单" 387 # "9": "部分格线-竖版-平安电子账单"
388 # } 388 # }
389 389
390 CLASSIFY_LIST = [ 390 # CLASSIFY_LIST = [
391 ('农业银行', (1, None, 3, 5, None, 8, 7, 6, None, None, None, None, None)), 391 # ('农业银行', (1, None, 3, 5, None, 8, 7, 6, None, None, None, None, None)),
392 ('中国银行', (1, 2, 4, 5, 6, 9, 10, 11, 12, None, None, None, None)), 392 # ('中国银行', (1, 2, 4, 5, 6, 9, 10, 11, 12, None, None, None, None)),
393 ('北京银行', (1, None, 4, 5, None, 2, 6, 7, None, None, 3, None, None)), 393 # ('北京银行', (1, None, 4, 5, None, 2, 6, 7, None, None, 3, None, None)),
394 ('工商银行', (1, None, 9, 10, None, 7, None, None, None, None, None, None, None)), 394 # ('工商银行', (1, None, 9, 10, None, 7, None, None, None, None, None, None, None)),
395 ('建设银行', (None, None, None, None, None, 2, None, None, None, None, None, None, None)), 395 # ('建设银行', (None, None, None, None, None, 2, None, None, None, None, None, None, None)),
396 ('中信银行', (1, None, None, 5, None, 2, 6, 7, 8, None, None, 3, 4)), 396 # ('中信银行', (1, None, None, 5, None, 2, 6, 7, 8, None, None, 3, 4)),
397 ('中信银行', (1, None, None, 5, None, 2, 6, 7, 8, None, None, 3, 4)), 397 # ('中信银行', (1, None, None, 5, None, 2, 6, 7, 8, None, None, 3, 4)),
398 ('农业银行', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)), 398 # ('农业银行', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)),
399 ('农业银行', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)), 399 # ('农业银行', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)),
400 ('平安电子账单', (2, None, 5, 6, None, 4, None, None, None, None, None, None, None)), 400 # ('平安电子账单', (2, None, 5, 6, None, 4, None, None, None, None, None, None, None)),
401 ] 401 # ]
402 402
403 # { 403 # {
404 # "0":"其他", 404 # "0":"其他",
...@@ -429,30 +429,30 @@ CLASSIFY_LIST = [ ...@@ -429,30 +429,30 @@ CLASSIFY_LIST = [
429 # "22":"针式打印-部分格线-邮储银行一本通绿卡" 429 # "22":"针式打印-部分格线-邮储银行一本通绿卡"
430 # } 430 # }
431 431
432 # CLASSIFY_LIST = [ 432 CLASSIFY_LIST = [
433 # ('其他', (None, None, None, None, None, None, None, None, None, None, None, None, None)), 433 ('其他', (None, None, None, None, None, None, None, None, None, None, None, None, None)),
434 # ('农业银行', (1, None, 3, 5, None, 8, 7, 6, None, None, None, None, None)), 434 ('农业银行', (1, None, 3, 5, None, 8, 7, 6, None, None, None, None, None)),
435 # ('中国银行', (1, 2, 4, 5, 6, 9, 10, 11, 12, None, None, None, None)), 435 ('中国银行', (1, 2, 4, 5, 6, 9, 10, 11, 12, None, None, None, None)),
436 # ('北京银行', (1, None, 4, 5, None, 2, 6, 7, None, None, 3, None, None)), 436 ('北京银行', (1, None, 4, 5, None, 2, 6, 7, None, None, 3, None, None)),
437 # ('工商银行', (1, None, 9, 10, None, 7, None, None, None, None, None, None, None)), 437 ('工商银行', (1, None, 9, 10, None, 7, None, None, None, None, None, None, None)),
438 # ('建设银行', (None, None, None, None, None, 2, None, None, None, None, None, None, None)), 438 ('建设银行', (None, None, None, None, None, 2, None, None, None, None, None, None, None)),
439 # ('微信', (2, None, 6, None, None, 3, 7, None, None, None, None, None, None)), 439 ('微信', (2, None, 6, None, None, 3, 7, None, None, None, None, None, None)),
440 # ('支付宝', (2, None, None, 6, None, 3, None, None, None, None, None, 4, 5)), 440 ('支付宝', (2, None, None, 6, None, 3, None, None, None, None, None, 4, 5)),
441 # 441
442 # ('交通银行', (1, None, 5, 6, None, 3, None, None, None, None, 4, None, None)), 442 ('交通银行', (1, None, 5, 6, None, 3, None, None, None, None, 4, None, None)),
443 # ('农业银行', (1, None, 3, None, None, 2, None, 4, None, None, None, None, None)), 443 ('农业银行', (1, None, 3, None, None, 2, None, 4, None, None, None, None, None)),
444 # ('农业银行', (1, 2, None, None, None, None, None, None, None, None, None, None, None)), 444 ('农业银行', (1, 2, None, None, None, None, None, None, None, None, None, None, None)),
445 # ('招商银行', (1, None, 3, 4, None, 6, None, None, None, None, None, None, None)), 445 ('招商银行', (1, None, 3, 4, None, 6, None, None, None, None, None, None, None)),
446 # ('招商银行电子版', (1, None, 3, 4, None, 5, 6, None, None, None, None, None, None)), 446 ('招商银行电子版', (1, None, 3, 4, None, 5, 6, None, None, None, None, None, None)),
447 # ('民生银行', (None, None, 5, 6, None, None, 7, None, 8, None, None, None, None)), 447 ('民生银行', (None, None, 5, 6, None, None, 7, None, 8, None, None, None, None)),
448 # 448
449 # ('中信银行', (1, None, None, 5, None, 2, 6, 7, 8, None, None, 3, 4)), 449 ('中信银行', (1, None, None, 5, None, 2, 6, 7, 8, None, None, 3, 4)),
450 # ('农业银行', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)), 450 ('农业银行', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)),
451 # ('农业银行', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)), 451 ('农业银行', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)),
452 # ('农业银行', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)), 452 ('农业银行', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)),
453 # ('平安电子账单', (2, None, 5, 6, None, 4, None, None, None, None, None, None, None)), 453 ('平安电子账单', (2, None, 5, 6, None, 4, None, None, None, None, None, None, None)),
454 # 454
455 # ('建设银行', (None, None, None, None, None, None, None, None, None, None, None, None, None)), 455 ('建设银行', (None, None, None, None, None, None, None, None, None, None, None, None, None)),
456 # ('邮储银行', (2, None, 5, 6, None, 4, None, 7, None, None, None, None, None)), 456 ('邮储银行', (2, None, 5, 6, None, 4, None, 7, None, None, None, None, None)),
457 # ('邮储银行', (2, None, 5, 6, None, 4, None, 7, None, None, None, None, None)), 457 ('邮储银行', (2, None, 5, 6, None, 4, None, 7, None, None, None, None, None)),
458 # ] 458 ]
......
...@@ -5,7 +5,7 @@ import asyncio ...@@ -5,7 +5,7 @@ import asyncio
5 import aiohttp 5 import aiohttp
6 import difflib 6 import difflib
7 import requests 7 import requests
8 from datetime import datetime 8 from datetime import datetime, date
9 from collections import Counter 9 from collections import Counter
10 from apps.doc.ocr.wb import BSWorkbook, Workbook 10 from apps.doc.ocr.wb import BSWorkbook, Workbook
11 from django.core.management import BaseCommand 11 from django.core.management import BaseCommand
...@@ -207,18 +207,18 @@ class Command(BaseCommand, LoggerMixin): ...@@ -207,18 +207,18 @@ class Command(BaseCommand, LoggerMixin):
207 @staticmethod 207 @staticmethod
208 def date_format(date_str, format_str): 208 def date_format(date_str, format_str):
209 try: 209 try:
210 date = datetime.strptime(date_str, format_str) 210 date_res = datetime.strptime(date_str, format_str).date()
211 except Exception as e: 211 except Exception as e:
212 return 212 return
213 else: 213 else:
214 return date 214 return date_res
215 215
216 def get_validate_date(self, date_list): 216 def get_validate_date(self, date_list):
217 for date_str in date_list: 217 for date_str in date_list:
218 for format_str in consts.DATE_FORMAT: 218 for format_str in consts.DATE_FORMAT:
219 date = self.date_format(date_str, format_str) 219 date_res = self.date_format(date_str, format_str)
220 if isinstance(date, datetime): 220 if isinstance(date_res, date):
221 return date 221 return date_res
222 222
223 def merge_card(self, bs_summary): 223 def merge_card(self, bs_summary):
224 merged_bs_summary = {} 224 merged_bs_summary = {}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!