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

冯轩
Showing 1 changed file with 80 additions and 35 deletions
src/celery_compare/tasks.py
--- a/src/celery_compare/tasks.py
View file @65be0b7
+++ b/src/celery_compare/tasks.py
View file @65be0b7
@@ -2290,6 +2290,7 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_
        auto_paper_verify_list = []
        auto_elec_verify_list = []
        auto_paper_verify_false_idx_list = []
+        auto_paper_verify_true_idx_list = []
        auto_elec_verify_false_idx_list = []
        all_zhifubao_weixin = True
@@ -2314,8 +2315,11 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_
                    auto_elec_verify_false_idx_list.append(str(tmp_idx+1))
            else:
                auto_paper_verify_list.append(verify_bool)
-                verify_list.append(False)
+                verify_list.append(verify_bool)
-                auto_paper_verify_false_idx_list.append(str(tmp_idx+1)) 
+                if not verify_bool:
+                    auto_paper_verify_false_idx_list.append(str(tmp_idx+1))
+                else:
+                    auto_paper_verify_true_idx_list.append(str(tmp_idx+1))
            for idx, (name, value) in enumerate(pre_field_list):
                ocr_str_or_list = ocr_res.get(compare_logic[name][0])
@@ -2352,42 +2356,83 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_
        # 非FSM Full CAA1
        # 2023.12 auto CAA1 也使用此逻辑（之前非FSM auto CAA1不判断真伪）
-        if aa_type == 'CAA1':
+        # ---------- 以下 CHINARPA-5153 作废
-            name = '真伪'
+        # if aa_type == 'CAA1':
-            # 若仅提供纸质流水，则默认真伪为N2
+        #     name = '真伪'
-            if not auto_elec_verify_list:
+        #     # 若仅提供纸质流水，则默认真伪为N2
-                result = consts.RESULT_N2
+        #     if not auto_elec_verify_list:
-                reason = '<关注>第{0}份流水为纸质版，请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
+        #         result = consts.RESULT_N2
-            # 若仅提供电子流水，逐一比对，有false为N1，全部true为Y
+        #         reason = '<关注>第{0}份流水为纸质版，请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
-            if not auto_paper_verify_list:
+        #     # 若仅提供电子流水，逐一比对，有false为N1，全部true为Y
-                result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
+        #     if not auto_paper_verify_list:
-                reason = '<关注>第{0}份电子流水疑似造假，请核查excel。'.format('、'.join(auto_elec_verify_false_idx_list))
+        #         result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
-            #同时包含，同时返回N1，N2
+        #         reason = '<关注>第{0}份电子流水疑似造假，请核查excel。'.format('、'.join(auto_elec_verify_false_idx_list))
-            if auto_elec_verify_list and auto_paper_verify_list:
+        #     #同时包含，同时返回N1，N2
-                result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
+        #     if auto_elec_verify_list and auto_paper_verify_list:
-                reason1 = '<关注>第{0}份电子流水疑似造假，请核查excel。'.format('、'.join(auto_elec_verify_false_idx_list))
+        #         result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
-                reason2 = '<关注>第{0}份流水为纸质版，请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
+        #         reason1 = '<关注>第{0}份电子流水疑似造假，请核查excel。'.format('、'.join(auto_elec_verify_false_idx_list))
-                reason = reason1 + '\n' + reason2
+        #         reason2 = '<关注>第{0}份流水为纸质版，请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
-            result_field_list.append((name, empty_str, result, json.dumps(verify_list, ensure_ascii=False), empty_str, empty_error_type, reason))
+        #         reason = reason1 + '\n' + reason2
-        # 非FSM Full & Auto CAA2 目前逻辑和上面的完全一样
+        #     result_field_list.append((name, empty_str, result, json.dumps(verify_list, ensure_ascii=False), empty_str, empty_error_type, reason))
-        elif aa_type == 'CAA2' :
+        # # 非FSM Full & Auto CAA2 目前逻辑和上面的完全一样
+        # elif aa_type == 'CAA2' :
+        #     name = '真伪'
+        #     # 若仅提供纸质流水，则默认真伪为N2
+        #     if not auto_elec_verify_list:
+        #         result = consts.RESULT_N2
+        #         reason = '<关注>第{0}份流水为纸质版，请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
+        #     # 若仅提供电子流水，逐一比对，有false为N1，全部true为Y
+        #     if not auto_paper_verify_list:
+        #         result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
+        #         reason = '<关注>第{0}份电子流水疑似造假，请核查excel。'.format('、'.join(auto_elec_verify_false_idx_list))
+        #     #同时包含，同时返回N1，N2
+        #     if auto_elec_verify_list and auto_paper_verify_list:
+        #         result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
+        #         reason1 = '<关注>第{0}份电子流水疑似造假，请核查excel。'.format('、'.join(auto_elec_verify_false_idx_list))
+        #         reason2 = '<关注>第{0}份流水为纸质版，请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
+        #         reason = reason1 + '\n' + reason2
+        #     result_field_list.append((name, empty_str, result, json.dumps(verify_list, ensure_ascii=False), empty_str, empty_error_type, reason))
+        # ---------- 以上 CHINARPA-5153 作废
+        # 【具体分支描述可以看java代码】
+        if aa_type == 'CAA1' or aa_type == 'CAA2':
            name = '真伪'
-            # 若仅提供纸质流水，则默认真伪为N2
+            reason_n1 = '<关注>第{0}份电子流水疑似造假，请核查excel。'.format('、'.join(auto_elec_verify_false_idx_list))
-            if not auto_elec_verify_list:
+            reason_n2 = '<关注>第{0}份流水为纸质版，请核查流水真伪。'.format('、'.join(auto_paper_verify_true_idx_list))
-                result = consts.RESULT_N2
+            reason_n3 = '<关注>第{0}份纸质流水疑似造假，请核查excel。'.format('、'.join(auto_paper_verify_false_idx_list))
-                reason = '<关注>第{0}份流水为纸质版，请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
-            # 若仅提供电子流水，逐一比对，有false为N1，全部true为Y
-            if not auto_paper_verify_list:
-                result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
-                reason = '<关注>第{0}份电子流水疑似造假，请核查excel。'.format('、'.join(auto_elec_verify_false_idx_list))
-            #同时包含，同时返回N1，N2
            if auto_elec_verify_list and auto_paper_verify_list:
-                result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N1
+                # 有电子流水，有纸质流水，则需逐一判断电子流水属性或纸质流水检测结果
-                reason1 = '<关注>第{0}份电子流水疑似造假，请核查excel。'.format('、'.join(auto_elec_verify_false_idx_list))
+                elecTrue = len(auto_elec_verify_false_idx_list) <= 0
-                reason2 = '<关注>第{0}份流水为纸质版，请核查流水真伪。'.format('、'.join(auto_paper_verify_false_idx_list))
+                paperTrue = len(auto_paper_verify_false_idx_list) <= 0
-                reason = reason1 + '\n' + reason2
+                paperNotClear = len(auto_paper_verify_true_idx_list) > 0
+                if not elecTrue and not paperTrue and paperNotClear:
+                    reason = reason_n1 + '\n' + reason_n2 + '\n' + reason_n3
+                elif not elecTrue and not paperTrue:
+                    reason = reason_n1 + '\n' + reason_n3
+                elif not elecTrue and paperNotClear:
+                    reason = reason_n1 + '\n' + reason_n2
+                elif elecTrue and not paperTrue and paperNotClear:
+                    reason = reason_n2 + '\n' + reason_n3
+                elif elecTrue and paperNotClear:
+                    reason = reason_n2
+                elif elecTrue and not paperTrue:
+                    reason = reason_n3
+                result = consts.RESULT_Y if elecTrue and paperTrue and not paperNotClear else consts.RESULT_N
+            elif auto_elec_verify_list and not auto_paper_verify_list:
+                # 只有电子流水，以电子为准
+                reason = reason_n1
+                result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N
+            elif not auto_elec_verify_list:
+                paperTrue = len(auto_paper_verify_false_idx_list) <= 0
+                paperNotClear = len(auto_paper_verify_true_idx_list) > 0
+                if not paperTrue and paperNotClear:
+                    reason = reason_n2 + '\n' + reason_n3
+                elif paperNotClear:
+                    reason = reason_n2
+                elif not paperTrue:
+                    reason = reason_n3
+                result = consts.RESULT_N
            result_field_list.append((name, empty_str, result, json.dumps(verify_list, ensure_ascii=False), empty_str, empty_error_type, reason))
        if all_zhifubao_weixin:
            # 核查点名称，cms传值，比对结果，ocr结果，图片路径，错误类型，错误描述