From a6c7076e14bc2e1db0d5e3f012e346b43910b445 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Wed, 2 Aug 2023 13:21:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/jh/sample/samples_notice.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dags/jh/sample/samples_notice.py b/dags/jh/sample/samples_notice.py index 40856c6..f2a75eb 100644 --- a/dags/jh/sample/samples_notice.py +++ b/dags/jh/sample/samples_notice.py @@ -7,8 +7,9 @@ log = logging.getLogger(__name__) # 获取当前日期和2个月前的日期,统计2个月样本数据 now = datetime.datetime.today() -now_day = now.strftime('%Y%m%d') -last = dateutils.add_months(now,0,-2,0,0) +first_day = datetime.datetime(now.year,now.month, 1) +now_day = first_day.strftime('%Y%m%d') +last = dateutils.add_months(first_day,0,-2,0,0) last_day = last.strftime('%Y%m%d') log.info(f"系统当前时间 : {now}") @@ -62,12 +63,12 @@ df_root_group2 = df_root_group2.rename(columns={'_id':'count'}) # 房源网站,百分比维度,减少30% df_root_merge = pd.merge(df_root_group1,df_root_group2,how='left',on=['root']) -count_old = 'count_'+strat_time[0:6] -count_new = 'count_'+strat_time2[0:6] +count_new = 'count_'+strat_time[0:6] +count_old = 'count_'+strat_time2[0:6] df_root_merge = df_root_merge.rename(columns={'count_x':count_new,'count_y':count_old}) -df_root_res = df_root_merge.drop(df_root_merge[~((df_root_merge['count_new']0.3))].index) +df_root_res = df_root_merge.drop(df_root_merge[~((df_root_merge[count_new]0.3))].index) if df_root_res.empty == False: if text == '':