Merge branch 'bo_fixes' into 'dev'

[BO] 엑셀다운로드 : 일계부 등록 데이터 - 자가임업생산물, 자가농업생산물의 "날","짜" 칼럼 "차수" 칼럼 변경. "차수"는 날짜...

See merge request korea-research/korea-research!132
This commit is contained in:
이강선 매니저/ST
2025-07-18 07:46:24 +00:00
10 changed files with 36 additions and 25 deletions

View File

@@ -200,7 +200,7 @@
SELECT
detail_uicode.code_text AS region_detail_name,
parent_uicode.code_text AS region_name,
COUNT(DISTINCT h.seq) AS household_count,
COUNT(DISTINCT rhh.household_seq) AS household_count,
CASE
WHEN AVG(v.completion_rate) > 0 THEN ROUND(AVG(v.completion_rate), 1)
ELSE 0
@@ -215,6 +215,9 @@
ON h.region_detail_code = detail_uicode.id
AND h.is_deleted = false
AND h.is_panel = true
LEFT JOIN researcher_has_household rhh
ON rhh.household_seq = h.seq
AND rhh.is_deleted = false
LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq
AND v.record_month = #{recordMonth}
@@ -238,13 +241,16 @@
SELECT
'전체' AS region_detail_name,
'전체' AS region_name,
COUNT(DISTINCT h.seq) AS household_count,
COUNT(DISTINCT rhh.household_seq) AS household_count,
COALESCE(ROUND(AVG(v.completion_rate), 1), 0),
COUNT(DISTINCT hv_visit.household_seq),
COUNT(DISTINCT hv_gift.household_seq),
-1 AS region_order,
-1 AS region_detail_order
FROM household h
LEFT JOIN researcher_has_household rhh
ON rhh.household_seq = h.seq
AND rhh.is_deleted = false
LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq
AND v.record_month = #{recordMonth}