From 3bb1e244b931f1a09bd944ef04b2e9a6a7add75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Wed, 30 Jul 2025 16:44:41 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=B8=EB=B6=80=20=EC=A7=80=EC=97=AD=20?= =?UTF-8?q?=EC=97=91=EC=85=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/web/ChartApiController.java | 5 +- .../mappers/dashboard/ChartMapper.xml | 153 ++++++------------ 2 files changed, 49 insertions(+), 109 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java index 7ff17c16..539c4128 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java @@ -80,9 +80,10 @@ class ChartApiController { List> rows2 = new ArrayList<>(); for (RegionDetailExcelDto item : dashboardExcel.getRegionDetail()) { rows2.add(List.of( + StringUtils.defaultString(item.getRegionName()), StringUtils.defaultString(item.getRegionDetailName()), StringUtils.defaultString(item.getHouseholdCount()), - StringUtils.defaultString(item.getAvgCompletionRate()) + "%", + StringUtils.defaultString(item.getAvgCompletionRate()), StringUtils.defaultString(item.getVisitCount()), StringUtils.defaultString(item.getGiftSentCount()) )); @@ -91,7 +92,7 @@ class ChartApiController { // 시트 2: 세부지역 ExcelSheetDto sheet2 = new ExcelSheetDto( "세부지역", - List.of("세부지역", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"), + List.of("지역","세부지역", "할당 임가 수", "일계부 진행률(%)", "현장 방문 수", "답례품 전달 임가 수"), rows2, null, Map.of(0, IndexedColors.LIGHT_YELLOW) diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index 7094009e..3704d637 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -117,7 +117,8 @@ resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto"> /* selectRegionMainExcel : 대시보드 엑셀다운로드 (실사) */ SELECT - u.code_text AS region_name, + COALESCE(u.code_text, '전체') AS region_name, + COALESCE( detail_region.code_text,'-') AS region_detail_name, COUNT(DISTINCT a.seq) AS researcher_count, COUNT(DISTINCT rhh.household_seq) AS household_count, CASE @@ -125,8 +126,7 @@ ELSE 0 END AS avg_completion_rate, COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS visit_count, - COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count, - u.order_no + COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count FROM uicode u LEFT JOIN admin a ON a.region_main_code = u.id @@ -149,48 +149,16 @@ LEFT JOIN v_monthly_completion_rate v ON v.household_seq = h.seq AND v.record_month = #{recordMonth} + LEFT JOIN uicode detail_region + ON detail_region.id =h.region_detail_code + AND detail_region.is_deleted =false WHERE u.parent_id = 'code.region.main' and u.is_deleted = false and u.in_use = true - GROUP BY u.code_text, u.order_no - UNION ALL - -- 전체 합계 행 - SELECT - '전체' AS region_name, - COUNT(DISTINCT a.seq), - COUNT(DISTINCT rhh.household_seq), - 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 - FROM uicode u - LEFT JOIN admin a - ON a.region_main_code = u.id - AND a.is_deleted = false - LEFT JOIN admin_has_role ahr - ON a.seq = ahr.admin_seq - AND ahr.is_deleted = false - AND ahr.role_id = 'ROLE_RESEARCHER' - LEFT JOIN researcher_has_household rhh - ON rhh.admin_seq = a.seq - AND rhh.is_deleted = false - LEFT JOIN household h - ON h.seq = rhh.household_seq - AND h.is_deleted = false - AND h.is_panel = true - LEFT JOIN household_visit hv - ON hv.household_seq = h.seq - AND hv.is_deleted = false - AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth} - LEFT JOIN v_monthly_completion_rate v - ON v.household_seq = h.seq - AND v.record_month = #{recordMonth} - WHERE u.parent_id = 'code.region.main' and u.is_deleted = false - - and u.in_use = true - - ORDER BY order_no + GROUP BY ROLLUP(u.code_text, detail_region.code_text) + ORDER BY CASE WHEN COALESCE(u.code_text, '전체') = '전체' THEN 0 ELSE 1 END, + MIN(u.order_no) NULLS LAST,detail_region.code_text \ No newline at end of file