diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java index e405d90c..2cee1a17 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java @@ -26,7 +26,6 @@ public class UpdateNoticeReqVO { @NotNull(message = "노출여부는 {valid.common.required}") private Boolean visible; - @NotNull(message = "시작일은 {valid.common.required}") private LocalDateTime startDate; diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelDao.java index 490482db..e66a1d67 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelDao.java @@ -1,10 +1,7 @@ package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.persistence; -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.GetVisitInfos; +import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.GetHouseholdsExcelCmd; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortOut; import java.util.List; import org.springframework.stereotype.Repository; @@ -28,4 +25,10 @@ class GetHouseholdsExcelDao implements GetHouseholdsExcelPortOut { public List visitInfos(GetHouseholdsExcelCmd cmd) { return mapper.visitInfos(cmd); } + + @Override + public List forestProducts(GetHouseholdsExcelCmd cmd) { return mapper.forestProducts(cmd); } + + @Override + public List bankAutoTransfers(GetHouseholdsExcelCmd cmd) { return mapper.bankAutoTransfers(cmd); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelMapper.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelMapper.java index 5a660d35..6accce03 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelMapper.java @@ -1,9 +1,7 @@ package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.persistence; -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.GetVisitInfos; +import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; + import java.util.List; import org.apache.ibatis.annotations.Mapper; @@ -12,4 +10,6 @@ public interface GetHouseholdsExcelMapper { List households(GetHouseholdsExcelCmd cmd); List dailyRecords(GetHouseholdsExcelCmd cmd); List visitInfos(GetHouseholdsExcelCmd cmd); + List forestProducts(GetHouseholdsExcelCmd cmd); + List bankAutoTransfers(GetHouseholdsExcelCmd cmd); } 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 10075bb4..27d83c1e 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,10 +7,7 @@ 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.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.excelDownload.getHouseholdsExcel.ports.application.domain.*; 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; @@ -98,7 +95,12 @@ class GetHouseholdsExcelController { ); case DAILY_RECORD -> // 일계부 등록 데이터 // TODO : 추가하기 - null; + dailyRegisterExcel( + getHouseholdsExcelPortIn.forestProducts( + new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())), + getHouseholdsExcelPortIn.bankAutoTransfers( + new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())) + ); default -> null; }; @@ -302,4 +304,103 @@ class GetHouseholdsExcelController { return new ExcelResult(excel, encodedFileName); } + + /** + * 엑셀 다운로드 템플릿 - 일계부 등록 데이터 + * */ + private ExcelResult dailyRegisterExcel(List forestItems,List bankAutoTransferItems) { + // 시트 1: 임산물 현황 + List> rows = new ArrayList<>(); + for(GetForestProducts item : forestItems) { + rows.add(List.of( + StringUtils.defaultString(item.getHouseholdNum()), + StringUtils.defaultString(item.getOwnerName()), + StringUtils.defaultString(item.getStreetNum()), + StringUtils.defaultString(item.getLandType()), + StringUtils.defaultString(item.getTown()), + StringUtils.defaultString(item.getAvailableArea()), + StringUtils.defaultString(item.getCropName()), + StringUtils.defaultString(item.getCropCodeName()), + StringUtils.defaultString(item.getLandArea()), + StringUtils.defaultString(item.getMainYield()), + StringUtils.defaultString(item.getMainYieldUnitCodeName()), + StringUtils.defaultString(item.getMainSaleAmount()), + StringUtils.defaultString(item.getMainSaleUnitCodeName()), + StringUtils.defaultString(item.getSubYield()), + StringUtils.defaultString(item.getSubYieldUnitCodeName()), + StringUtils.defaultString(item.getSubSaleAmount()), + StringUtils.defaultString(item.getSubSaleUnitCodeName()) + )); + } + + + ExcelSheetDto sheet1 = new ExcelSheetDto("임산물 현황", + List.of( + "임가번호", + "경영주 성명", + "지번", + "지목", + "읍면동", + "가능면적(평)", + "재배 작물명", + "작물 부호", + "면적", + "주생산물 수확량", + "단위", + "주생산물 판매량", + "단위.1", + "부생산물 수확량", + "단위.2", + "부생산물 판매량", + "단위.3" + ), + rows, + null, + Map.of(0, IndexedColors.LIGHT_YELLOW)); + + // 시트 2: 자동이체_수입(지출) 현황 + rows.clear(); + for(GetBankAutoTransfers item : bankAutoTransferItems) { + rows.add(List.of( + StringUtils.defaultString(item.getHouseholdNum()), + StringUtils.defaultString(item.getOwnerName()), + StringUtils.defaultString(item.getTransferTypeName()), + StringUtils.defaultString(item.getIncomeCode()), + StringUtils.defaultString(item.getExpenseCode()), + StringUtils.defaultString(item.getCropCodeName()), + StringUtils.defaultString(item.getTransferCategoryCodeName()), + StringUtils.defaultString(item.getSourcePurpose()), + StringUtils.defaultString(item.getCount()), + StringUtils.defaultString(item.getUnitCodeName()), + StringUtils.defaultString(item.getPrice()) + )); + } + + + ExcelSheetDto sheet2 = new ExcelSheetDto("자동이체_수입(지출)", + List.of( + "임가번호", + "경영주 성명", + "유형", + "수입 부호", + "지출 부호", + "재배형태 코드", + "수입(지출)의 종류", + "수입원(용도)", + "수량", + "단위", + "현금(원)" + ), + rows, + 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 new ExcelResult(excel, encodedFileName); + } } \ No newline at end of file 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 27fa4ade..ec7e9d5d 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 @@ -1,9 +1,7 @@ package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports; -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.GetVisitInfos; +import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; + import java.util.List; public interface GetHouseholdsExcelPortIn { @@ -13,4 +11,20 @@ public interface GetHouseholdsExcelPortIn { List dailyRecords(GetHouseholdsExcelCmd cmd); // 임가방문정보 List visitInfos(GetHouseholdsExcelCmd cmd); + // 임산물 현황 + List forestProducts(GetHouseholdsExcelCmd cmd); + // 자동이체_수입(지출) + List bankAutoTransfers(GetHouseholdsExcelCmd cmd); + // 월초이월금 + + // 수입(지출) + + // 임엄노동투입내력 + + // 동력사용시간 + + // 자가임업생산물 중 자가소비량 + + // 자가농업생산물 중 자가소비량 + } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/GetHouseholdsExcelPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/GetHouseholdsExcelPortOut.java index cbb652e0..eb9cd1b8 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/GetHouseholdsExcelPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/GetHouseholdsExcelPortOut.java @@ -1,13 +1,13 @@ package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports; -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.GetVisitInfos; +import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; + import java.util.List; public interface GetHouseholdsExcelPortOut { List households(GetHouseholdsExcelCmd cmd); List dailyRecords(GetHouseholdsExcelCmd cmd); List visitInfos(GetHouseholdsExcelCmd cmd); + List forestProducts(GetHouseholdsExcelCmd cmd); + List bankAutoTransfers(GetHouseholdsExcelCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/GetHouseholdsExcelService.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/GetHouseholdsExcelService.java index adfa5706..2e9a9b3d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/GetHouseholdsExcelService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/GetHouseholdsExcelService.java @@ -1,10 +1,7 @@ package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application; -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.GetVisitInfos; +import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.GetHouseholdsExcelCmd; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortIn; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortOut; import java.util.List; @@ -29,4 +26,10 @@ class GetHouseholdsExcelService implements GetHouseholdsExcelPortIn { public List visitInfos(GetHouseholdsExcelCmd cmd) { return portOut.visitInfos(cmd); } + + @Override + public List forestProducts(GetHouseholdsExcelCmd cmd) { return portOut.forestProducts(cmd); } + + @Override + public List bankAutoTransfers(GetHouseholdsExcelCmd cmd) { return portOut.bankAutoTransfers(cmd); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetBankAutoTransfers.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetBankAutoTransfers.java new file mode 100644 index 00000000..38177c9d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetBankAutoTransfers.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransfers { + private String householdNum; + private String ownerName; + private String transferTypeName; + private String incomeCode; + private String expenseCode; + private String cropCodeName; + private String transferCategoryCodeName; + private String sourcePurpose; + private String count; + private String unitCodeName; + private String price; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetForestProducts.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetForestProducts.java new file mode 100644 index 00000000..11563cb4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetForestProducts.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetForestProducts { + private String householdNum; + private String ownerName; + private String streetNum; + private String landType; + private String town; + private String availableArea; + private String cropName; + private String cropCodeName; + private String landArea; + private String mainYield; + private String mainYieldUnitCodeName; + private String mainSaleAmount; + private String mainSaleUnitCodeName; + private String subYield; + private String subYieldUnitCodeName; + private String subSaleAmount; + private String subSaleUnitCodeName; +} diff --git a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml index cc41767a..2291584a 100644 --- a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml +++ b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml @@ -150,4 +150,83 @@ ORDER BY household_num + + + + \ No newline at end of file