c238b4d4 by 周伟奇

Merge branch 'feature/mvc' into feature/compare

2 parents 9ee45b07 ce8753ee
...@@ -659,6 +659,26 @@ class BSWorkbook(Workbook): ...@@ -659,6 +659,26 @@ class BSWorkbook(Workbook):
659 if classify == consts.IC_CLASSIFY and license_dict.get('类别') == '1': # 居住证处理 659 if classify == consts.IC_CLASSIFY and license_dict.get('类别') == '1': # 居住证处理
660 license_summary.setdefault(consts.RP_CLASSIFY, []).append(license_dict) 660 license_summary.setdefault(consts.RP_CLASSIFY, []).append(license_dict)
661 continue 661 continue
662 if classify == consts.MVC_CLASSIFY:
663 try:
664 mvc_page = license_dict.pop('page')
665 except Exception as e:
666 pass
667 else:
668 if mvc_page == 'VehicleRegArea':
669 tmp_dict = {
670 '姓名/名称': [],
671 '身份证明名称/号码': [],
672 '转移登记日期': [],
673 }
674 mvc_res = license_dict.get('results', {})
675 for register_info in mvc_res.get('register_info', []):
676 if register_info.get('register_type', 0) == 2:
677 tmp_dict['姓名/名称'].append(register_info.get('details', {}).get('name', {}).get('words', ''))
678 tmp_dict['身份证明名称/号码'].append(register_info.get('details', {}).get('idno', {}).get('words', ''))
679 tmp_dict['转移登记日期'].append(register_info.get('details', {}).get('date', {}).get('words', ''))
680 license_dict = tmp_dict
681 del tmp_dict
662 if side_diff: 682 if side_diff:
663 key, field_order_yes, field_order_no = consts.FIELD_ORDER_MAP.get(classify) 683 key, field_order_yes, field_order_no = consts.FIELD_ORDER_MAP.get(classify)
664 field_order = field_order_yes if key in license_dict else field_order_no 684 field_order = field_order_yes if key in license_dict else field_order_no
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!