From f943abb51ea089dacd1b9d4d9b0b4ffebbe37665 Mon Sep 17 00:00:00 2001 From: liuhongyang Date: Wed, 9 Apr 2025 15:47:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A2=E5=8A=9B=E8=AF=84=E7=BA=A7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/community/consumption_stat.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dags/business/business/community/consumption_stat.py b/dags/business/business/community/consumption_stat.py index 9f59e61..9b395e6 100644 --- a/dags/business/business/community/consumption_stat.py +++ b/dags/business/business/community/consumption_stat.py @@ -23,10 +23,10 @@ nextcloud_aim_file_path = '财力评级/财力评级/财力评级统计报表' def stat(community_summary_df): - grouped = community_summary_df.groupby(["city", "region"]) + grouped = community_summary_df.groupby(["city"]) results = [] - for (city, region), group in grouped: + for item, group in grouped: # 计算财力评级指标 rating_counts = group["consumption_rating"].value_counts(normalize=True) rating_1 = rating_counts.get(1, 0) @@ -48,8 +48,7 @@ def stat(community_summary_df): confidence_counts = group["credit"].value_counts(normalize=True) results.append({ - "城市": city, - "区域": region, + "城市": item[0], "财力评级1级占比": round(rating_1 * 100, 1), "财力评级1级分数范围": f"{rating_1_scores.min():.0f}-{rating_1_scores.max():.0f}" if not rating_1_scores.empty else "-", "财力评级2级占比": round(rating_2 * 100, 1), @@ -124,7 +123,15 @@ def detail(city): community_summary_df = data_utils.flatten_json(community_summary_df, 'credit_detail') community_summary_df['diff'] = np.abs(community_summary_df['consumption_rating'] - community_summary_df['price_rating']) community_summary_df['total_price_diff'] = np.abs(community_summary_df['consumption_rating'] - community_summary_df['total_price_rating']) - community_summary_df['estate_charge_type'] = np.where(community_summary_df['estate_charge_flag'] == 1,'周边','自有') + community_summary_df['estate_charge_type'] = np.where( + pd.notna(community_summary_df['estate_charge']), # 仅当 estate_charge 不为空时处理 + np.where( + community_summary_df['estate_charge_flag'] == 1, + '周边', + '自有' + ), + np.nan # 如果 estate_charge 为空,则返回 NaN + ) community_summary_df['credit'] = np.where(community_summary_df['total_price_diff'] == 0, '高', np.where(community_summary_df['total_price_diff'] == 1, '中', np.where(community_summary_df['total_price_diff'] >= 2, '低', '-'))) stat(community_summary_df) From 153a1aa4182c52ea09398ebdf38023a4327f1662 Mon Sep 17 00:00:00 2001 From: liuhongyang Date: Wed, 9 Apr 2025 16:07:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A2=E5=8A=9B=E8=AF=84=E7=BA=A7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/business/business/community/consumption_stat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dags/business/business/community/consumption_stat.py b/dags/business/business/community/consumption_stat.py index 9b395e6..fe6c52b 100644 --- a/dags/business/business/community/consumption_stat.py +++ b/dags/business/business/community/consumption_stat.py @@ -26,7 +26,7 @@ def stat(community_summary_df): grouped = community_summary_df.groupby(["city"]) results = [] - for item, group in grouped: + for city, group in grouped: # 计算财力评级指标 rating_counts = group["consumption_rating"].value_counts(normalize=True) rating_1 = rating_counts.get(1, 0) @@ -48,7 +48,7 @@ def stat(community_summary_df): confidence_counts = group["credit"].value_counts(normalize=True) results.append({ - "城市": item[0], + "城市": city, "财力评级1级占比": round(rating_1 * 100, 1), "财力评级1级分数范围": f"{rating_1_scores.min():.0f}-{rating_1_scores.max():.0f}" if not rating_1_scores.empty else "-", "财力评级2级占比": round(rating_2 * 100, 1),