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

@@ -39,6 +39,7 @@ from apps.doc.models import (
     HILCompareReportNew,
     HILCompareReportNew,
     AFCCompareReportNew,
     AFCCompareReportNew,
     AFCDoc, 
     AFCDoc, 
+    HILDoc,
     DealerMapping,
     DealerMapping,
 )
 )
 from apps.doc import consts
 from apps.doc import consts
@@ -50,6 +51,8 @@ from common.tools.comparison import cp
 # from common.tools.des import decode_des
 # from common.tools.des import decode_des
 from common.tools.aes_util import aes_decrypt_cbc
 from common.tools.aes_util import aes_decrypt_cbc
 
 
+import threading
+
 compare_log = logging.getLogger('compare')
 compare_log = logging.getLogger('compare')
 log_base = '[Compare]'
 log_base = '[Compare]'
 # e_log_base = '[e-contract]'
 # e_log_base = '[e-contract]'
@@ -3731,6 +3734,10 @@ def fsm_compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=
 
 
 @app.task
 @app.task
 def compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
 def compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
+    producer_thread = threading.Thread(target=compare_thread, args=(application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
+    producer_thread.start()
+
+def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
     # POS: application_id, application_entity, uniq_seq, None
     # POS: application_id, application_entity, uniq_seq, None
     # OCR: application_id, business_type(application_entity), None, ocr_res_id
     # OCR: application_id, business_type(application_entity), None, ocr_res_id
 
 
@@ -3738,6 +3745,15 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True
                      '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
                      '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
                                            is_ca, is_cms))
                                            is_ca, is_cms))
 
 
+    # 查看此订单号下是否有未完成的文件，如果有，等3分钟
+    doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc
+    doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first()
+    if doc_wait_file_result is not None:
+        compare_log.info('{0} [comparison unfinished file wait 180s start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.get('id')))
+        time.sleep(60)
+        compare_log.info('{0} [comparison unfinished file wait 180s end] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.get('id')))
+
+
     # 根据application_id查找最新的比对信息，如果没有，结束
     # 根据application_id查找最新的比对信息，如果没有，结束
     if is_ca:
     if is_ca:
         comparison_class = HILComparisonInfo if application_entity == consts.HIL_PREFIX else AFCComparisonInfo
         comparison_class = HILComparisonInfo if application_entity == consts.HIL_PREFIX else AFCComparisonInfo