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

@@ -3711,15 +3711,16 @@ def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id,
                                            is_ca, is_cms))
                                            is_ca, is_cms))
 
 
     # 实时查询延迟时间
     # 实时查询延迟时间
-    delay_time = Configs.objects.filter(id=4).first()
-    if delay_time is None or not delay_time.isdigit():
+    delay_time_config = Configs.objects.filter(id=4).first()
+    delay_time = delay_time_config.value
+    if delay_time_config is None or delay_time is None or not delay_time.isdigit():
         delay_time = 0
         delay_time = 0
-    compare_log.info('delay_time:',delay_time)
+    compare_log.info('delay_time:{0}'.format(delay_time))
 
 
     # 查看此订单号下是否有未完成的文件，如果有，等1分钟
     # 查看此订单号下是否有未完成的文件，如果有，等1分钟
     doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc
     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()
     doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first()
-    compare_log.info('doc_wait_file_result:',doc_wait_file_result)
+    compare_log.info('doc_wait_file_result:{0}'.format(doc_wait_file_result))
     compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result))
     compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result))
     if doc_wait_file_result is not None:
     if doc_wait_file_result is not None:
         compare_log.info('{0} [comparison unfinished file wait delay_time start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id))
         compare_log.info('{0} [comparison unfinished file wait delay_time start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id))
@@ -3770,14 +3771,16 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_
                      '[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))
     # 实时查询延迟时间
     # 实时查询延迟时间
-    delay_time = Configs.objects.filter(id=4).first()
-    if delay_time is None or not delay_time.isdigit():
+    delay_time_config = Configs.objects.filter(id=4).first()
+    delay_time = delay_time_config.value
+    if delay_time_config is None or delay_time is None or not delay_time.isdigit():
         delay_time = 0
         delay_time = 0
-    compare_log.info('delay_time:',delay_time)
+    compare_log.info('delay_time:{0}'.format(delay_time))
+
     # 查看此订单号下是否有未完成的文件，如果有，等1分钟
     # 查看此订单号下是否有未完成的文件，如果有，等1分钟
     doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc
     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()
     doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first()
-    compare_log.info('doc_wait_file_result:',doc_wait_file_result)
+    compare_log.info('doc_wait_file_result:{0}'.format(doc_wait_file_result))
     compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result))
     compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result))
     if doc_wait_file_result is not None:
     if doc_wait_file_result is not None:
         compare_log.info('{0} [comparison unfinished file wait delay_time start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id))
         compare_log.info('{0} [comparison unfinished file wait delay_time start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id))