ae56a619 by 周伟奇

fix DDA

1 parent bfa90f18
...@@ -847,6 +847,10 @@ def get_se_compare_info(last_obj, application_entity, detect_list): ...@@ -847,6 +847,10 @@ def get_se_compare_info(last_obj, application_entity, detect_list):
847 bank_field_input = [] 847 bank_field_input = []
848 for bank_field in consts.SE_BANK_FIELD: 848 for bank_field in consts.SE_BANK_FIELD:
849 bank_field_input.append((bank_field, bank_info_dict[bank_field])) 849 bank_field_input.append((bank_field, bank_info_dict[bank_field]))
850 if '工商' in bank_info_dict.get(consts.SE_BANK_FIELD[-1], ''):
851 is_gsyh = True
852 else:
853 is_gsyh = False
850 bank_info[consts.BC_EN] = bank_field_input 854 bank_info[consts.BC_EN] = bank_field_input
851 855
852 dda_field_input = [] 856 dda_field_input = []
...@@ -874,7 +878,7 @@ def get_se_compare_info(last_obj, application_entity, detect_list): ...@@ -874,7 +878,7 @@ def get_se_compare_info(last_obj, application_entity, detect_list):
874 other_info[consts.HMH_EN] = hmh_field_input 878 other_info[consts.HMH_EN] = hmh_field_input
875 compare_info['other'] = other_info 879 compare_info['other'] = other_info
876 880
877 return compare_info 881 return compare_info, is_gsyh
878 882
879 883
880 def se_compare_license(license_en, ocr_res_dict, field_list): 884 def se_compare_license(license_en, ocr_res_dict, field_list):
...@@ -1003,7 +1007,7 @@ def se_mvc34_compare(license_en, ocr_res_dict, field_list): ...@@ -1003,7 +1007,7 @@ def se_mvc34_compare(license_en, ocr_res_dict, field_list):
1003 return result_field_list 1007 return result_field_list
1004 1008
1005 1009
1006 def se_compare_process(compare_info, ocr_res_dict): 1010 def se_compare_process(compare_info, ocr_res_dict, is_gsyh):
1007 # individualCusInfo 1011 # individualCusInfo
1008 # corporateCusInfo 1012 # corporateCusInfo
1009 # vehicleInfo 1013 # vehicleInfo
...@@ -1053,7 +1057,7 @@ def se_compare_process(compare_info, ocr_res_dict): ...@@ -1053,7 +1057,7 @@ def se_compare_process(compare_info, ocr_res_dict):
1053 else: 1057 else:
1054 result_field_list, no_ocr_result = se_compare_license(license_en, ocr_res_dict, field_list) 1058 result_field_list, no_ocr_result = se_compare_license(license_en, ocr_res_dict, field_list)
1055 for name, value, result, ocr_str, img_path, error_type in result_field_list: 1059 for name, value, result, ocr_str, img_path, error_type in result_field_list:
1056 if license_en != consts.DDA_EN or not no_ocr_result: 1060 if license_en != consts.DDA_EN or not no_ocr_result or is_gsyh:
1057 total_fields += 1 1061 total_fields += 1
1058 if result == consts.RESULT_N: 1062 if result == consts.RESULT_N:
1059 failed_count += 1 1063 failed_count += 1
...@@ -1095,9 +1099,9 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res ...@@ -1095,9 +1099,9 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res
1095 # 比对逻辑 1099 # 比对逻辑
1096 start_time = datetime.now() 1100 start_time = datetime.now()
1097 detect_list = se_result_detect(ocr_res_dict) 1101 detect_list = se_result_detect(ocr_res_dict)
1098 compare_info = get_se_compare_info(last_obj, application_entity, detect_list) 1102 compare_info, is_gsyh = get_se_compare_info(last_obj, application_entity, detect_list)
1099 compare_result, total_fields, failed_count, successful_at_this_level, failure_reason_str = se_compare_process( 1103 compare_result, total_fields, failed_count, successful_at_this_level, failure_reason_str = se_compare_process(
1100 compare_info, ocr_res_dict) 1104 compare_info, ocr_res_dict, is_gsyh)
1101 compare_log.info('{0} [SE] [compare success] [entity={1}] [id={2}] [ocr_res_id={3}] [result={4}]'.format( 1105 compare_log.info('{0} [SE] [compare success] [entity={1}] [id={2}] [ocr_res_id={3}] [result={4}]'.format(
1102 log_base, application_entity, application_id, ocr_res_id, compare_result)) 1106 log_base, application_entity, application_id, ocr_res_id, compare_result))
1103 except Exception as e: 1107 except Exception as e:
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!