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

@@ -3671,10 +3671,10 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res
             compare_log.info('{0} [SE] [cms sleep start] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
             compare_log.info('{0} [SE] [cms sleep start] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
             # 实时查询延迟时间
             # 实时查询延迟时间
             cms_delay_time_config = Configs.objects.filter(id=5).first()
             cms_delay_time_config = Configs.objects.filter(id=5).first()
-            if cms_delay_time_config is None or cms_delay_time is None or not cms_delay_time.isdigit():
-                cms_delay_time = 0
-            else:
+            if cms_delay_time_config is not None and cms_delay_time_config.value is not None and cms_delay_time_config.value.isdigit():
                 cms_delay_time = cms_delay_time_config.value
                 cms_delay_time = cms_delay_time_config.value
+            else:
+                cms_delay_time = 0
             compare_log.info('cms_delay_time:{0}'.format(cms_delay_time))
             compare_log.info('cms_delay_time:{0}'.format(cms_delay_time))
             time.sleep(int(cms_delay_time))
             time.sleep(int(cms_delay_time))
             compare_log.info('{0} [SE] [cms sleep end] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
             compare_log.info('{0} [SE] [cms sleep end] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
@@ -3720,14 +3720,10 @@ def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id,
 
 
     # 实时查询延迟时间
     # 实时查询延迟时间
     delay_time_config = Configs.objects.filter(id=4).first()
     delay_time_config = Configs.objects.filter(id=4).first()
-    if delay_time_config is not None and delay_time_config.value
-    if delay_time_config is None:
-        delay_time = 0
-    else:
+    if delay_time_config is not None and delay_time_config.value is not None and delay_time_config.value.isdigit():
         delay_time = delay_time_config.value
         delay_time = delay_time_config.value
-        if delay_time is None or not delay_time.isdigit():
-            delay_time = 0
     else:
     else:
+        delay_time = 0
     compare_log.info('delay_time:{0}'.format(delay_time))
     compare_log.info('delay_time:{0}'.format(delay_time))
 
 
     # 查看此订单号下是否有未完成的文件，如果有，等1分钟
     # 查看此订单号下是否有未完成的文件，如果有，等1分钟
@@ -3785,10 +3781,10 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_
                                            is_ca, is_cms))
                                            is_ca, is_cms))
     # 实时查询延迟时间
     # 实时查询延迟时间
     delay_time_config = Configs.objects.filter(id=4).first()
     delay_time_config = Configs.objects.filter(id=4).first()
-    if delay_time_config is None or delay_time is None or not delay_time.isdigit():
-        delay_time = 0
-    else:
+    if delay_time_config is not None and delay_time_config.value is not None and delay_time_config.value.isdigit():
         delay_time = delay_time_config.value
         delay_time = delay_time_config.value
+    else:
+        delay_time = 0
     compare_log.info('delay_time:{0}'.format(delay_time))
     compare_log.info('delay_time:{0}'.format(delay_time))
 
 
     # 查看此订单号下是否有未完成的文件，如果有，等1分钟
     # 查看此订单号下是否有未完成的文件，如果有，等1分钟