Skip to content

周伟奇 / bmw-ocr

Go to a project
Toggle navigation
Toggle navigation pinning
136ec512 by 冯轩
Options

Merge branch 'feature/CHINARPA-4660' into feature/uat-tmp

2 parents a6787ca7 f81cb90d
Inline Side-by-side
Showing 1 changed file with 18 additions and 22 deletions
src/celery_compare/tasks.py
...@@ -954,10 +954,10 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d ...@@ -954,10 +954,10 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d
954 is_cdfl_bo = True 954 is_cdfl_bo = True
955 955
956 # CHINARPA-4660 是否公户判断 956 # CHINARPA-4660 是否公户判断
957 is_bo_tccor = False 957 is_bo_corporate = False
958 customersubType = individual_info.get('customersubType', '') 958 customersubType = individual_info.get('customersubType', '')
959 if individual_info['applicantType'] == consts.APPLICANT_TYPE_ORDER[0] and customersubType == 'TCCOR': 959 if individual_info['applicantType'] == consts.APPLICANT_TYPE_ORDER[0] and is_corporate:
960 is_bo_tccor = True 960 is_bo_corporate = True
961 961
962 for id_info in individual_info.get('IDInformation', []): 962 for id_info in individual_info.get('IDInformation', []):
963 if id_info.get('idType') in consts.SE_CMS_FIRST_ID_FIELD_MAPPING: 963 if id_info.get('idType') in consts.SE_CMS_FIRST_ID_FIELD_MAPPING:
...@@ -972,9 +972,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d ...@@ -972,9 +972,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d
972 license_dict[license_en] = field_input 972 license_dict[license_en] = field_input
973 all_id_num.append(id_num) 973 all_id_num.append(id_num)
974 # 营业执照 -------------------------------------------------------------------------------------------------- 974 # 营业执照 --------------------------------------------------------------------------------------------------
975 # 4660 修改比对营业执照文档必要性的判断条件 975 elif id_info.get('idType') in ['Unified Social Credit Code', 'Tax Number', 'Business License Number']:
976 # elif id_info.get('idType') in ['Unified Social Credit Code', 'Tax Number', 'Business License Number']:
977 elif is_bo_tccor:
978 # ['companyName', 'legalRepName', 'businessLicenseNo', 'organizationCreditCode', 976 # ['companyName', 'legalRepName', 'businessLicenseNo', 'organizationCreditCode',
979 # 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate'] 977 # 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate']
980 id_num = decode_des(id_info.get('idNum', ''), des_key) 978 id_num = decode_des(id_info.get('idNum', ''), des_key)
...@@ -984,7 +982,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d ...@@ -984,7 +982,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d
984 ('businessLicenseNo', id_num), 982 ('businessLicenseNo', id_num),
985 ('organizationCreditCode', id_num), 983 ('organizationCreditCode', id_num),
986 ('taxRegistrationCertificateNo', id_num), 984 ('taxRegistrationCertificateNo', id_num),
987 ('businessLicenseDueDate', id_info.get('idExpiryDate', '')), 985 # ('businessLicenseDueDate', id_info.get('idExpiryDate', '')),
988 ] 986 ]
989 987
990 if is_corporate: 988 if is_corporate:
...@@ -1139,7 +1137,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d ...@@ -1139,7 +1137,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d
1139 totalAssets = corporateFinancialInformation.get('totalAssets', 0) 1137 totalAssets = corporateFinancialInformation.get('totalAssets', 0)
1140 totalLiabilitiesAndOwnersEquity = corporateFinancialInformation.get('totalLiabilitiesAndOwnersEquity', 0) 1138 totalLiabilitiesAndOwnersEquity = corporateFinancialInformation.get('totalLiabilitiesAndOwnersEquity', 0)
1141 netProfit = corporateFinancialInformation.get('netProfit', 0) 1139 netProfit = corporateFinancialInformation.get('netProfit', 0)
1142 if is_bo_tccor: 1140 if is_bo_corporate:
1143 financial_statement_input.append((consts.SE_FS_FIELD[0], hashCode)) 1141 financial_statement_input.append((consts.SE_FS_FIELD[0], hashCode))
1144 financial_statement_input.append((consts.SE_FS_FIELD[1], consts.SE_STAMP_VALUE)) 1142 financial_statement_input.append((consts.SE_FS_FIELD[1], consts.SE_STAMP_VALUE))
1145 financial_statement_input.append((consts.SE_FS_FIELD[2], fiscalYear)) 1143 financial_statement_input.append((consts.SE_FS_FIELD[2], fiscalYear))
...@@ -1404,7 +1402,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d ...@@ -1404,7 +1402,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d
1404 if len(main_role_info[app_type]) >= id_idx+1: 1402 if len(main_role_info[app_type]) >= id_idx+1:
1405 is_find = True 1403 is_find = True
1406 if isinstance(field_idx, int): 1404 if isinstance(field_idx, int):
1407 if key == '承租人签字' and is_bo_tccor: 1405 if key == '承租人签字' and is_bo_corporate:
1408 hil_contract_1_input.append((key, legal_name)) 1406 hil_contract_1_input.append((key, legal_name))
1409 else: 1407 else:
1410 hil_contract_1_input.append((key, main_role_info[app_type][id_idx][field_idx])) 1408 hil_contract_1_input.append((key, main_role_info[app_type][id_idx][field_idx]))
...@@ -1449,7 +1447,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d ...@@ -1449,7 +1447,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d
1449 if len(main_role_info[app_type]) >= id_idx+1: 1447 if len(main_role_info[app_type]) >= id_idx+1:
1450 is_find = True 1448 is_find = True
1451 if isinstance(field_idx, int): 1449 if isinstance(field_idx, int):
1452 if key == '抵押人签字' and is_bo_tccor: 1450 if key == '抵押人签字' and is_bo_corporate:
1453 hil_contract_2_input.append((key, legal_name)) 1451 hil_contract_2_input.append((key, legal_name))
1454 else: 1452 else:
1455 hil_contract_2_input.append((key, main_role_info[app_type][id_idx][field_idx])) 1453 hil_contract_2_input.append((key, main_role_info[app_type][id_idx][field_idx]))
...@@ -1519,7 +1517,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d ...@@ -1519,7 +1517,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d
1519 if len(main_role_info[app_type]) >= id_idx+1: 1517 if len(main_role_info[app_type]) >= id_idx+1:
1520 is_find = True 1518 is_find = True
1521 if isinstance(field_idx, int): 1519 if isinstance(field_idx, int):
1522 if (key == '借款人签字及时间' or key == '主借人签字') and is_bo_tccor: 1520 if (key == '借款人签字及时间' or key == '主借人签字') and is_bo_corporate:
1523 afc_contract_input.append((key, legal_name)) 1521 afc_contract_input.append((key, legal_name))
1524 else: 1522 else:
1525 afc_contract_input.append((key, main_role_info[app_type][id_idx][field_idx])) 1523 afc_contract_input.append((key, main_role_info[app_type][id_idx][field_idx]))
...@@ -1593,10 +1591,10 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect ...@@ -1593,10 +1591,10 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect
1593 is_cdfl_bo = True 1591 is_cdfl_bo = True
1594 1592
1595 # CHINARPA-4660 是否公户判断 1593 # CHINARPA-4660 是否公户判断
1596 is_bo_tccor = False 1594 is_bo_corporate = False
1597 customersubType = individual_info.get('customersubType', '') 1595 customersubType = individual_info.get('customersubType', '')
1598 if individual_info['applicantType'] == consts.APPLICANT_TYPE_ORDER[0] and customersubType == 'TCCOR': 1596 if individual_info['applicantType'] == consts.APPLICANT_TYPE_ORDER[0] and is_corporate:
1599 is_bo_tccor = True 1597 is_bo_corporate = True
1600 1598
1601 for id_info in individual_info.get('IDInformation', []): 1599 for id_info in individual_info.get('IDInformation', []):
1602 if id_info.get('idType') in consts.SE_CMS_FIRST_ID_FIELD_MAPPING: 1600 if id_info.get('idType') in consts.SE_CMS_FIRST_ID_FIELD_MAPPING:
...@@ -1611,9 +1609,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect ...@@ -1611,9 +1609,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect
1611 license_dict[license_en] = field_input 1609 license_dict[license_en] = field_input
1612 all_id_num.append(id_num) 1610 all_id_num.append(id_num)
1613 # 营业执照 -------------------------------------------------------------------------------------------------- 1611 # 营业执照 --------------------------------------------------------------------------------------------------
1614 # 4660 修改比对营业执照文档必要性的判断条件 1612 elif id_info.get('idType') in ['Unified Social Credit Code', 'Tax Number', 'Business License Number']:
1615 # elif id_info.get('idType') in ['Unified Social Credit Code', 'Tax Number', 'Business License Number']:
1616 elif is_bo_tccor:
1617 # ['companyName', 'legalRepName', 'businessLicenseNo', 'organizationCreditCode', 1613 # ['companyName', 'legalRepName', 'businessLicenseNo', 'organizationCreditCode',
1618 # 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate'] 1614 # 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate']
1619 id_num = decode_des(id_info.get('idNum', ''), des_key) 1615 id_num = decode_des(id_info.get('idNum', ''), des_key)
...@@ -1778,7 +1774,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect ...@@ -1778,7 +1774,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect
1778 totalAssets = corporateFinancialInformation.get('totalAssets', 0) 1774 totalAssets = corporateFinancialInformation.get('totalAssets', 0)
1779 totalLiabilitiesAndOwnersEquity = corporateFinancialInformation.get('totalLiabilitiesAndOwnersEquity', 0) 1775 totalLiabilitiesAndOwnersEquity = corporateFinancialInformation.get('totalLiabilitiesAndOwnersEquity', 0)
1780 netProfit = corporateFinancialInformation.get('netProfit', 0) 1776 netProfit = corporateFinancialInformation.get('netProfit', 0)
1781 if is_bo_tccor: 1777 if is_bo_corporate:
1782 financial_statement_input.append((consts.SE_FS_FIELD[0], hashCode)) 1778 financial_statement_input.append((consts.SE_FS_FIELD[0], hashCode))
1783 financial_statement_input.append((consts.SE_FS_FIELD[1], consts.SE_STAMP_VALUE)) 1779 financial_statement_input.append((consts.SE_FS_FIELD[1], consts.SE_STAMP_VALUE))
1784 financial_statement_input.append((consts.SE_FS_FIELD[2], fiscalYear)) 1780 financial_statement_input.append((consts.SE_FS_FIELD[2], fiscalYear))
...@@ -2006,7 +2002,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect ...@@ -2006,7 +2002,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect
2006 if len(main_role_info[app_type]) >= id_idx+1: 2002 if len(main_role_info[app_type]) >= id_idx+1:
2007 is_find = True 2003 is_find = True
2008 if isinstance(field_idx, int): 2004 if isinstance(field_idx, int):
2009 if key == '承租人签字' and is_bo_tccor: 2005 if key == '承租人签字' and is_bo_corporate:
2010 hil_contract_1_input.append((key, legal_name)) 2006 hil_contract_1_input.append((key, legal_name))
2011 else: 2007 else:
2012 hil_contract_1_input.append((key, main_role_info[app_type][id_idx][field_idx])) 2008 hil_contract_1_input.append((key, main_role_info[app_type][id_idx][field_idx]))
...@@ -2028,7 +2024,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect ...@@ -2028,7 +2024,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect
2028 (consts.SE_HIL_CON_3_FIELD[6], main_id), 2024 (consts.SE_HIL_CON_3_FIELD[6], main_id),
2029 ] 2025 ]
2030 if online_sign: 2026 if online_sign:
2031 if is_bo_tccor: 2027 if is_bo_corporate:
2032 hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], legal_name)) 2028 hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], legal_name))
2033 else: 2029 else:
2034 hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], main_name)) 2030 hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], main_name))
...@@ -2054,7 +2050,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect ...@@ -2054,7 +2050,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect
2054 if len(main_role_info[app_type]) >= id_idx+1: 2050 if len(main_role_info[app_type]) >= id_idx+1:
2055 is_find = True 2051 is_find = True
2056 if isinstance(field_idx, int): 2052 if isinstance(field_idx, int):
2057 if key == '抵押人签字' and is_bo_tccor: 2053 if key == '抵押人签字' and is_bo_corporate:
2058 hil_contract_2_input.append((key, legal_name)) 2054 hil_contract_2_input.append((key, legal_name))
2059 else: 2055 else:
2060 hil_contract_2_input.append((key, main_role_info[app_type][id_idx][field_idx])) 2056 hil_contract_2_input.append((key, main_role_info[app_type][id_idx][field_idx]))
...@@ -2124,7 +2120,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect ...@@ -2124,7 +2120,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect
2124 if len(main_role_info[app_type]) >= id_idx+1: 2120 if len(main_role_info[app_type]) >= id_idx+1:
2125 is_find = True 2121 is_find = True
2126 if isinstance(field_idx, int): 2122 if isinstance(field_idx, int):
2127 if (key == '借款人签字及时间' or key == '主借人签字') and is_bo_tccor: 2123 if (key == '借款人签字及时间' or key == '主借人签字') and is_bo_corporate:
2128 afc_contract_input.append((key, legal_name)) 2124 afc_contract_input.append((key, legal_name))
2129 else: 2125 else:
2130 afc_contract_input.append((key, main_role_info[app_type][id_idx][field_idx])) 2126 afc_contract_input.append((key, main_role_info[app_type][id_idx][field_idx]))
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!