diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java index dcf6b9d9..17494f8e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java @@ -72,8 +72,8 @@ class GetHouseholdVisitInfosController { Optional.ofNullable(ManagementType.from(record.getManagementType())) .map(ManagementType::getDesc).orElse(""), record.getContent(), - record.getUpdatedBy() + " (" + record.getUpdatedAt() + ")", - record.getIsGiftSent() ? "전달" : "미전달" + record.getUpdatedBy() + " (" + record.getUpdatedAt() + ")", + record.getIsGiftSent() ? "전달 완료" : "-" )); } @@ -89,7 +89,10 @@ class GetHouseholdVisitInfosController { "답례품 전달"), rows, Collections.singleton(11), - Map.of(0, IndexedColors.LIGHT_YELLOW)); + Map.of( + 0, IndexedColors.LIGHT_YELLOW, + 2, IndexedColors.LIGHT_TURQUOISE + )); List sheets = List.of(sheet1); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java index cf12ec9b..56c5085b 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java @@ -15,5 +15,6 @@ public class ResearchersHouseholdVisitDto { private ManagementType managementType; private String content; private String isGiftSentFlag; - private LocalDateTime createdAt; + private String updatedAt; + private String updatedBy; } 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 313a93bd..1fb8da3d 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 @@ -5,6 +5,7 @@ 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.researcher.adpaters.persistence.model.ResearchersDto; +import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto; import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto; import app.module.admin.usecase.researcher.adpaters.web.model.*; import app.module.admin.usecase.researcher.ports.ResearcherPortIn; @@ -122,7 +123,7 @@ class ResearcherApiController { } @GetMapping(path = "/mappingHouseholdList/excel") - ResponseEntity exportMappingHouseholdsExcel(@ModelAttribute ResearchersDetailReqVO reqVO) { + ResponseEntity exportMappingHouseholdsExcel(@ModelAttribute ResearchersDetailReqVO reqVO) { Page mappingHouseholds = researcherPortIn.mappingHouseholdList(reqVO); @@ -188,4 +189,54 @@ class ResearcherApiController { .body(excel); } + @GetMapping(path = "/visitHousehold/list/excel") + ResponseEntity exportVisitHouseholdExcel(@ModelAttribute ResearchersDetailReqVO reqVO) { + + List visitInfos = researcherPortIn.visitHouseholdList(reqVO); + + List> rows = new ArrayList<>(); + for(ResearchersHouseholdVisitDto item : visitInfos) { + rows.add(List.of( + StringUtils.defaultString(item.getHouseholdNum()), + StringUtils.defaultString(item.getOwnerName()), + StringUtils.defaultString(item.getVisitDate()), + item.getManagementType() != null ? item.getManagementType().getDesc() : "", + StringUtils.defaultString(item.getContent()), + item.getUpdatedBy() + " (" + item.getUpdatedAt() + ")", + StringUtils.defaultString(item.getIsGiftSentFlag()) + )); + } + + // 시트 1: 임가방문정보 + ExcelSheetDto sheet1 = new ExcelSheetDto( + "임가방문정보", + List.of( + "임가번호", + "경영주 성명", + "방문일", + "관리분야", + "내용", + "최종 작성자", + "답례품 전달"), + rows, + null, + Map.of( + 0, IndexedColors.LIGHT_YELLOW, + 2, IndexedColors.LIGHT_TURQUOISE + )); + + // 시트 모음 + List sheets = List.of(sheet1); + + byte[] excel = ExcelWriterUtil.writeExcel(sheets); + + String rawFileName = "06. 임가방문정보" + "_" + 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/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 7873ba90..2df460ba 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -144,7 +144,8 @@ rhv.content, rhv.management_type, case rhv.is_gift_sent when true then '전달완료' when false then '-' end is_gift_sent_flag, - rhv.created_at + TO_CHAR(rhv.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at, + rhv.updated_by from household_visit rhv join household h on rhv.household_seq = h.seq join researcher_has_household rhh on rhh.household_seq = h.seq and rhh.is_deleted = false diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 14d66954..3e5ce9b1 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -330,7 +330,7 @@ ${ct.visitDate} ${ct.managementType} ${ct.content} - ${ct.createdAt} + ${ct.updatedAt} ${ct.isGiftSentFlag} ` @@ -362,7 +362,7 @@ if (selectedTab.dataset.tabValue === 'tab1') { url = '/api/researcher/mappingHouseholdList/excel'; } else if (selectedTab.dataset.tabValue === 'tab2') { - url = ''; // 임가방문정보 + url = '/api/researcher/visitHousehold/list/excel'; } const f = document.householdReqForm;