From ae894715771a671429440aa5ec33180bb578a1fe Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Thu, 10 Jul 2025 18:28:41 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9=20-?= =?UTF-8?q?=20=EC=97=91=EC=85=80=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A4=91=20(3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/enums/ExcelTemplateType.java | 4 +- .../application/util/ExcelWriterUtil.java | 3 +- .../chart/adapters/persistence/ChartDao.java | 10 +- .../adapters/persistence/ChartMapper.java | 4 + .../persistence/model/DashboardExcelDto.java | 14 ++ .../model/RegionDetailExcelDto.java | 15 ++ .../persistence/model/RegionMainExcelDto.java | 14 ++ .../adapters/web/ChartApiController.java | 78 ++++++++++ .../dashboard/chart/ports/ChartPortIn.java | 3 +- .../dashboard/chart/ports/ChartPortOut.java | 2 + .../ports/applilcation/ChartService.java | 6 + .../web/GetHouseholdsExcelController.java | 25 ++-- .../ports/GetHouseholdsExcelPortIn.java | 6 +- .../application/domain/GetDailyRecords.java | 2 + .../application/domain/GetVisitInfos.java | 2 +- .../web/GetHouseholdsStatusController.java | 119 +-------------- .../adpaters/web/ResearcherApiController.java | 7 +- .../mappers/dashboard/ChartMapper.xml | 140 ++++++++++++++++++ .../GetHouseholdsExcelMapper.xml | 18 ++- .../resources/static/assets/styles/style.css | 2 +- admin/src/main/resources/templates/home.html | 14 ++ .../templates/households/households.html | 21 +-- .../modal/modal-excel-download.html | 82 ++++++++++ .../modal/modal-excel-household.html | 2 +- .../households/tab/daily-record.html | 2 +- .../resources/templates/households/{seq}.html | 30 ++-- .../templates/researcher/detail.html | 7 +- 27 files changed, 443 insertions(+), 189 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/DashboardExcelDto.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionDetailExcelDto.java create mode 100644 admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionMainExcelDto.java create mode 100644 admin/src/main/resources/templates/households/modal/modal-excel-download.html diff --git a/admin/src/main/java/app/module/admin/config/application/enums/ExcelTemplateType.java b/admin/src/main/java/app/module/admin/config/application/enums/ExcelTemplateType.java index d7a74e08..a5b73d4e 100644 --- a/admin/src/main/java/app/module/admin/config/application/enums/ExcelTemplateType.java +++ b/admin/src/main/java/app/module/admin/config/application/enums/ExcelTemplateType.java @@ -9,8 +9,6 @@ public enum ExcelTemplateType { HOUSEHOLD("임가 목록"), DAILY_STATUS("일계부 등록 현황"), VISIT("임가방문정보"), - DAILY_RECORD("일계부 등록 데이터"), - RESEARCHER("조사원 목록"), - DASHBOARD("당월 대시보드"); + DAILY_RECORD("일계부 등록 데이터"); private final String desc; } diff --git a/admin/src/main/java/app/module/admin/config/application/util/ExcelWriterUtil.java b/admin/src/main/java/app/module/admin/config/application/util/ExcelWriterUtil.java index 032070d4..7a39d4b7 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/ExcelWriterUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/ExcelWriterUtil.java @@ -68,7 +68,8 @@ public class ExcelWriterUtil { } } } - sheet.setColumnWidth(col, (maxLength + 2) * 256); +// sheet.setColumnWidth(col, (maxLength + 2) * 256); + sheet.setColumnWidth(col, Math.min((maxLength + 2) * 256, 20000)); // 최대 너비 제한 } } 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 799f77b4..c239b342 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 @@ -2,8 +2,11 @@ package app.module.admin.usecase.dashboard.chart.adapters.persistence; import app.module.admin.config.application.util.AdminUtil; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto; +import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; +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.adapters.persistence.model.TotalPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; import app.module.admin.usecase.dashboard.chart.ports.ChartPortOut; @@ -77,5 +80,10 @@ public class ChartDao implements ChartPortOut { } } - + @Override + public DashboardExcelDto selectDashboard(String recordMonth) { + return new DashboardExcelDto( + chartMapper.selectRegionMainExcel(recordMonth), + chartMapper.selectRegionDetailExcel(recordMonth)); + } } 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 a863a63c..04a5a195 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 @@ -2,6 +2,8 @@ package app.module.admin.usecase.dashboard.chart.adapters.persistence; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; +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.adapters.persistence.model.TotalPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO; @@ -16,5 +18,7 @@ public interface ChartMapper { TotalPercentDto selectTotalPercentageResearcher(TotalPercentageReqVO reqVO); List selectLocalRegionPercentage(TotalPercentageReqVO reqVO); List selectLocalRegionResearcherPercentage(TotalPercentageReqVO reqVO); + List selectRegionMainExcel(String recordMonth); + List selectRegionDetailExcel(String recordMonth); } diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/DashboardExcelDto.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/DashboardExcelDto.java new file mode 100644 index 00000000..5a4cf388 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/DashboardExcelDto.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.dashboard.chart.adapters.persistence.model; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class DashboardExcelDto { + List regionMain; + List regionDetail; +} 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 new file mode 100644 index 00000000..a514d293 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionDetailExcelDto.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.dashboard.chart.adapters.persistence.model; + +import lombok.Data; + +@Data +public class RegionDetailExcelDto { + 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/persistence/model/RegionMainExcelDto.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionMainExcelDto.java new file mode 100644 index 00000000..692061b7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionMainExcelDto.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.dashboard.chart.adapters.persistence.model; + +import lombok.Data; + +@Data +public class RegionMainExcelDto { + private String regionName; + private String researcherCount; + private String householdCount; + private String avgCompletionRate; + private String visitCount; + private String giftSentCount; + private Integer orderNo; +} 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 d36c6bbd..deb2f3cf 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,10 +1,27 @@ 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.adapters.web.model.TotalPercentageReqVO; 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; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -25,4 +42,65 @@ class ChartApiController { ResponseEntity selectRegionMainCodePercentage(@RequestParam("usageType") String usageType,@RequestParam("regionMainCode") String regionMainCode) { return ResponseEntity.status(HttpStatus.OK).body(chartPortIn.selectRegionMainCodePercentage(usageType,regionMainCode)); } + + @GetMapping(path = "/excel") + ResponseEntity exportDashboardExcel() { + + DashboardExcelDto dashboardExcel = chartPortIn.selectDashboard( + DateUiUtil.getCurrentMonthValue()); + + List> rows1 = new ArrayList<>(); + for (RegionMainExcelDto item : dashboardExcel.getRegionMain()) { + rows1.add(List.of( + StringUtils.defaultString(item.getRegionName()), + StringUtils.defaultString(item.getResearcherCount()), + StringUtils.defaultString(item.getHouseholdCount()), + StringUtils.defaultString(item.getAvgCompletionRate()) + "%", + StringUtils.defaultString(item.getVisitCount()), + StringUtils.defaultString(item.getGiftSentCount()) + )); + } + + // 시트 1: 실사 + ExcelSheetDto sheet1 = new ExcelSheetDto( + "실사", + List.of("실사", "할당 조사원 수", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"), + rows1, + null, + Map.of(0, IndexedColors.LIGHT_YELLOW) + ); + + List> rows2 = new ArrayList<>(); + for (RegionDetailExcelDto item : dashboardExcel.getRegionDetail()) { + rows2.add(List.of( + StringUtils.defaultString(item.getRegionDetailName()), + StringUtils.defaultString(item.getHouseholdCount()), + StringUtils.defaultString(item.getAvgCompletionRate()) + "%", + StringUtils.defaultString(item.getVisitCount()), + StringUtils.defaultString(item.getGiftSentCount()) + )); + } + + // 시트 2: 세부지역 + ExcelSheetDto sheet2 = new ExcelSheetDto( + "세부지역", + List.of("세부지역", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"), + rows2, + null, + Map.of(0, IndexedColors.LIGHT_YELLOW) + ); + + // 시트 모음 + List sheets = List.of(sheet1, sheet2); + + byte[] excel = ExcelWriterUtil.writeExcel(sheets); + + String rawFileName = "대시보드_" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx"; + String encodedFileName = URLEncoder.encode(rawFileName, StandardCharsets.UTF_8).replaceAll("\\+", "%20"); + + return ResponseEntity.ok() + .contentType(MediaType.APPLICATION_OCTET_STREAM) + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''" + encodedFileName) + .body(excel); + } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortIn.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortIn.java index 197863ff..ac9d374e 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortIn.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.dashboard.chart.ports; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto; +import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; import java.util.List; @@ -9,6 +10,6 @@ public interface ChartPortIn { ChartDto selectTotalPercentage(String usageType); List selectRegionMainCodePercentage(String usageType,String regionMainCode); - + DashboardExcelDto selectDashboard(String recordMonth); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortOut.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortOut.java index 0ba7ec2e..9f2292e8 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortOut.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.dashboard.chart.ports; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto; +import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; @@ -10,4 +11,5 @@ public interface ChartPortOut { ChartDto selectTotalPercentage(String usageType); List selectRegionMainCodePercentage(String usageType,String regionMainCode); + DashboardExcelDto selectDashboard(String recordMonth); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/applilcation/ChartService.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/applilcation/ChartService.java index 9184f202..fe0fc73a 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/applilcation/ChartService.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/applilcation/ChartService.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.dashboard.chart.ports.applilcation; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto; +import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn; @@ -25,5 +26,10 @@ class ChartService implements ChartPortIn { return portOut.selectRegionMainCodePercentage(usageType,regionMainCode); } + @Override + public DashboardExcelDto selectDashboard(String recordMonth) { + return portOut.selectDashboard(recordMonth); + } + } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java index fc7cb1a8..10075bb4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java @@ -7,9 +7,9 @@ import app.module.admin.config.application.util.ExcelWriterUtil; import app.module.admin.config.application.util.model.ExcelSheetDto; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.web.model.GetHouseholdsExcelReqVO; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortIn; -import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.GetHouseholdsExcelCmd; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.GetDailyRecords; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.GetHouseholds; +import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.GetHouseholdsExcelCmd; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.GetVisitInfos; import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortIn; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; @@ -37,9 +37,8 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor @Slf4j class GetHouseholdsExcelController { - private final GetHouseholdsStatusPortIn getHouseholdsStatusPortIn; - private final GetHouseholdsExcelPortIn getDailyInfoExcelPortIn; + private final GetHouseholdsExcelPortIn getHouseholdsExcelPortIn; /** * 엑셀 다운로드 응답용 데이터 클래스. @@ -84,17 +83,17 @@ class GetHouseholdsExcelController { switch (reqVO.getTemplateType()) { case HOUSEHOLD -> // 임가 목록 householdExcel( - getDailyInfoExcelPortIn.households( + getHouseholdsExcelPortIn.households( new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())) ); case DAILY_STATUS -> // 일계부 등록 현황 dailyStatusExcel( - getDailyInfoExcelPortIn.dailyRecords( + getHouseholdsExcelPortIn.dailyRecords( new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())) ); case VISIT -> // 임가방문정보 visitExcel( - getDailyInfoExcelPortIn.visitInfos( + getHouseholdsExcelPortIn.visitInfos( new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())) ); case DAILY_RECORD -> // 일계부 등록 데이터 @@ -136,7 +135,7 @@ class GetHouseholdsExcelController { StringUtils.defaultString(item.getIndustryDetail()), StringUtils.defaultString(item.getResearcherName()), StringUtils.defaultString(item.getResearcherPhone()), - StringUtils.defaultString(item.getCompletionRate()), + StringUtils.defaultString(item.getCompletionRate()) + "%", StringUtils.defaultString(item.getFirstVisitDate()), StringUtils.defaultString(item.getSecondVisitDate()), StringUtils.defaultString(item.getGiftSend()), @@ -199,12 +198,13 @@ class GetHouseholdsExcelController { StringUtils.defaultString(item.getRegionDetailCodeText()), StringUtils.defaultString(item.getResearcherName()), StringUtils.defaultString(item.getResearcherPhone()), - StringUtils.defaultString(item.getDayGroup()), + StringUtils.defaultString(item.getStartDay()), + StringUtils.defaultString(item.getEndDay()), StringUtils.defaultString(item.getAllStatusType().getDesc()), StringUtils.defaultString(item.getIncomeStatus()), StringUtils.defaultString(item.getWorkStatus()), StringUtils.defaultString(item.getExpenseStatus()), - StringUtils.defaultString(item.getWorkStatus()), + StringUtils.defaultString(item.getPowerStatus()), StringUtils.defaultString(item.getForestryStatus()), StringUtils.defaultString(item.getFarmingStatus()) )); @@ -218,10 +218,12 @@ class GetHouseholdsExcelController { "연령", "연락처", "실사", + "지역", "세부지역", "조사원", "조사원 연락처", - "입력 날짜", + "날", + "짜", "완료상태", "수입", "노동투입", @@ -264,7 +266,7 @@ class GetHouseholdsExcelController { item.getManagementType() != null ? ManagementType.valueOf(item.getManagementType()).getDesc() : "", StringUtils.defaultString(item.getContent()), StringUtils.defaultString(item.getUpdatedBy()), - StringUtils.defaultString(item.getUpdatedAt()), + StringUtils.defaultString(item.getCreatedAt()), item.getIsGiftSent() ? "전달 완료" : "-" )); } @@ -277,6 +279,7 @@ class GetHouseholdsExcelController { "연령", "연락처", "실사", + "지역", "세부지역", "조사원", "조사원 연락처", diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/GetHouseholdsExcelPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/GetHouseholdsExcelPortIn.java index 62655e11..27fa4ade 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/GetHouseholdsExcelPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/GetHouseholdsExcelPortIn.java @@ -7,10 +7,10 @@ import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports import java.util.List; public interface GetHouseholdsExcelPortIn { - // 01. 임가 목록 + // 임가 목록 List households(GetHouseholdsExcelCmd cmd); - // 02. 일계부 등록 현황 + // 일계부 등록 현황 List dailyRecords(GetHouseholdsExcelCmd cmd); - // 03. 임가방문정보 + // 임가방문정보 List visitInfos(GetHouseholdsExcelCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyRecords.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyRecords.java index b7c2a4f2..ee2229ce 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyRecords.java @@ -23,6 +23,8 @@ public class GetDailyRecords { private String researcherPhone; private Integer dayGroupNo; private String dayGroup; + private String startDay; + private String endDay; private RecordStatusType allStatusType; private String incomeStatus; private String workStatus; diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetVisitInfos.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetVisitInfos.java index 03b004c8..7980e669 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetVisitInfos.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetVisitInfos.java @@ -24,5 +24,5 @@ public class GetVisitInfos { private String content; private Boolean isGiftSent; private String updatedBy; - private String updatedAt; + private String createdAt; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java index 8ae36b22..f3171dcd 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java @@ -1,31 +1,15 @@ package app.module.admin.usecase.household.getHouseholdsStatus.adapters.web; -import app.module.admin.config.application.enums.ManagementType; -import app.module.admin.config.application.enums.UsageType; import app.module.admin.config.application.util.AdminUtil; -import app.module.admin.config.application.util.ExcelWriterUtil; -import app.module.admin.config.application.util.model.ExcelSheetDto; import app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model.GetHouseholdsStatusReqVO; import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortIn; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; -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 java.util.Optional; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.IndexedColors; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -33,13 +17,13 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor class GetHouseholdsStatusController { - private final GetHouseholdsStatusPortIn portIn; + private final GetHouseholdsStatusPortIn getHouseholdsStatusPortIn; @GetMapping(path = "/api/households") ResponseEntity> operate(@PageableDefault(size = 10) Pageable pageable, GetHouseholdsStatusReqVO reqVO) { return ResponseEntity.status(HttpStatus.OK).body( - portIn.operate(pageable, + getHouseholdsStatusPortIn.operate(pageable, new GetHouseholdsStatusCmd( reqVO.getRecordMonth(), reqVO.getOwnerField(), @@ -61,103 +45,4 @@ class GetHouseholdsStatusController { reqVO.getUserRegionMainCode(), Boolean.TRUE))); } - - /** - * 임가현황 엑셀 다운로드 - * - * @param reqVO 검색 조건 - * @return 엑셀 파일 다운로드 - */ - @GetMapping(path = "/api/households/excel") - ResponseEntity exportHouseholdsExcel(Pageable pageable, - GetHouseholdsStatusReqVO reqVO) { - - Page households = - portIn.operate(pageable, - new GetHouseholdsStatusCmd( - reqVO.getRecordMonth(), - reqVO.getOwnerField(), - reqVO.getOwnerValue(), - reqVO.getRegionMainCode(), - reqVO.getRegionSubCode(), - reqVO.getRegionDetailCode(), - reqVO.getIndustryLargeCode(), - reqVO.getIndustryMiddleCode(), - reqVO.getProgressType() != null ? reqVO.getProgressType().name() : null, - reqVO.getIsFirstVisited(), - reqVO.getIsSecondVisited(), - reqVO.getIsGiftSent(), - reqVO.getResearcherField(), - reqVO.getResearcherValue(), - reqVO.getIsPanel(), - AdminUtil.getLoginUserSeq(), - reqVO.getUserRole(), - reqVO.getUserRegionMainCode(), - Boolean.FALSE)); // 임가 전체 목록을 가져온다. - - List> rows = new ArrayList<>(); - for(GetHouseholdsStatus item : households.getContent()) { - rows.add(List.of( - item.getHouseholdNum(), - item.getHouseholdName(), - StringUtils.defaultString(item.getOwnerAge().toString()), - StringUtils.defaultString(item.getHouseholdPhone()), - StringUtils.defaultString(item.getRegionMainName()), - StringUtils.defaultString(item.getRegionSubName()), - StringUtils.defaultString(item.getRegionDetailName()), - StringUtils.defaultString(item.getAddress()), - StringUtils.defaultString(item.getIndustryLargeName()), - StringUtils.defaultString(item.getIndustryMiddleName()), - StringUtils.defaultString(item.getIndustrySubMiddle()), - StringUtils.defaultString(item.getIndustryDetail()), - StringUtils.defaultString(item.getProgressPercent().toString()) + "%", - StringUtils.defaultString(item.getFirstVisitDate()), - StringUtils.defaultString(item.getSecondVisitDate()), - item.getIsGiftSent() ? "전달" : "미전달", - StringUtils.defaultString(item.getResearcherName()), - StringUtils.defaultString(item.getResearcherPhone()), - item.getUsageType() != null ? UsageType.valueOf(item.getUsageType()).getDesc() : "", - item.getIsPanel() ? "1. 유지" : "2. 탈락" - )); - } - - // 시트 1: 임가 목록 - ExcelSheetDto sheet1 = new ExcelSheetDto("임가 목록", - List.of( - "임가번호", - "경영주 성명", - "연령", - "연락처", - "실사", - "지역", - "세부지역", - "전체 주소", - "업종_대분류", - "업종_중분류1", - "업종_중분류2", - "규모/세부품목", - "당월 일계부 현황", - "당월 1차 임가방문", - "당월 2차 임가방문", - "답례품 전달", - "조사원", - "조사원 연락처", - "이용 구분", - "유지여부"), - rows, - null, - Map.of(0, IndexedColors.LIGHT_YELLOW)); - - List sheets = List.of(sheet1); - - byte[] excel = ExcelWriterUtil.writeExcel(sheets); - - String rawFileName = "01. 임가 목록[" + reqVO.getRecordMonth() + "]_" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx"; - String encodedFileName = URLEncoder.encode(rawFileName, StandardCharsets.UTF_8).replaceAll("\\+", "%20"); - - return ResponseEntity.ok() - .contentType(MediaType.APPLICATION_OCTET_STREAM) - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''" + encodedFileName) - .body(excel); - } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java index 1fb8da3d..a27f4d2a 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java @@ -95,6 +95,7 @@ class ResearcherApiController { StringUtils.defaultString(item.getName()), StringUtils.defaultString(item.getPhone()), StringUtils.defaultString(item.getRegionMainCodeName()), + item.getHouseholdCount() > 0 ? item.getHouseholdCount().toString() : "-", StringUtils.defaultString(item.getAccountDisabledFlag()) )); } @@ -102,7 +103,7 @@ class ResearcherApiController { // 시트 1: 조사원 목록 ExcelSheetDto sheet1 = new ExcelSheetDto( "조사원 목록", - List.of("아이디", "이름", "전화번호", "실사", "사용여부"), + List.of("아이디", "이름", "전화번호", "실사", "담당 임가 수", "사용여부"), rows, null, Map.of(0, IndexedColors.LIGHT_YELLOW) @@ -113,7 +114,7 @@ class ResearcherApiController { byte[] excel = ExcelWriterUtil.writeExcel(sheets); - String rawFileName = "07. 조사원 목록" + "_" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx"; + String rawFileName = "조사원 목록_" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx"; String encodedFileName = URLEncoder.encode(rawFileName, StandardCharsets.UTF_8).replaceAll("\\+", "%20"); return ResponseEntity.ok() @@ -230,7 +231,7 @@ class ResearcherApiController { byte[] excel = ExcelWriterUtil.writeExcel(sheets); - String rawFileName = "06. 임가방문정보" + "_" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx"; + String rawFileName = "임가방문정보_" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx"; String encodedFileName = URLEncoder.encode(rawFileName, StandardCharsets.UTF_8).replaceAll("\\+", "%20"); return ResponseEntity.ok() diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index d63227e9..83b7e1da 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -103,4 +103,144 @@ GROUP BY a.seq,u.id + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml index f8d25dc5..cc41767a 100644 --- a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml +++ b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml @@ -5,7 +5,7 @@ namespace="app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.persistence.GetHouseholdsExcelMapper">