Merge branch 'bo_household' into 'dev'

[BO] 일계부 등록 현황 작성 건수 쿼리 수정

See merge request korea-research/korea-research!89
This commit is contained in:
이강선 매니저/ST
2025-07-08 08:33:32 +00:00

View File

@@ -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,