From 9b62045905173f2d303416658f1438d6b615f464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Fri, 18 Jul 2025 16:31:11 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EA=B4=80=EB=A6=AC=EC=9E=90=EB=A7=8C=20?= =?UTF-8?q?=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C/?= =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C,=20=EC=A7=80=EB=B0=A9=EC=8B=A4?= =?UTF-8?q?=EC=82=AC=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8B=9C=20=ED=95=B4?= =?UTF-8?q?=EB=8B=B9=20=EC=8B=A4=EC=82=AC=EC=A7=80=EC=97=AD=EC=9D=98=20?= =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EB=85=B8=EC=B6=9C=EB=90=98=EC=96=B4=EC=95=BC=20=ED=95=A8?= =?UTF-8?q?=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/chart/adapters/persistence/ChartDao.java | 4 ++-- admin/src/main/resources/mappers/dashboard/ChartMapper.xml | 3 +++ admin/src/main/resources/templates/home.html | 2 +- admin/src/main/resources/templates/households/households.html | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java index c76e1ca3..32fa891a 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java @@ -55,9 +55,9 @@ public class ChartDao implements ChartPortOut { return new ChartDto( recordMonthText, chartMapper.selectTotalPercentage(reqVO,activeProfiles), - null, + chartMapper.selectLocalRegionPercentage(reqVO,activeProfiles), chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles), - null); + null); } else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) { // 조사원 일경우 reqVO.setAdminSeq(AdminUtil.getLoginUserSeq()); diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index d7bb8ac9..b74013a3 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -76,6 +76,9 @@ and u.in_use = true + + and h.region_main_code = #{reqVO.regionMainCode} + GROUP BY ROLLUP(u.code_text) ORDER BY CASE WHEN COALESCE(u.code_text, '전체') = '전체' THEN 1 ELSE 0 END, MIN(u.order_no) NULLS LAST, diff --git a/admin/src/main/resources/templates/home.html b/admin/src/main/resources/templates/home.html index 488d1b2e..391a8cb2 100644 --- a/admin/src/main/resources/templates/home.html +++ b/admin/src/main/resources/templates/home.html @@ -135,7 +135,7 @@ -
+