From bbf10ff7328ec1f46407077612d46761f43ff618 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Tue, 8 Jul 2025 17:33:12 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=ED=98=84=ED=99=A9=20=EC=9E=91=EC=84=B1=20=EA=B1=B4?= =?UTF-8?q?=EC=88=98=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../household/GetDailyRecordsCountMapper.xml | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml index ab557c69..139d6d19 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml @@ -7,17 +7,21 @@ resultType="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount"> /* getDailyRecordsCount : 일계부 상태 요약 및 진행률 조회 */ WITH month_check AS ( - SELECT #{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month + SELECT + #{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month, + EXTRACT(DAY FROM (TO_DATE(#{recordMonth}, 'YYYYMM') + INTERVAL '1 MONTH - 1 day')) AS month_last_day /* recordMonth 의 말일 */ ), record_status AS ( SELECT CASE - /* 현재 월이고 오늘 이후인 경우만 WAITING */ - WHEN mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' - WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE' - WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' - WHEN dr.all_status IS NULL THEN 'EMPTY' - ELSE 'EMPTY' + /* 현재 월이고 오늘 이후인 경우만 WAITING */ + WHEN mc.is_current_month + AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE) + AND ddg.start_day <= mc.month_last_day THEN 'WAITING' + WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE' + WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' + WHEN dr.all_status IS NULL THEN 'EMPTY' + ELSE 'EMPTY' END AS all_status FROM daily_day_group ddg CROSS JOIN month_check mc @@ -25,8 +29,8 @@ AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} AND dr.is_deleted = false + WHERE ddg.start_day <= mc.month_last_day ) - SELECT COUNT(*) FILTER (WHERE all_status = 'DONE') AS done_count, COUNT(*) FILTER (WHERE all_status = 'EMPTY') AS empty_count,