This commit is contained in:
yumoqing 2026-04-24 22:11:07 +08:00
parent 07403486dc
commit 45aa425980

View File

@ -413,21 +413,23 @@ order by b.enabled_date desc"""
# p[f'mapping_{k}'] = data_mapping(d, k, data_value) #需要mapping的数据转换
data_value = data_mapping(d, k, data_value)
if data_value is None:
e = f'数据({config_data})没有({k})数据'
exception(e)
raise Exception(e)
else:
try:
flg = check_value(f, spec_value, data_value)
if not flg:
# 条件不满足
# debug(f'条件不满足:{p=},{spec_value=}, {data_value=}, {k=}')
p_ok = False
break
except Exception as e:
msg = f'{p=},{f}: {spec_value=}, {data_value=}'
exception(f'{e}:{msg}')
if 'default' in f.keys():
data_value = f['default']
else:
e = f'数据({config_data})没有({k})数据'
exception(e)
raise Exception(e)
try:
flg = check_value(f, spec_value, data_value)
if not flg:
# 条件不满足
# debug(f'条件不满足:{p=},{spec_value=}, {data_value=}, {k=}')
p_ok = False
break
except Exception as e:
msg = f'{p=},{f}: {spec_value=}, {data_value=}'
exception(f'{e}:{msg}')
break
if p_ok and p.formula:
np = p.copy()
formula = p.formula