From f3471cdda8ad4182b16bf028c1245d3e6364ef82 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Wed, 29 Jun 2022 13:41:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=90=E4=BA=A4=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1merge=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/mt/supply/deal.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dags/mt/supply/deal.py b/dags/mt/supply/deal.py index 4c61dad..d72a619 100644 --- a/dags/mt/supply/deal.py +++ b/dags/mt/supply/deal.py @@ -73,10 +73,12 @@ deal_es_num_df['es_num'] = 0 deal_es_num_df['es_num'] = deal_es_num_df.groupby(by=['city', 'region', 'name'])['es_num'].transform('count') deal_es_num_df = deal_es_num_df.drop_duplicates(subset=['city', 'region', 'name'], keep='first') -result_df['deal_num'].fillna(0, inplace=True) result_df = pd.merge(result_df, deal_es_num_df, how='left', on=['city', 'region', 'name']) +result_df['deal_num'].fillna(0, inplace=True) +result_df['es_num'].fillna(0, inplace=True) result_df['deal_num'] += result_df['es_num'] result_df = result_df.drop(columns={'es_num'}) +result_df['deal_num'] = result_df['deal_num'].replace(0, None) columns = ['id', 'city', 'region', 'name', 'alias', 'address', 'addr_alias', 'avg_price', 'rent_price', 'lng', 'lat',