From b61f3055a002441cdae04da81ba42ad93403742a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 18 Jul 2025 15:03:23 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=8B=9C=20=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=97=91=EC=85=80=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/adapters/persistence/ChartDao.java | 18 ++--- .../adapters/persistence/ChartMapper.java | 13 ++-- .../ExcelUploadCreateHouseholdDao.java | 13 +++- .../mappers/dashboard/ChartMapper.xml | 67 +++++++++++-------- 4 files changed, 65 insertions(+), 46 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 11ebfdbc..c76e1ca3 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 @@ -43,9 +43,9 @@ public class ChartDao implements ChartPortOut { // 관리자 일경우 return new ChartDto( recordMonthText, - chartMapper.selectTotalPercentage(reqVO), - chartMapper.selectLocalRegionPercentage(reqVO), - chartMapper.selectLocalRegionResearcherPercentage(reqVO), + chartMapper.selectTotalPercentage(reqVO,activeProfiles), + chartMapper.selectLocalRegionPercentage(reqVO,activeProfiles), + chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles), uiCodeListMapper.findByParentId("code.region.main",AdminUtil.getLoginUserRole(),activeProfiles)); } else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) { @@ -54,14 +54,14 @@ public class ChartDao implements ChartPortOut { return new ChartDto( recordMonthText, - chartMapper.selectTotalPercentage(reqVO), + chartMapper.selectTotalPercentage(reqVO,activeProfiles), null, - chartMapper.selectLocalRegionResearcherPercentage(reqVO), + chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles), null); } else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) { // 조사원 일경우 reqVO.setAdminSeq(AdminUtil.getLoginUserSeq()); - return new ChartDto(recordMonthText, chartMapper.selectTotalPercentageResearcher(reqVO), null,null,null); + return new ChartDto(recordMonthText, chartMapper.selectTotalPercentageResearcher(reqVO,activeProfiles), null,null,null); } return new ChartDto(null,null,null,null,null); @@ -73,7 +73,7 @@ public class ChartDao implements ChartPortOut { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); String formattedDate = today.format(formatter); if("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) { - return chartMapper.selectLocalRegionResearcherPercentage(new TotalPercentageReqVO(usageType,regionMainCode,formattedDate)); + return chartMapper.selectLocalRegionResearcherPercentage(new TotalPercentageReqVO(usageType,regionMainCode,formattedDate),activeProfiles); }else{ throw new NoMatchingURIException("잘못된 접근"); } @@ -82,7 +82,7 @@ public class ChartDao implements ChartPortOut { @Override public DashboardExcelDto selectDashboard(String recordMonth) { return new DashboardExcelDto( - chartMapper.selectRegionMainExcel(recordMonth), - chartMapper.selectRegionDetailExcel(recordMonth)); + chartMapper.selectRegionMainExcel(recordMonth,activeProfiles), + chartMapper.selectRegionDetailExcel(recordMonth,activeProfiles)); } } diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartMapper.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartMapper.java index 6e9ac77f..3834da15 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartMapper.java @@ -3,17 +3,18 @@ package app.module.admin.usecase.dashboard.chart.adapters.persistence; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.*; import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper public interface ChartMapper { - TotalPercentDto selectTotalPercentage(TotalPercentageReqVO reqVO); - TotalPercentDto selectTotalPercentageResearcher(TotalPercentageReqVO reqVO); - List selectLocalRegionPercentage(TotalPercentageReqVO reqVO); - List selectLocalRegionResearcherPercentage(TotalPercentageReqVO reqVO); - List selectRegionMainExcel(String recordMonth); - List selectRegionDetailExcel(String recordMonth); + TotalPercentDto selectTotalPercentage(@Param("reqVO") TotalPercentageReqVO reqVO,@Param("activeProfiles") String activeProfiles); + TotalPercentDto selectTotalPercentageResearcher(@Param("reqVO") TotalPercentageReqVO reqVO,@Param("activeProfiles") String activeProfiles); + List selectLocalRegionPercentage(@Param("reqVO") TotalPercentageReqVO reqVO,@Param("activeProfiles") String activeProfiles); + List selectLocalRegionResearcherPercentage(@Param("reqVO") TotalPercentageReqVO reqVO,@Param("activeProfiles") String activeProfiles); + List selectRegionMainExcel(@Param("recordMonth") String recordMonth,@Param("activeProfiles") String activeProfiles); + List selectRegionDetailExcel(@Param("recordMonth") String recordMonth,@Param("activeProfiles") String activeProfiles); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 90df6733..29156be3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -155,12 +155,21 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut private String getUiCode(Cell cell,List uiCodeElementList,String codeId){ if (cell == null) return ""; + try { + String cellValue = cell.getStringCellValue().trim(); + String[] cellValueParts = cellValue.split("\\."); + return uiCodeElementList.stream().filter(code -> { - String[] cellValue = cell.getStringCellValue().trim().split("\\."); - return code.getId().equals(codeId+"."+cellValue[0]) || code.getCodeText().equals(cellValue[1]) ; + if(cellValueParts.length == 1 ) return code.getCodeText().equals(codeId+"."+cellValueParts[0]) || code.getCodeText().equals(cellValueParts[0]) ; + if(cellValueParts.length == 2 ) return code.getId().equals(codeId+"."+cellValueParts[0]) || code.getCodeText().equals(cellValueParts[1]) ; + return Boolean.parseBoolean(null); } ) .findFirst() .map(UICodeElement::getId).orElse(""); + } catch (ArrayIndexOutOfBoundsException e) { + return null; + } + } private ExcelUploadContactVO getDivisionContact(Cell cell){ diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index 50f2b4b1..d7bb8ac9 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -12,15 +12,15 @@ COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count, COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT h.seq), 0), 1) , 0 ) as gift_sent_percent FROM household h - JOIN uicode u on u.parent_id ='code.region.main' and u.in_use = true and u.is_deleted = false - LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{recordMonth} - LEFT join household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{recordMonth} and hv.is_deleted = false + JOIN uicode u on u.parent_id ='code.region.main' and u.is_deleted = false and u.in_use = true + LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{reqVO.recordMonth} + LEFT join household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{reqVO.recordMonth} and hv.is_deleted = false WHERE h.is_deleted = false - - and h.usage_type = #{usageType} + + and h.usage_type = #{reqVO.usageType} - - and h.region_main_code = #{regionMainCode} + + and h.region_main_code = #{reqVO.regionMainCode} @@ -33,16 +33,16 @@ COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count, COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT rhh.household_seq), 0), 1),0) as gift_sent_percent FROM household h - JOIN uicode u on u.parent_id ='code.region.main' and u.in_use = true and u.is_deleted = false - JOIN researcher_has_household rhh on rhh.household_seq = h.seq and rhh.admin_seq = #{adminSeq} and rhh.is_deleted = false - LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{recordMonth} - LEFT JOIN household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{recordMonth} and hv.is_deleted = false + JOIN uicode u on u.parent_id ='code.region.main' and u.is_deleted = false and u.in_use = true + JOIN researcher_has_household rhh on rhh.household_seq = h.seq and rhh.admin_seq = #{reqVO.adminSeq} and rhh.is_deleted = false + LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{reqVO.recordMonth} + LEFT JOIN household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{reqVO.recordMonth} and hv.is_deleted = false WHERE h.is_deleted = false - - and h.usage_type = #{usageType} + + and h.usage_type = #{reqVO.usageType} - - and h.region_main_code = #{regionMainCode} + + and h.region_main_code = #{reqVO.regionMainCode} @@ -65,14 +65,17 @@ 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 - - and h.usage_type = #{usageType} + + and h.usage_type = #{reqVO.usageType} LEFT JOIN household_visit hv - ON hv.household_seq = h.seq AND hv.is_deleted = false AND to_char(hv.visit_date,'YYYYMM') = #{recordMonth} + ON hv.household_seq = h.seq AND hv.is_deleted = false AND to_char(hv.visit_date,'YYYYMM') = #{reqVO.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.in_use = true + ON v.household_seq = h.seq AND v.record_month = #{reqVO.recordMonth} + WHERE u.parent_id = 'code.region.main' + + and u.in_use = true + 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, @@ -91,18 +94,18 @@ COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count, COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT h.seq), 0), 1), 0) AS gift_sent_percent FROM admin a - JOIN uicode u ON a.region_main_code = u.id and u.parent_id = 'code.region.main' and u.in_use = true + JOIN uicode u ON a.region_main_code = u.id and u.parent_id = 'code.region.main' and u.in_use = true 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 = ahr.admin_seq LEFT JOIN household h on h.seq = rhh.household_seq - - and h.usage_type = #{usageType} + + and h.usage_type = #{reqVO.usageType} - LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{recordMonth} - LEFT JOIN household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{recordMonth} + LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{reqVO.recordMonth} + LEFT JOIN household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{reqVO.recordMonth} WHERE a.is_deleted = false and a.account_disabled = false - - and a.region_main_code = #{regionMainCode} + + and a.region_main_code = #{reqVO.regionMainCode} GROUP BY a.seq,u.id @@ -143,7 +146,10 @@ 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.in_use = true and u.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 -- 전체 합계 행 @@ -177,7 +183,10 @@ 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.in_use = true and u.is_deleted = false + WHERE u.parent_id = 'code.region.main' and u.is_deleted = false + + and u.in_use = true + ORDER BY order_no