From dc7aec8a78930fe961cceb308fe3f36591d4cb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 21 Jul 2025 09:57:54 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=8B=9C=20=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EB=B7=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mappers/dashboard/ChartMapper.xml | 16 ++++++++-------- .../main/resources/sql/data/04_second_open.sql | 15 +++++++++------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index 54a9f0c1..7094009e 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -6,7 +6,7 @@ SELECT COUNT(DISTINCT rhh.household_seq) as total_household_count, - COALESCE(ROUND(AVG(cr.completion_rate), 1), 0) AS daily_percent, + COALESCE(ROUND(AVG(cr.current_completion_rate), 1), 0) AS daily_percent, COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS total_visit_count, COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq end) * 100::numeric / NULLIF(COUNT(DISTINCT rhh.household_seq), 0), 1),0) as visit_percent, COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count, @@ -51,7 +51,7 @@ COALESCE(u.code_text, '전체') AS region_name, COUNT(DISTINCT a.seq) AS researcher_count, COUNT(DISTINCT rhh.household_seq) AS total_household_count, - COALESCE(ROUND(AVG(v.completion_rate), 1), 0) AS daily_percent, + COALESCE(ROUND(AVG(v.current_completion_rate), 1), 0) AS daily_percent, COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS total_visit_count, COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq end) * 100::numeric / NULLIF(COUNT(DISTINCT rhh.household_seq),0), 1),0) as visit_percent, COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count, @@ -91,7 +91,7 @@ NULLIF(a.name,'-') AS researcher_name, u.code_text AS region_main_code_name, COUNT(DISTINCT h.seq) AS total_household_count, - COALESCE(ROUND(AVG(cr.completion_rate), 1), 0) AS daily_percent, + COALESCE(ROUND(AVG(cr.current_completion_rate), 1), 0) AS daily_percent, COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS total_visit_count, COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT h.seq), 0), 1),0) AS visit_percent, COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count, @@ -121,7 +121,7 @@ COUNT(DISTINCT a.seq) AS researcher_count, COUNT(DISTINCT rhh.household_seq) AS household_count, CASE - WHEN COALESCE(AVG(v.completion_rate), 0) > 0 THEN ROUND(COALESCE(AVG(v.completion_rate), 0), 1) + WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0 THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 1) ELSE 0 END AS avg_completion_rate, COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS visit_count, @@ -160,7 +160,7 @@ '전체' AS region_name, COUNT(DISTINCT a.seq), COUNT(DISTINCT rhh.household_seq), - COALESCE(ROUND(AVG(v.completion_rate), 1), 0), + COALESCE(ROUND(AVG(v.current_completion_rate), 1), 0), COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END), COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END), -1 as order_no @@ -202,7 +202,7 @@ parent_uicode.code_text AS region_name, COUNT(DISTINCT rhh.household_seq) AS household_count, CASE - WHEN AVG(v.completion_rate) > 0 THEN ROUND(AVG(v.completion_rate), 1) + WHEN AVG(v.current_completion_rate) > 0 THEN ROUND(AVG(v.current_completion_rate), 1) ELSE 0 END AS avg_completion_rate, COUNT(DISTINCT hv_visit.household_seq) AS visit_count, @@ -242,7 +242,7 @@ '전체' AS region_detail_name, '전체' AS region_name, COUNT(DISTINCT rhh.household_seq) AS household_count, - COALESCE(ROUND(AVG(v.completion_rate), 1), 0), + COALESCE(ROUND(AVG(v.current_completion_rate), 1), 0), COUNT(DISTINCT hv_visit.household_seq), COUNT(DISTINCT hv_gift.household_seq), -1 AS region_order, diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql index f871d0fb..3b811721 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -564,7 +564,7 @@ AS SELECT daily_record.household_seq, -- ============================================ -- DROP VIEW public.v_household_monthly_target_days; CREATE OR REPLACE VIEW public.v_household_monthly_target_days -AS WITH param_matrix AS ( +as WITH param_matrix AS ( SELECT h.seq AS household_seq, r.record_month, EXTRACT(day FROM date_trunc('month'::text, to_date(r.record_month::text, 'YYYYMM'::text)::timestamp with time zone) + '1 mon -1 days'::interval)::integer AS last_day @@ -575,7 +575,8 @@ AS WITH param_matrix AS ( ) SELECT p.household_seq, p.record_month, - count(*) AS total_day_groups + count(*) AS total_day_groups, + case when to_char(CURRENT_DATE,'YYYYMM')::text = p.record_month then sum(case when to_char(CURRENT_DATE,'dd')::integer >= g.start_day then 1 else 0 end)else count(*) end as current_day_groups FROM param_matrix p JOIN daily_day_group g ON g.start_day <= p.last_day GROUP BY p.household_seq, p.record_month; @@ -675,14 +676,16 @@ AS WITH ranked_visits AS ( -- ============================================ -- DROP VIEW public.v_monthly_completion_rate; CREATE OR REPLACE VIEW public.v_monthly_completion_rate -AS SELECT d.household_seq, +as SELECT d.household_seq, d.record_month, COALESCE(c.completed_day_groups, 0::bigint) AS completed_day_groups, d.total_day_groups, - round(COALESCE(c.completed_day_groups, 0::bigint)::numeric * 100::numeric / NULLIF(d.total_day_groups, 0)::numeric, 3) AS completion_rate - FROM v_household_monthly_target_days d + round(COALESCE(c.completed_day_groups, 0::bigint)::numeric * 100::numeric / NULLIF(d.total_day_groups, 0)::numeric, 3) AS completion_rate, + d.current_day_groups, + round(COALESCE(c.completed_day_groups, 0::bigint)::numeric * 100::numeric / NULLIF(d.current_day_groups, 0)::numeric, 3) AS current_completion_rate + FROM v_household_monthly_target_days d LEFT JOIN v_household_monthly_completed_days c ON d.household_seq = c.household_seq AND d.record_month::text = c.record_month::text - ORDER BY d.household_seq, d.record_month; + ORDER BY d.household_seq, d.record_month; -- ============================================