Skip to content

周伟奇 / bmw-ocr

Go to a project
Toggle navigation
Toggle navigation pinning
dcce1082 by 周伟奇
Options

fix bug

1 parent 725a8e62
Inline Side-by-side
Showing 2 changed files with 10 additions and 7 deletions
src/celery_compare/tasks.py
...@@ -37,7 +37,7 @@ def field_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_set): ...@@ -37,7 +37,7 @@ def field_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_set):
37 input_str = info_dict.get(compare_tuple[0]) 37 input_str = info_dict.get(compare_tuple[0])
38 ocr_str = ocr_res.get(compare_tuple[1]) 38 ocr_str = ocr_res.get(compare_tuple[1])
39 compare_res, ocr_output = getattr(cp, compare_tuple[2])( 39 compare_res, ocr_output = getattr(cp, compare_tuple[2])(
40 info_dict.get(compare_tuple[0]), ocr_res.get(compare_tuple[1]), idx, **compare_tuple[3]) 40 input_str, ocr_str, idx, **compare_tuple[3])
41 if idx == 0 and compare_res == consts.RESULT_N: 41 if idx == 0 and compare_res == consts.RESULT_N:
42 break 42 break
43 is_find = True 43 is_find = True
...@@ -69,7 +69,7 @@ def usedcar_info_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_s ...@@ -69,7 +69,7 @@ def usedcar_info_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_s
69 input_str = info_dict.get(compare_tuple[0]) 69 input_str = info_dict.get(compare_tuple[0])
70 ocr_str = ocr_res.get(compare_tuple[1]) 70 ocr_str = ocr_res.get(compare_tuple[1])
71 compare_res, ocr_output = getattr(cp, compare_tuple[2])( 71 compare_res, ocr_output = getattr(cp, compare_tuple[2])(
72 info_dict.get(compare_tuple[0]), ocr_res.get(compare_tuple[1]), idx, **compare_tuple[3]) 72 input_str, ocr_str, idx, **compare_tuple[3])
73 if idx == 0 and compare_res == consts.RESULT_N: 73 if idx == 0 and compare_res == consts.RESULT_N:
74 if ocr_str is not None: 74 if ocr_str is not None:
75 no_match_vino.append(ocr_str) 75 no_match_vino.append(ocr_str)
...@@ -84,8 +84,10 @@ def usedcar_info_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_s ...@@ -84,8 +84,10 @@ def usedcar_info_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_s
84 res_set.add(compare_res) 84 res_set.add(compare_res)
85 if not is_find: 85 if not is_find:
86 res_set.add(consts.RESULT_N) 86 res_set.add(consts.RESULT_N)
87 for compare_tuple in compare_list: 87 for idx, compare_tuple in enumerate(compare_list):
88 info_dict[compare_tuple[4]] = consts.RESULT_N 88 info_dict[compare_tuple[4]] = consts.RESULT_N
89 if idx == 0:
90 continue
89 if compare_tuple[0] in info_dict: 91 if compare_tuple[0] in info_dict:
90 del info_dict[compare_tuple[0]] 92 del info_dict[compare_tuple[0]]
91 return is_find, no_match_vino 93 return is_find, no_match_vino
...@@ -142,9 +144,6 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id): ...@@ -142,9 +144,6 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id):
142 order_individual_cus_info_list = [] 144 order_individual_cus_info_list = []
143 for individual_cus_info in individual_cus_info_list: 145 for individual_cus_info in individual_cus_info_list:
144 order_individual_cus_info = get_order_dict(individual_cus_info, consts.IN_ORDER) 146 order_individual_cus_info = get_order_dict(individual_cus_info, consts.IN_ORDER)
145 # sep营业执照
146 if is_sep and order_individual_cus_info.get('companyName') is not None:
147 field_compare(order_individual_cus_info, ocr_res_dict, consts.BL_OCR_FIELD, consts.TCSEP, res_set)
148 147
149 # 个人信息证件 148 # 个人信息证件
150 id_type = order_individual_cus_info.get('idType') 149 id_type = order_individual_cus_info.get('idType')
...@@ -153,6 +152,10 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id): ...@@ -153,6 +152,10 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id):
153 continue 152 continue
154 field_compare(order_individual_cus_info, ocr_res_dict, compare_info_list[0], compare_info_list[1], res_set) 153 field_compare(order_individual_cus_info, ocr_res_dict, compare_info_list[0], compare_info_list[1], res_set)
155 154
155 # sep营业执照
156 if is_sep and order_individual_cus_info.get('companyName') is not None:
157 field_compare(order_individual_cus_info, ocr_res_dict, consts.BL_OCR_FIELD, consts.TCSEP, res_set)
158
156 order_individual_cus_info_list.append(order_individual_cus_info) 159 order_individual_cus_info_list.append(order_individual_cus_info)
157 160
158 comparison_res['OCR_Input']['individualCusInfo'] = order_individual_cus_info_list 161 comparison_res['OCR_Input']['individualCusInfo'] = order_individual_cus_info_list
......
src/common/tools/comparison.py
...@@ -100,7 +100,7 @@ class Comparison: ...@@ -100,7 +100,7 @@ class Comparison:
100 else: 100 else:
101 compare_str = self.CSOTH 101 compare_str = self.CSOTH
102 102
103 return self.build_res(input_str == compare_str), ocr_str 103 return self.build_res(input_str == compare_str), compare_str
104 104
105 105
106 cp = Comparison() 106 cp = Comparison()
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!