MOD:财报导致的其他合同变更
Showing
1 changed file
with
44 additions
and
13 deletions
... | @@ -972,25 +972,28 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d | ... | @@ -972,25 +972,28 @@ 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 | elif id_info.get('idType') in ['Unified Social Credit Code', 'Tax Number', 'Business License Number']: | 975 | # 4660 修改比对营业执照文档必要性的判断条件 |
976 | # elif id_info.get('idType') in ['Unified Social Credit Code', 'Tax Number', 'Business License Number']: | ||
977 | elif is_bo_tccor: | ||
976 | # ['companyName', 'legalRepName', 'businessLicenseNo', 'organizationCreditCode', | 978 | # ['companyName', 'legalRepName', 'businessLicenseNo', 'organizationCreditCode', |
977 | # 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate'] | 979 | # 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate'] |
978 | id_num = decode_des(id_info.get('idNum', ''), des_key) | 980 | id_num = decode_des(id_info.get('idNum', ''), des_key) |
979 | # bl_field_input = [ | 981 | bl_field_input = [ |
980 | # ('companyName', customer_name), | 982 | ('companyName', customer_name), |
981 | # ('legalRepName', legal_name), | 983 | ('legalRepName', legal_name), |
982 | # ('businessLicenseNo', id_num), | 984 | ('businessLicenseNo', id_num), |
983 | # ('organizationCreditCode', id_num), | 985 | ('organizationCreditCode', id_num), |
984 | # ('taxRegistrationCertificateNo', id_num), | 986 | ('taxRegistrationCertificateNo', id_num), |
985 | # ('businessLicenseDueDate', id_info.get('idExpiryDate', '')), | 987 | ('businessLicenseDueDate', id_info.get('idExpiryDate', '')), |
986 | # ] | 988 | ] |
987 | 989 | ||
988 | if is_corporate: | 990 | if is_corporate: |
989 | company_info_list.append((customer_name, id_num, legal_name)) | 991 | company_info_list.append((customer_name, id_num, legal_name)) |
990 | # else: | 992 | else: |
991 | # bl_field_input.append(('establishmentDate', establishment_date)) | 993 | bl_field_input.append(('establishmentDate', establishment_date)) |
992 | 994 | ||
993 | # license_dict[consts.BL_EN] = bl_field_input | 995 | compare_log.info('{0} [bl_field_input] [{1}]'.format(log_base, bl_field_input)) |
996 | license_dict[consts.BL_EN] = bl_field_input | ||
994 | all_id_num.append(id_num) | 997 | all_id_num.append(id_num) |
995 | 998 | ||
996 | # SME营业执照--------------------------------------------------------------------------------------------------- | 999 | # SME营业执照--------------------------------------------------------------------------------------------------- |
... | @@ -1006,6 +1009,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d | ... | @@ -1006,6 +1009,7 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d |
1006 | (customer_name, '、'.join(all_id_num), all_id_num[0]) | 1009 | (customer_name, '、'.join(all_id_num), all_id_num[0]) |
1007 | ) | 1010 | ) |
1008 | 1011 | ||
1012 | compare_log.info('{0} [license_dict] [{1}]'.format(log_base, license_dict)) | ||
1009 | if len(license_dict) > 0: | 1013 | if len(license_dict) > 0: |
1010 | individual_info_dict.setdefault(individual_info['applicantType'], []).append(license_dict) | 1014 | individual_info_dict.setdefault(individual_info['applicantType'], []).append(license_dict) |
1011 | 1015 | ||
... | @@ -1400,6 +1404,9 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d | ... | @@ -1400,6 +1404,9 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d |
1400 | if len(main_role_info[app_type]) >= id_idx+1: | 1404 | if len(main_role_info[app_type]) >= id_idx+1: |
1401 | is_find = True | 1405 | is_find = True |
1402 | if isinstance(field_idx, int): | 1406 | if isinstance(field_idx, int): |
1407 | if key == '承租人签字' and is_bo_tccor: | ||
1408 | hil_contract_1_input.append((key, legal_name)) | ||
1409 | else: | ||
1403 | hil_contract_1_input.append((key, main_role_info[app_type][id_idx][field_idx])) | 1410 | hil_contract_1_input.append((key, main_role_info[app_type][id_idx][field_idx])) |
1404 | else: | 1411 | else: |
1405 | hil_contract_1_input.append((key, field_idx)) | 1412 | hil_contract_1_input.append((key, field_idx)) |
... | @@ -1442,6 +1449,9 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d | ... | @@ -1442,6 +1449,9 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d |
1442 | if len(main_role_info[app_type]) >= id_idx+1: | 1449 | if len(main_role_info[app_type]) >= id_idx+1: |
1443 | is_find = True | 1450 | is_find = True |
1444 | if isinstance(field_idx, int): | 1451 | if isinstance(field_idx, int): |
1452 | if key == '抵押人签字' and is_bo_tccor: | ||
1453 | hil_contract_2_input.append((key, legal_name)) | ||
1454 | else: | ||
1445 | hil_contract_2_input.append((key, main_role_info[app_type][id_idx][field_idx])) | 1455 | hil_contract_2_input.append((key, main_role_info[app_type][id_idx][field_idx])) |
1446 | else: | 1456 | else: |
1447 | hil_contract_2_input.append((key, field_idx)) | 1457 | hil_contract_2_input.append((key, field_idx)) |
... | @@ -1509,6 +1519,9 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d | ... | @@ -1509,6 +1519,9 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d |
1509 | if len(main_role_info[app_type]) >= id_idx+1: | 1519 | if len(main_role_info[app_type]) >= id_idx+1: |
1510 | is_find = True | 1520 | is_find = True |
1511 | if isinstance(field_idx, int): | 1521 | if isinstance(field_idx, int): |
1522 | if (key == '借款人签字及时间' or key == '主借人签字') and is_bo_tccor: | ||
1523 | afc_contract_input.append((key, legal_name)) | ||
1524 | else: | ||
1512 | afc_contract_input.append((key, main_role_info[app_type][id_idx][field_idx])) | 1525 | afc_contract_input.append((key, main_role_info[app_type][id_idx][field_idx])) |
1513 | else: | 1526 | else: |
1514 | afc_contract_input.append((key, field_idx)) | 1527 | afc_contract_input.append((key, field_idx)) |
... | @@ -1598,7 +1611,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect | ... | @@ -1598,7 +1611,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect |
1598 | license_dict[license_en] = field_input | 1611 | license_dict[license_en] = field_input |
1599 | all_id_num.append(id_num) | 1612 | all_id_num.append(id_num) |
1600 | # 营业执照 -------------------------------------------------------------------------------------------------- | 1613 | # 营业执照 -------------------------------------------------------------------------------------------------- |
1601 | elif id_info.get('idType') in ['Unified Social Credit Code', 'Tax Number', 'Business License Number']: | 1614 | # 4660 修改比对营业执照文档必要性的判断条件 |
1615 | # elif id_info.get('idType') in ['Unified Social Credit Code', 'Tax Number', 'Business License Number']: | ||
1616 | elif is_bo_tccor: | ||
1602 | # ['companyName', 'legalRepName', 'businessLicenseNo', 'organizationCreditCode', | 1617 | # ['companyName', 'legalRepName', 'businessLicenseNo', 'organizationCreditCode', |
1603 | # 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate'] | 1618 | # 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate'] |
1604 | id_num = decode_des(id_info.get('idNum', ''), des_key) | 1619 | id_num = decode_des(id_info.get('idNum', ''), des_key) |
... | @@ -1616,6 +1631,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect | ... | @@ -1616,6 +1631,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect |
1616 | else: | 1631 | else: |
1617 | bl_field_input.append(('establishmentDate', establishment_date)) | 1632 | bl_field_input.append(('establishmentDate', establishment_date)) |
1618 | 1633 | ||
1634 | compare_log.info('{0} [bl_field_input] [{1}]'.format(log_base, bl_field_input)) | ||
1619 | license_dict[consts.BL_EN] = bl_field_input | 1635 | license_dict[consts.BL_EN] = bl_field_input |
1620 | all_id_num.append(id_num) | 1636 | all_id_num.append(id_num) |
1621 | 1637 | ||
... | @@ -1632,6 +1648,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect | ... | @@ -1632,6 +1648,7 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect |
1632 | (customer_name, '、'.join(all_id_num), all_id_num[0]) | 1648 | (customer_name, '、'.join(all_id_num), all_id_num[0]) |
1633 | ) | 1649 | ) |
1634 | 1650 | ||
1651 | compare_log.info('{0} [license_dict] [{1}]'.format(log_base, license_dict)) | ||
1635 | if len(license_dict) > 0: | 1652 | if len(license_dict) > 0: |
1636 | individual_info_dict.setdefault(individual_info['applicantType'], []).append(license_dict) | 1653 | individual_info_dict.setdefault(individual_info['applicantType'], []).append(license_dict) |
1637 | 1654 | ||
... | @@ -1989,6 +2006,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect | ... | @@ -1989,6 +2006,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect |
1989 | if len(main_role_info[app_type]) >= id_idx+1: | 2006 | if len(main_role_info[app_type]) >= id_idx+1: |
1990 | is_find = True | 2007 | is_find = True |
1991 | if isinstance(field_idx, int): | 2008 | if isinstance(field_idx, int): |
2009 | if key == '承租人签字' and is_bo_tccor: | ||
2010 | hil_contract_1_input.append((key, legal_name)) | ||
2011 | else: | ||
1992 | hil_contract_1_input.append((key, main_role_info[app_type][id_idx][field_idx])) | 2012 | hil_contract_1_input.append((key, main_role_info[app_type][id_idx][field_idx])) |
1993 | else: | 2013 | else: |
1994 | hil_contract_1_input.append((key, field_idx)) | 2014 | hil_contract_1_input.append((key, field_idx)) |
... | @@ -2008,6 +2028,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect | ... | @@ -2008,6 +2028,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect |
2008 | (consts.SE_HIL_CON_3_FIELD[6], main_id), | 2028 | (consts.SE_HIL_CON_3_FIELD[6], main_id), |
2009 | ] | 2029 | ] |
2010 | if online_sign: | 2030 | if online_sign: |
2031 | if is_bo_tccor: | ||
2032 | hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], legal_name)) | ||
2033 | else: | ||
2011 | hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], main_name)) | 2034 | hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], main_name)) |
2012 | contract_info[consts.HIL_CONTRACT_3_EN] = hil_contract_3_input | 2035 | contract_info[consts.HIL_CONTRACT_3_EN] = hil_contract_3_input |
2013 | 2036 | ||
... | @@ -2031,6 +2054,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect | ... | @@ -2031,6 +2054,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect |
2031 | if len(main_role_info[app_type]) >= id_idx+1: | 2054 | if len(main_role_info[app_type]) >= id_idx+1: |
2032 | is_find = True | 2055 | is_find = True |
2033 | if isinstance(field_idx, int): | 2056 | if isinstance(field_idx, int): |
2057 | if key == '抵押人签字' and is_bo_tccor: | ||
2058 | hil_contract_2_input.append((key, legal_name)) | ||
2059 | else: | ||
2034 | hil_contract_2_input.append((key, main_role_info[app_type][id_idx][field_idx])) | 2060 | hil_contract_2_input.append((key, main_role_info[app_type][id_idx][field_idx])) |
2035 | else: | 2061 | else: |
2036 | hil_contract_2_input.append((key, field_idx)) | 2062 | hil_contract_2_input.append((key, field_idx)) |
... | @@ -2098,6 +2124,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect | ... | @@ -2098,6 +2124,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect |
2098 | if len(main_role_info[app_type]) >= id_idx+1: | 2124 | if len(main_role_info[app_type]) >= id_idx+1: |
2099 | is_find = True | 2125 | is_find = True |
2100 | if isinstance(field_idx, int): | 2126 | if isinstance(field_idx, int): |
2127 | if (key == '借款人签字及时间' or key == '主借人签字') and is_bo_tccor: | ||
2128 | afc_contract_input.append((key, legal_name)) | ||
2129 | else: | ||
2101 | afc_contract_input.append((key, main_role_info[app_type][id_idx][field_idx])) | 2130 | afc_contract_input.append((key, main_role_info[app_type][id_idx][field_idx])) |
2102 | else: | 2131 | else: |
2103 | afc_contract_input.append((key, field_idx)) | 2132 | afc_contract_input.append((key, field_idx)) |
... | @@ -3184,6 +3213,7 @@ def se_compare_process(compare_info, ocr_res_dict, is_gsyh, is_auto, id_res_list | ... | @@ -3184,6 +3213,7 @@ def se_compare_process(compare_info, ocr_res_dict, is_gsyh, is_auto, id_res_list |
3184 | for info_key, info_value in compare_info.items(): | 3213 | for info_key, info_value in compare_info.items(): |
3185 | if info_key in ['individualCusInfo', 'applicantInformation']: | 3214 | if info_key in ['individualCusInfo', 'applicantInformation']: |
3186 | for idx, license_list in info_value.items(): | 3215 | for idx, license_list in info_value.items(): |
3216 | compare_log.info('{0} [compare license_list] [entity={1}]'.format(log_base, license_list)) | ||
3187 | for license_dict in license_list: | 3217 | for license_dict in license_list: |
3188 | for license_en, field_list in license_dict.items(): | 3218 | for license_en, field_list in license_dict.items(): |
3189 | strip_list = [] | 3219 | strip_list = [] |
... | @@ -3239,6 +3269,7 @@ def se_compare_process(compare_info, ocr_res_dict, is_gsyh, is_auto, id_res_list | ... | @@ -3239,6 +3269,7 @@ def se_compare_process(compare_info, ocr_res_dict, is_gsyh, is_auto, id_res_list |
3239 | each_license_failed_count, len(result_field_list))) | 3269 | each_license_failed_count, len(result_field_list))) |
3240 | else: | 3270 | else: |
3241 | for license_en, field_list in info_value.items(): | 3271 | for license_en, field_list in info_value.items(): |
3272 | compare_log.info('{0} [compare license_en] [entity={1}]'.format(log_base, license_en)) | ||
3242 | strip_list = [] | 3273 | strip_list = [] |
3243 | for a, b in field_list: | 3274 | for a, b in field_list: |
3244 | if isinstance(b, str): | 3275 | if isinstance(b, str): | ... | ... |
-
Please register or sign in to post a comment