a18157ca by 冯轩

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

2 parents d63cc7f9 7a232509
...@@ -2088,16 +2088,16 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type): ...@@ -2088,16 +2088,16 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type):
2088 # 若仅提供纸质流水,则默认真伪为N2 2088 # 若仅提供纸质流水,则默认真伪为N2
2089 if not auto_elec_verify_list: 2089 if not auto_elec_verify_list:
2090 result = consts.RESULT_N2 2090 result = consts.RESULT_N2
2091 reason = '第{0}份银行流水为纸质版,请核查流水真伪。'.format('、'.join(auto_paper_verify_list)) 2091 reason = '第{0}份银行流水为纸质版,请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
2092 # 若仅提供电子流水,逐一比对,有false为N1,全部true为Y 2092 # 若仅提供电子流水,逐一比对,有false为N1,全部true为Y
2093 if not auto_paper_verify_list: 2093 if not auto_paper_verify_list:
2094 result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1 2094 result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
2095 reason = '第{0}份银行流水疑似造假,需人工核查。'.format('、'.join(auto_elec_verify_list)) 2095 reason = '第{0}份银行流水疑似造假,需人工核查。'.format('、'.join(auto_elec_verify_false_idx_list))
2096 #同时包含,同时返回N1,N2 2096 #同时包含,同时返回N1,N2
2097 if auto_elec_verify_list and auto_paper_verify_list: 2097 if auto_elec_verify_list and auto_paper_verify_list:
2098 result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1 2098 result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
2099 reason1 = '第{0}份银行流水疑似造假,需人工核查。'.format('、'.join(auto_elec_verify_list)) 2099 reason1 = '第{0}份银行流水疑似造假,需人工核查。'.format('、'.join(auto_elec_verify_false_idx_list))
2100 reason2 = '第{0}份银行流水为纸质版,请核查流水真伪。'.format('、'.join(auto_paper_verify_list)) 2100 reason2 = '第{0}份银行流水为纸质版,请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
2101 reason = reason1 + reason2 2101 reason = reason1 + reason2
2102 result_field_list.append((name, empty_str, result, json.dumps(verify_list, ensure_ascii=False), empty_str, empty_error_type, reason)) 2102 result_field_list.append((name, empty_str, result, json.dumps(verify_list, ensure_ascii=False), empty_str, empty_error_type, reason))
2103 # 非FSM Full & Auto CAA2 目前逻辑和上面的完全一样 2103 # 非FSM Full & Auto CAA2 目前逻辑和上面的完全一样
...@@ -2106,16 +2106,16 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type): ...@@ -2106,16 +2106,16 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type):
2106 # 若仅提供纸质流水,则默认真伪为N2 2106 # 若仅提供纸质流水,则默认真伪为N2
2107 if not auto_elec_verify_list: 2107 if not auto_elec_verify_list:
2108 result = consts.RESULT_N2 2108 result = consts.RESULT_N2
2109 reason = '第{0}份银行流水为纸质版,请核查流水真伪。'.format('、'.join(auto_paper_verify_list)) 2109 reason = '第{0}份银行流水为纸质版,请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
2110 # 若仅提供电子流水,逐一比对,有false为N1,全部true为Y 2110 # 若仅提供电子流水,逐一比对,有false为N1,全部true为Y
2111 if not auto_paper_verify_list: 2111 if not auto_paper_verify_list:
2112 result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1 2112 result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
2113 reason = '第{0}份银行流水疑似造假,需人工核查。'.format('、'.join(auto_elec_verify_list)) 2113 reason = '第{0}份银行流水疑似造假,需人工核查。'.format('、'.join(auto_elec_verify_false_idx_list))
2114 #同时包含,同时返回N1,N2 2114 #同时包含,同时返回N1,N2
2115 if auto_elec_verify_list and auto_paper_verify_list: 2115 if auto_elec_verify_list and auto_paper_verify_list:
2116 result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1 2116 result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
2117 reason1 = '第{0}份银行流水疑似造假,需人工核查。'.format('、'.join(auto_elec_verify_list)) 2117 reason1 = '第{0}份银行流水疑似造假,需人工核查。'.format('、'.join(auto_elec_verify_false_idx_list))
2118 reason2 = '第{0}份银行流水为纸质版,请核查流水真伪。'.format('、'.join(auto_paper_verify_list)) 2118 reason2 = '第{0}份银行流水为纸质版,请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
2119 reason = reason1 + reason2 2119 reason = reason1 + reason2
2120 result_field_list.append((name, empty_str, result, json.dumps(verify_list, ensure_ascii=False), empty_str, empty_error_type, reason)) 2120 result_field_list.append((name, empty_str, result, json.dumps(verify_list, ensure_ascii=False), empty_str, empty_error_type, reason))
2121 2121
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!