diff --git a/dags/stat/evaluate/district_count_thirdavg_deal.py b/dags/stat/evaluate/district_count_thirdavg_deal.py index f8d4102..28a9163 100644 --- a/dags/stat/evaluate/district_count_thirdavg_deal.py +++ b/dags/stat/evaluate/district_count_thirdavg_deal.py @@ -65,22 +65,23 @@ def third_avg_stat(): '5i5j_esf_price', 'maitian_esf_price', '365house_esf_price', 'beike_esf_price', 'qfang_esf_price', 'fangtan_esf_price', 'tuboshi_esf_price', 'zhugezhaofang_esf_price', 'zhongyuan_esf_price', 'jiwu_esf_price', 'anjuke_esf_price']] + + average_statistics_new_df.loc[:, 'has_esf_price'] = average_statistics_new_df['58tc_esf_price'] \ + .combine_first(average_statistics_new_df['cityhouse_esf_price']) \ + .combine_first(average_statistics_new_df['soufang_esf_price']) \ + .combine_first(average_statistics_new_df['lianjia_esf_price']) \ + .combine_first(average_statistics_new_df['5i5j_esf_price']) \ + .combine_first(average_statistics_new_df['maitian_esf_price']) \ + .combine_first(average_statistics_new_df['365house_esf_price']) \ + .combine_first(average_statistics_new_df['beike_esf_price']) \ + .combine_first(average_statistics_new_df['qfang_esf_price']) \ + .combine_first(average_statistics_new_df['fangtan_esf_price']) \ + .combine_first(average_statistics_new_df['tuboshi_esf_price']) \ + .combine_first(average_statistics_new_df['zhugezhaofang_esf_price']) \ + .combine_first(average_statistics_new_df['zhongyuan_esf_price']) \ + .combine_first(average_statistics_new_df['jiwu_esf_price']) \ + .combine_first(average_statistics_new_df['anjuke_esf_price']) average_statistics_new_df.fillna(0, inplace=True) - average_statistics_new_df.loc[:, 'has_esf_price'] = average_statistics_new_df['58tc_esf_price'] + \ - average_statistics_new_df['cityhouse_esf_price'] + \ - average_statistics_new_df['soufang_esf_price'] + \ - average_statistics_new_df['lianjia_esf_price'] + \ - average_statistics_new_df['5i5j_esf_price'] + \ - average_statistics_new_df['maitian_esf_price'] + \ - average_statistics_new_df['365house_esf_price'] + \ - average_statistics_new_df['beike_esf_price'] + \ - average_statistics_new_df['qfang_esf_price'] + \ - average_statistics_new_df['fangtan_esf_price'] + \ - average_statistics_new_df['tuboshi_esf_price'] + \ - average_statistics_new_df['zhugezhaofang_esf_price'] + \ - average_statistics_new_df['zhongyuan_esf_price'] + \ - average_statistics_new_df['jiwu_esf_price'] + \ - average_statistics_new_df['anjuke_esf_price'] average_statistics_new_df.loc[:, ['flag']] = average_statistics_new_df['has_esf_price'].apply( lambda x: True if x > 0 else False) average_statistics_new_df = average_statistics_new_df[average_statistics_new_df['flag'] == True]