Merge branch 'feature/se_compare_yh' into feature/0611

@@ -650,7 +650,7 @@ def ca_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res
                     if len(field_list) > 0:
                     if len(field_list) > 0:
                         field_failed['individualCusInfo'].append(';'.join(field_list))
                         field_failed['individualCusInfo'].append(';'.join(field_list))
 
 
-                corporate_res = comparison_res.get('OCR_Input', {}).get('corporateCusInfo', {})
+                corporate_res = comparison_res.get('OCR_Input', {}).get('corporateCusInfo')
                 if corporate_res is not None:
                 if corporate_res is not None:
                     total_fields += 8
                     total_fields += 8
                     if not successful_at_this_level:
                     if not successful_at_this_level:
@@ -661,7 +661,7 @@ def ca_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res
                         if len(corporate_field_list) > 0:
                         if len(corporate_field_list) > 0:
                             field_failed['corporateCusInfo'].append(';'.join(corporate_field_list))
                             field_failed['corporateCusInfo'].append(';'.join(corporate_field_list))
 
 
-                used_car_res = comparison_res.get('OCR_Input', {}).get('usedCarInfo', {})
+                used_car_res = comparison_res.get('OCR_Input', {}).get('usedCarInfo')
                 if used_car_res is not None:
                 if used_car_res is not None:
                     total_fields += 3
                     total_fields += 3
                     if not successful_at_this_level:
                     if not successful_at_this_level:
@@ -1048,7 +1048,7 @@ def se_compare_process(compare_info, ocr_res_dict):
                                 }
                                 }
                             )
                             )
                         if len(failure_field) > 0:
                         if len(failure_field) > 0:
-                            failure_reason.setdefault(license_en, []).append('/'.join(failure_field))
+                            failure_reason.setdefault(info_key, []).append(';'.join(failure_field))
         else:
         else:
             for license_en, field_list in info_value.items():
             for license_en, field_list in info_value.items():
                 failure_field = []
                 failure_field = []
@@ -1077,11 +1077,16 @@ def se_compare_process(compare_info, ocr_res_dict):
                         }
                         }
                     )
                     )
                 if len(failure_field) > 0:
                 if len(failure_field) > 0:
-                    failure_reason.setdefault(license_en, []).append('/'.join(failure_field))
+                    failure_reason.setdefault(info_key, []).append(';'.join(failure_field))
     if failed_count == 0:
     if failed_count == 0:
         failure_reason_str = ''
         failure_reason_str = ''
     else:
     else:
-        failure_reason_str = json.dumps(failure_reason)
+        reason_list = []
+        for key, value in failure_reason.items():
+            if len(value) > 0:
+                value_str = json.dumps(value)
+                reason_list.append('{0}: {1}'.format(key, value_str))
+        failure_reason_str = '、'.join(reason_list)
     return compare_result, total_fields, failed_count, successful_at_this_level, failure_reason_str
     return compare_result, total_fields, failed_count, successful_at_this_level, failure_reason_str
 
 
 
 
@@ -1093,6 +1098,7 @@ def se_result_detect(ocr_res_dict):
         detect_list.append(ocr_res_str is None)
         detect_list.append(ocr_res_str is None)
     return detect_list
     return detect_list
 
 
+
 def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res_dict):
 def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res_dict):
     try:
     try:
         # 比对逻辑
         # 比对逻辑