fix bug
This commit is contained in:
@@ -30,12 +30,13 @@ def calc(**kwargs):
|
|||||||
"""
|
"""
|
||||||
# 从 Airflow 的 dag_run.conf 获取参数
|
# 从 Airflow 的 dag_run.conf 获取参数
|
||||||
conf = kwargs.get('dag_run').conf if kwargs.get('dag_run') else {}
|
conf = kwargs.get('dag_run').conf if kwargs.get('dag_run') else {}
|
||||||
city = conf.get('city', '')
|
city = conf.get('city', None)
|
||||||
year_month = conf.get('year_month', '')
|
year_month = conf.get('year_month', None)
|
||||||
district = conf.get('district', '')
|
district = conf.get('district', None)
|
||||||
office_name = conf.get('name', '')
|
office_name = conf.get('name', None)
|
||||||
|
if year_month is None:
|
||||||
if office_name == '':
|
year_month = dateutils.format_date(dateutils.add_months(datetime.today().year, months=-1), "%Y%m")
|
||||||
|
if pd.isna(office_name):
|
||||||
calcByCity(city, year_month)
|
calcByCity(city, year_month)
|
||||||
else:
|
else:
|
||||||
# 直接重算出最近一年的数据,保证一年有数据
|
# 直接重算出最近一年的数据,保证一年有数据
|
||||||
|
|||||||
@@ -30,16 +30,13 @@ def calc(**kwargs):
|
|||||||
"""
|
"""
|
||||||
# 从 Airflow 的 dag_run.conf 获取参数
|
# 从 Airflow 的 dag_run.conf 获取参数
|
||||||
conf = kwargs.get('dag_run').conf if kwargs.get('dag_run') else {}
|
conf = kwargs.get('dag_run').conf if kwargs.get('dag_run') else {}
|
||||||
city = conf.get('city', '')
|
city = conf.get('city', None)
|
||||||
year_month = conf.get('year_month', '')
|
year_month = conf.get('year_month', None)
|
||||||
district = conf.get('district', '')
|
district = conf.get('district', None)
|
||||||
office_name = conf.get('name', '')
|
office_name = conf.get('name', None)
|
||||||
if city == "":
|
if year_month is None:
|
||||||
city = None
|
year_month = dateutils.format_date(dateutils.add_months(datetime.today().year, months=-1), "%Y%m")
|
||||||
if district == "":
|
|
||||||
district = None
|
|
||||||
if office_name == "":
|
|
||||||
office_name = None
|
|
||||||
if pd.isna(office_name):
|
if pd.isna(office_name):
|
||||||
calcByCity(city, year_month)
|
calcByCity(city, year_month)
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ def fill_base_price(**kwargs):
|
|||||||
year_month = conf.get('year_month', '')
|
year_month = conf.get('year_month', '')
|
||||||
district = conf.get('district', '')
|
district = conf.get('district', '')
|
||||||
office_name = conf.get('name', '')
|
office_name = conf.get('name', '')
|
||||||
|
if year_month == "":
|
||||||
|
year_month = dateutils.format_date(dateutils.add_months(datetime.today().year, months=-1), "%Y%m")
|
||||||
|
|
||||||
query = {'cat': 'office'}
|
query = {'cat': 'office'}
|
||||||
if year_month != '':
|
if year_month != '':
|
||||||
|
|||||||
Reference in New Issue
Block a user