diff --git a/src/celery_compare/tasks.py b/src/celery_compare/tasks.py index ff95ed2..dfafc56 100644 --- a/src/celery_compare/tasks.py +++ b/src/celery_compare/tasks.py @@ -3936,29 +3936,6 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ ocr_res_id, is_ca, is_cms)) return - # 根据application_id查找OCR累计结果指定license字段,如果没有,结束 - if is_ca: - result_class = HILOCRResult if application_entity == consts.HIL_PREFIX else AFCOCRResult - ca_ocr_res_dict = dict() - else: - result_class = HILSEOCRResult if application_entity == consts.HIL_PREFIX else AFCSEOCRResult - ca_result_class = HILOCRResult if application_entity == consts.HIL_PREFIX else AFCOCRResult - # if ocr_res_id is None: - ca_ocr_res_dict = ca_result_class.objects.filter(application_id=application_id).values( - *consts.CA_ADD_COMPARE_FIELDS).first() - # else: - # ca_ocr_res_dict = ca_result_class.objects.filter(id=ocr_res_id).values( - # *consts.CA_ADD_COMPARE_FIELDS).first() - if ocr_res_id is None: - ocr_res_dict = result_class.objects.filter(application_id=application_id).values(*consts.COMPARE_FIELDS).first() - else: - ocr_res_dict = result_class.objects.filter(id=ocr_res_id).values(*consts.COMPARE_FIELDS).first() - if ocr_res_dict is None: - compare_log.info('{0} [ocr info empty] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] ' - '[is_ca={5}] [is_cms]={6}'.format(log_base, application_entity, application_id, - uniq_seq, ocr_res_id, is_ca, is_cms)) - return - # 查看此订单号下是否有未完成的文件,如果有,等?分钟 try: doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc @@ -3986,7 +3963,29 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ except Exception as e: compare_log.info('[sleep error] [error={0}]'.format(traceback.format_exc())) compare_log.info('{0} [comparison unfinished file wait delay_time end] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) - + + # 根据application_id查找OCR累计结果指定license字段,如果没有,结束 + if is_ca: + result_class = HILOCRResult if application_entity == consts.HIL_PREFIX else AFCOCRResult + ca_ocr_res_dict = dict() + else: + result_class = HILSEOCRResult if application_entity == consts.HIL_PREFIX else AFCSEOCRResult + ca_result_class = HILOCRResult if application_entity == consts.HIL_PREFIX else AFCOCRResult + # if ocr_res_id is None: + ca_ocr_res_dict = ca_result_class.objects.filter(application_id=application_id).values( + *consts.CA_ADD_COMPARE_FIELDS).first() + # else: + # ca_ocr_res_dict = ca_result_class.objects.filter(id=ocr_res_id).values( + # *consts.CA_ADD_COMPARE_FIELDS).first() + if ocr_res_id is None: + ocr_res_dict = result_class.objects.filter(application_id=application_id).values(*consts.COMPARE_FIELDS).first() + else: + ocr_res_dict = result_class.objects.filter(id=ocr_res_id).values(*consts.COMPARE_FIELDS).first() + if ocr_res_dict is None: + compare_log.info('{0} [ocr info empty] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] ' + '[is_ca={5}] [is_cms]={6}'.format(log_base, application_entity, application_id, + uniq_seq, ocr_res_id, is_ca, is_cms)) + return if is_ca: ca_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res_dict)