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..9ac28ce2 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,29 @@ class GetHouseholdsExcelDao implements GetHouseholdsExcelPortOut { public List visitInfos(GetHouseholdsExcelCmd cmd) { return mapper.visitInfos(cmd); } -} \ No newline at end of file + + @Override + public List forestProducts(GetHouseholdsExcelCmd cmd) { return mapper.forestProductsExcel(cmd); } + + @Override + public List bankAutoTransfers(GetHouseholdsExcelCmd cmd) { return mapper.bankAutoTransfersExcel(cmd); } + + @Override + public List carryOvers(GetHouseholdsExcelCmd cmd) { return mapper.carryOversExcel(cmd); } + + @Override + public List dailyIncomeExpenses(GetHouseholdsExcelCmd cmd) { return mapper.dailyIncomeExpensesExcel(cmd); } + + @Override + public List dailyWorks(GetHouseholdsExcelCmd cmd) { return mapper.dailyWorksExcel(cmd); } + + @Override + public List dailyPowers(GetHouseholdsExcelCmd cmd) { return mapper.dailyPowersExcel(cmd); } + + @Override + public List dailyForestry(GetHouseholdsExcelCmd cmd) { return mapper.dailyForestryExcel(cmd); } + + @Override + public List dailyFarmings(GetHouseholdsExcelCmd cmd) { return mapper.dailyFarmingsExcel(cmd); } + +} 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..e3d80ccc 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,12 @@ public interface GetHouseholdsExcelMapper { List households(GetHouseholdsExcelCmd cmd); List dailyRecords(GetHouseholdsExcelCmd cmd); List visitInfos(GetHouseholdsExcelCmd cmd); + List forestProductsExcel(GetHouseholdsExcelCmd cmd); + List bankAutoTransfersExcel(GetHouseholdsExcelCmd cmd); + List carryOversExcel(GetHouseholdsExcelCmd cmd); + List dailyIncomeExpensesExcel(GetHouseholdsExcelCmd cmd); + List dailyWorksExcel(GetHouseholdsExcelCmd cmd); + List dailyPowersExcel(GetHouseholdsExcelCmd cmd); + List dailyForestryExcel(GetHouseholdsExcelCmd cmd); + List dailyFarmingsExcel(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..4668d9be 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; @@ -21,6 +18,8 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Map; + +import app.module.core.config.application.util.DailyUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -39,6 +38,7 @@ import org.springframework.web.bind.annotation.RestController; class GetHouseholdsExcelController { private final GetHouseholdsStatusPortIn getHouseholdsStatusPortIn; private final GetHouseholdsExcelPortIn getHouseholdsExcelPortIn; + private final DailyUtil dailyUtil; /** * 엑셀 다운로드 응답용 데이터 클래스. @@ -97,8 +97,25 @@ class GetHouseholdsExcelController { new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())) ); case DAILY_RECORD -> // 일계부 등록 데이터 - // TODO : 추가하기 - null; + dailyRegisterExcel( + getHouseholdsExcelPortIn.forestProducts( + new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())), + getHouseholdsExcelPortIn.bankAutoTransfers( + new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())), + getHouseholdsExcelPortIn.carryOvers( + new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())), + getHouseholdsExcelPortIn.dailyIncomeExpenses( + new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())), + getHouseholdsExcelPortIn.dailyWorks( + new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())), + getHouseholdsExcelPortIn.dailyPowers( + new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())), + getHouseholdsExcelPortIn.dailyForestry( + new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())), + getHouseholdsExcelPortIn.dailyFarmings( + new GetHouseholdsExcelCmd(householdSeqList, reqVO.getRecordMonth())) + + ); default -> null; }; @@ -302,4 +319,334 @@ class GetHouseholdsExcelController { return new ExcelResult(excel, encodedFileName); } + + /** + * 엑셀 다운로드 템플릿 - 일계부 등록 데이터 + * */ + private ExcelResult dailyRegisterExcel( + List forestItems, + List bankAutoTransferItems, + List carryOverItems, + List dailyIncomeExpenseItems , + List dailyWorkItems, + List dailyPowerItems, + List dailyForestryItems, + List dailyFarmingItems ){ + + // 시트 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.getCropCode()), + 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 = new ArrayList<>(); + 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.getCropCode()), + StringUtils.defaultString(item.getTransferCategoryCodeName()), + StringUtils.defaultString(item.getSourcePurpose()), + StringUtils.defaultString(item.getCount()), + StringUtils.defaultString(item.getUnitCodeName()), + StringUtils.defaultString(dailyUtil.getStringComma(item.getPrice())) + )); + } + + + ExcelSheetDto sheet2 = new ExcelSheetDto("자동이체_수입(지출)", + List.of( + "임가번호", + "경영주 성명", + "유형", + "수입 부호", + "지출 부호", + "재배형태 코드", + "수입(지출)의 종류", + "수입원(용도)", + "수량", + "단위", + "현금(원)" + ), + rows, + null, + Map.of(0, IndexedColors.LIGHT_YELLOW)); + + // 시트 3: 월초 이월금 + rows = new ArrayList<>(); + for(GetCarryOvers item : carryOverItems) { + rows.add(List.of( + StringUtils.defaultString(item.getHouseholdNum()), + StringUtils.defaultString(item.getOwnerName()), + StringUtils.defaultString(dailyUtil.getStringComma(item.getCarryOver())) + )); + } + + ExcelSheetDto sheet3 = new ExcelSheetDto("월초이월금", + List.of( + "임가번호", + "경영주 성명", + "월초이월금" + ), + rows, + null, + Map.of(0, IndexedColors.LIGHT_YELLOW)); + + // 시트 4: 수입(지출) + rows = new ArrayList<>(); + for(GetDailyIncomeExpense item : dailyIncomeExpenseItems) { + rows.add(List.of( + StringUtils.defaultString(item.getHouseholdNum()), + StringUtils.defaultString(item.getOwnerName()), + StringUtils.defaultString(item.getStartDay()), + StringUtils.defaultString(item.getEndDay()), + StringUtils.defaultString(item.getCategory()), + StringUtils.defaultString(item.getIncomeMark()), + StringUtils.defaultString(item.getExpenseMark()), + StringUtils.defaultString(item.getCropCode()), + StringUtils.defaultString(item.getKind()), + StringUtils.defaultString(item.getSourcePurpose()), + StringUtils.defaultString(item.getQuantity()), + StringUtils.defaultString(item.getUnitCodeName()), + StringUtils.defaultString(dailyUtil.getStringComma(item.getPrice())), + StringUtils.defaultString(dailyUtil.getStringComma(item.getEstimatedValue())) + )); + } + + ExcelSheetDto sheet4 = new ExcelSheetDto("수입(지출)", + List.of( + "임가번호", + "경영주 성명", + "날", + "짜", + "유형", + "수입 부호", + "지출 부호", + "재배형태 코드", + "수입(지출)의 종류", + "수입원(용도)", + "수량", + "단위", + "현금(원)", + "현물(평가액)" + ), + rows, + null, + Map.of(0, IndexedColors.LIGHT_YELLOW)); + + // 시트 5: 임업노동 투입내역 + rows = new ArrayList<>(); + for(GetDailyWork item : dailyWorkItems) { + rows.add(List.of( + StringUtils.defaultString(item.getHouseholdNum()), + StringUtils.defaultString(item.getOwnerName()), + StringUtils.defaultString(item.getStartDay()), + StringUtils.defaultString(item.getEndDay()), + StringUtils.defaultString(item.getItemName()), + StringUtils.defaultString(item.getItemMark()), + StringUtils.defaultString(item.getWorkName()), + StringUtils.defaultString(item.getWorkMark()), + StringUtils.defaultString(item.getWorkLandArea()), + StringUtils.defaultString(item.getAreaUnitName()), + StringUtils.defaultString(item.getHarvestQuantity()), + StringUtils.defaultString(item.getHarvestUnitName()), + StringUtils.defaultString(item.getOwnerTime()), + StringUtils.defaultString(item.getSpouseTime()), + StringUtils.defaultString(item.getFamilyMHours()), + StringUtils.defaultString(item.getFamilyFHours()), + StringUtils.defaultString(item.getHiredMHours()), + StringUtils.defaultString(item.getHiredFHours()), + StringUtils.defaultString(item.getSharedMHours()), + StringUtils.defaultString(item.getSharedFHours()), + StringUtils.defaultString(item.getVolunteerMHours()), + StringUtils.defaultString(item.getVolunteerMHours()) + )); + } + + ExcelSheetDto sheet5 = new ExcelSheetDto("임업노동 투입내역", + List.of( + "임가번호", + "경영주 성명", + "날", + "짜", + "품목명", + "품목 부호", + "작업명", + "작업 부호", + "작업면적", + "단위", + "수확량", + "단위", + "경영주", + "배우자", + "가족노동 남", + "가족노동 여", + "고용노동 남", + "고용노동 여", + "품앗이 남", + "품앗이 여", + "일손돕기 남", + "일손돕기 여" + ), + rows, + null, + Map.of(0, IndexedColors.LIGHT_YELLOW)); + + // 시트 6: 동력사용시간 + rows = new ArrayList<>(); + for(GetDailyPower item : dailyPowerItems) { + rows.add(List.of( + StringUtils.defaultString(item.getHouseholdNum()), + StringUtils.defaultString(item.getOwnerName()), + StringUtils.defaultString(item.getStartDay()), + StringUtils.defaultString(item.getEndDay()), + StringUtils.defaultString(item.getEquipmentName()), + StringUtils.defaultString(item.getEquipmentMark()), + StringUtils.defaultString(item.getOwnedHours()), + StringUtils.defaultString(item.getLeasedHours()) + )); + } + + ExcelSheetDto sheet6 = new ExcelSheetDto("동력사용시간", + List.of( + "임가번호", + "경영주 성명", + "날", + "짜", + "명칭", + "부호", + "자가시간", + "임차시간" + ), + rows, + null, + Map.of(0, IndexedColors.LIGHT_YELLOW)); + + // 시트 7: 자가임업생산물 중 자가소비량 + rows = new ArrayList<>(); + for(GetDailyForestry item : dailyForestryItems) { + rows.add(List.of( + StringUtils.defaultString(item.getHouseholdNum()), + StringUtils.defaultString(item.getOwnerName()), + StringUtils.defaultString(item.getWeekOfMonth()), + StringUtils.defaultString(item.getIncomeMark()), + StringUtils.defaultString(item.getExpenseMark()), + StringUtils.defaultString(item.getProductName()), + StringUtils.defaultString(item.getUsage()), + StringUtils.defaultString(item.getQuantity()), + StringUtils.defaultString(item.getUnitName()), + StringUtils.defaultString(dailyUtil.getStringComma(item.getEstimatedValue())) + )); + } + + ExcelSheetDto sheet7 = new ExcelSheetDto(" 자가임업생산물 중 자가소비량", + List.of( + "임가번호", + "경영주 성명", + "차수", + "수입 부호", + "지출 부호", + "생산물", + "용도", + "수량", + "단위", + "현물평가액" + ), + rows, + null, + Map.of(0, IndexedColors.LIGHT_YELLOW)); + + + + // 시트 8: 자가농업생산물 중 자가소비량 + rows = new ArrayList<>(); + for(GetDailyFarming item : dailyFarmingItems) { + rows.add(List.of( + StringUtils.defaultString(item.getHouseholdNum()), + StringUtils.defaultString(item.getOwnerName()), + StringUtils.defaultString(item.getStartDay()), + StringUtils.defaultString(item.getEndDay()), + StringUtils.defaultString(item.getIncomeMark()), + StringUtils.defaultString(item.getExpenseMark()), + StringUtils.defaultString(item.getProductName()), + StringUtils.defaultString(item.getUsage()), + StringUtils.defaultString(item.getQuantity()), + StringUtils.defaultString(item.getUnitName()), + StringUtils.defaultString(dailyUtil.getStringComma(item.getEstimatedValue())) + )); + } + + ExcelSheetDto sheet8 = new ExcelSheetDto("자가농업생산물 중 자가소비량", + List.of( + "임가번호", + "경영주 성명", + "날", + "짜", + "수입 부호", + "지출 부호", + "생산물", + "용도", + "수량", + "단위", + "현물평가액" + ), + rows, + null, + Map.of(0, IndexedColors.LIGHT_YELLOW)); + + List sheets = List.of(sheet1,sheet2,sheet3,sheet4,sheet5,sheet6,sheet7,sheet8); + 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..d865fc87 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); + // 월초이월금 + List carryOvers(GetHouseholdsExcelCmd cmd); + // 수입(지출) + List dailyIncomeExpenses(GetHouseholdsExcelCmd cmd); + // 임엄노동투입내역 + List dailyWorks(GetHouseholdsExcelCmd cmd); + // 동력사용시간 + List dailyPowers(GetHouseholdsExcelCmd cmd); + // 자가임업생산물 중 자가소비량 + List dailyForestry(GetHouseholdsExcelCmd cmd); + // 자가농업생산물 중 자가소비량 + List dailyFarmings(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..c2f031e3 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,19 @@ 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); + List carryOvers(GetHouseholdsExcelCmd cmd); + List dailyIncomeExpenses(GetHouseholdsExcelCmd cmd); + List dailyWorks(GetHouseholdsExcelCmd cmd); + List dailyPowers(GetHouseholdsExcelCmd cmd); + List dailyForestry(GetHouseholdsExcelCmd cmd); + List dailyFarmings(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..a4e623e9 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,29 @@ 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); } + + @Override + public List carryOvers(GetHouseholdsExcelCmd cmd) { return portOut.carryOvers(cmd); } + + @Override + public List dailyIncomeExpenses(GetHouseholdsExcelCmd cmd) { return portOut.dailyIncomeExpenses(cmd); } + + @Override + public List dailyWorks(GetHouseholdsExcelCmd cmd) { return portOut.dailyWorks(cmd); } + + @Override + public List dailyPowers(GetHouseholdsExcelCmd cmd) { return portOut.dailyPowers(cmd); } + + @Override + public List dailyForestry(GetHouseholdsExcelCmd cmd) { return portOut.dailyForestry(cmd); } + + @Override + public List dailyFarmings(GetHouseholdsExcelCmd cmd) { return portOut.dailyFarmings(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..f893e9e2 --- /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 cropCode; + 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/GetCarryOvers.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetCarryOvers.java new file mode 100644 index 00000000..d941e4d6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetCarryOvers.java @@ -0,0 +1,16 @@ +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 GetCarryOvers { + private String householdNum; + private String ownerName; + private String carryOver; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyFarming.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyFarming.java new file mode 100644 index 00000000..b19b720f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyFarming.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 GetDailyFarming { + private String householdNum; + private String ownerName; + private String startDay; + private String endDay; + private String incomeMark; + private String expenseMark; + private String productName; + private String usage; + private String quantity; + private String unitName; + private String estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyForestry.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyForestry.java new file mode 100644 index 00000000..94eca131 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyForestry.java @@ -0,0 +1,23 @@ +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 GetDailyForestry { + private String householdNum; + private String ownerName; + private String weekOfMonth; + private String incomeMark; + private String expenseMark; + private String productName; + private String usage; + private String quantity; + private String unitName; + private String estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyIncomeExpense.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyIncomeExpense.java new file mode 100644 index 00000000..f54228ed --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyIncomeExpense.java @@ -0,0 +1,27 @@ +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 GetDailyIncomeExpense { + private String householdNum; + private String ownerName; + private String startDay; + private String endDay; + private String category; + private String incomeMark; + private String expenseMark; + private String cropCode; + private String kind; + private String sourcePurpose; + private String quantity; + private String unitCodeName; + private String price; + private String estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyPower.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyPower.java new file mode 100644 index 00000000..6b4b075c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyPower.java @@ -0,0 +1,21 @@ +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 GetDailyPower { + private String householdNum; + private String ownerName; + private String startDay; + private String endDay; + private String equipmentName; + private String equipmentMark; + private String ownedHours; + private String leasedHours; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java new file mode 100644 index 00000000..2eb4e434 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java @@ -0,0 +1,35 @@ +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 GetDailyWork { + private String householdNum; + private String ownerName; + private String startDay; + private String endDay; + private String itemName; + private String itemMark; + private String workName; + private String workMark; + private String workLandArea; + private String areaUnitName; + private String harvestQuantity; + private String harvestUnitName; + private String ownerTime; + private String spouseTime; + private String familyMHours; + private String familyFHours; + private String hiredMHours; + private String hiredFHours; + private String sharedMHours; + private String sharedFHours; + private String volunteerMHours; + private String volunteerFHours; +} 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..e18c3587 --- /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 cropCode; + 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/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java index 2e46555c..0849dc7e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java @@ -52,8 +52,8 @@ class UpdateHouseholdController { reqVO.getIndustryDetail(), reqVO.getResearcherSeq(), reqVO.getIsPanel(), - reqVO.getUsageType().name(), - reqVO.getEmploymentType().name(), + reqVO.getUsageType() != null ? reqVO.getUsageType().name() : null, + reqVO.getEmploymentType() != null ? reqVO.getEmploymentType().name() : null, reqVO.getMemo() ) ); diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java index 667c3457..b053fb15 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java @@ -52,6 +52,11 @@ class UpdateHouseholdStatusUIController { GetHouseholdStatus result = getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null); + String tel = StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel() : ""; + String[] telParts = tel.split("-"); + String phone = StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone() : ""; + String[] phoneParts = phone.split("-"); + if (result != null) { model.addAttribute("householdInfo", new UpdateHouseholdStatusUIResVO( @@ -59,12 +64,12 @@ class UpdateHouseholdStatusUIController { result.getHouseholdNum(), result.getHouseholdName(), result.getHouseholdAge(), - StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "", - StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "", - StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "", - StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "", - StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "", - StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "", + telParts.length > 0 ? telParts[0] : "", + telParts.length > 1 ? telParts[1] : "", + telParts.length > 2 ? telParts[2] : "", + phoneParts.length > 0 ? phoneParts[0] : "", + phoneParts.length > 1 ? phoneParts[1] : "", + phoneParts.length > 2 ? phoneParts[2] : "", result.getRegionMainCode(), result.getRegionSubCode(), result.getRegionDetailCode(), diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index 45390b05..4e078b48 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -31,16 +31,22 @@ ), visit_summary AS ( /* 임가별 1차임가방문, 2차임가방문, 답례품전달여부 */ - SELECT - rhh.household_seq, - MIN(v.visit_date) AS first_visit_date, - MAX(v.visit_date) AS second_visit_date, - BOOL_OR(v.is_gift_sent) AS is_gift_sent - FROM household_visit v - JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq - WHERE TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth} - AND rhh.is_deleted = false - GROUP BY rhh.household_seq + SELECT household_seq, + MAX(CASE WHEN rn = 1 THEN visit_date END) AS first_visit_date, + MAX(CASE WHEN rn = 2 THEN visit_date END) AS second_visit_date, + BOOL_OR(is_gift_sent) AS is_gift_sent + FROM ( + SELECT rhh.household_seq, + v.visit_date, + v.is_gift_sent, + ROW_NUMBER() OVER (PARTITION BY rhh.household_seq ORDER BY v.visit_date ASC) AS rn + FROM household_visit v + JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq + WHERE TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth} + AND rhh.is_deleted = false + ) sub + WHERE rn <= 2 + GROUP BY household_seq ) SELECT hvr.*, diff --git a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml index cc41767a..eff214b6 100644 --- a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml +++ b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml @@ -150,4 +150,275 @@ ORDER BY household_num + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index fb8b9667..1d8dd70c 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -364,10 +364,10 @@ ${ct.regionDetailName} ${ifNullHyphen(ct.industryLargeName)} ${ifNullHyphen(ct.industryMiddleName)} + ${ct.progressPercent}% ${ifNullHyphen(ct.firstVisitDate)} ${ifNullHyphen(ct.secondVisitDate)} ${ct.isGiftSent ? "전달" : "미전달"} - ${ct.progressPercent}% ${ifNullHyphen(ct.researcherName)} ${ifNullHyphen(ct.researcherPhone)}