diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionDetailExcelDto.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionDetailExcelDto.java index a514d293..3447e5ca 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionDetailExcelDto.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionDetailExcelDto.java @@ -4,12 +4,10 @@ import lombok.Data; @Data public class RegionDetailExcelDto { + private String regionMainName; private String regionDetailName; - private String regionName; private String householdCount; private String avgCompletionRate; private String visitCount; private String giftSentCount; - private String regionOrder; - private String regionDetailOrder; } 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 539c4128..0b6b5576 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 @@ -1,12 +1,18 @@ package app.module.admin.usecase.dashboard.chart.adapters.web; -import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.config.application.util.ExcelWriterUtil; import app.module.admin.config.application.util.model.ExcelSheetDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto; import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -20,14 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - @Slf4j @RestController @RequiredArgsConstructor @@ -62,7 +60,7 @@ class ChartApiController { StringUtils.defaultString(item.getRegionName()), StringUtils.defaultString(item.getResearcherCount()), StringUtils.defaultString(item.getHouseholdCount()), - StringUtils.defaultString(item.getAvgCompletionRate()) + "%", + StringUtils.defaultString(item.getAvgCompletionRate()), StringUtils.defaultString(item.getVisitCount()), StringUtils.defaultString(item.getGiftSentCount()) )); @@ -71,7 +69,7 @@ class ChartApiController { // 시트 1: 실사 ExcelSheetDto sheet1 = new ExcelSheetDto( "실사", - List.of("실사", "할당 조사원 수", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"), + List.of("실사", "할당 조사원 수", "할당 임가 수", "당월 일계부 현황(%)", "현장 방문 수", "답례품 전달 임가 수"), rows1, null, Map.of(0, IndexedColors.LIGHT_YELLOW) @@ -80,7 +78,7 @@ class ChartApiController { List> rows2 = new ArrayList<>(); for (RegionDetailExcelDto item : dashboardExcel.getRegionDetail()) { rows2.add(List.of( - StringUtils.defaultString(item.getRegionName()), + StringUtils.defaultString(item.getRegionMainName()), StringUtils.defaultString(item.getRegionDetailName()), StringUtils.defaultString(item.getHouseholdCount()), StringUtils.defaultString(item.getAvgCompletionRate()), @@ -92,7 +90,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 3704d637..232f9f3c 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -116,18 +116,29 @@ \ No newline at end of file