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 951c3a58..aa4c6ede 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 @@ -390,7 +390,7 @@ class GetHouseholdsExcelController { rows.add(List.of( StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getOwnerName()), - StringUtils.defaultString(item.getTransferTypeName()), + StringUtils.defaultString(item.getTransferType()), StringUtils.defaultString(item.getIncomeCode()), StringUtils.defaultString(item.getExpenseCode()), StringUtils.defaultString(item.getCropCode()), @@ -577,7 +577,8 @@ class GetHouseholdsExcelController { rows.add(List.of( StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getOwnerName()), - StringUtils.defaultString(item.getWeekOfMonth()), + StringUtils.defaultString(item.getStartDay()), + StringUtils.defaultString(item.getEndDay()), StringUtils.defaultString(item.getIncomeMark()), StringUtils.defaultString(item.getExpenseMark()), StringUtils.defaultString(item.getProductName()), @@ -592,7 +593,8 @@ class GetHouseholdsExcelController { List.of( "임가번호", "경영주 성명", - "차수", + "날", + "짜", "수입 부호", "지출 부호", "생산물", @@ -611,8 +613,7 @@ class GetHouseholdsExcelController { rows.add(List.of( StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getOwnerName()), - StringUtils.defaultString(item.getStartDay()), - StringUtils.defaultString(item.getEndDay()), + StringUtils.defaultString(item.getWeekOfMonth()), StringUtils.defaultString(item.getIncomeMark()), StringUtils.defaultString(item.getExpenseMark()), StringUtils.defaultString(item.getProductName()), @@ -627,8 +628,7 @@ class GetHouseholdsExcelController { List.of( "임가번호", "경영주 성명", - "날", - "짜", + "차수", "수입 부호", "지출 부호", "생산물", 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 index f893e9e2..32073af1 100644 --- 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 @@ -12,7 +12,7 @@ import lombok.Setter; public class GetBankAutoTransfers { private String householdNum; private String ownerName; - private String transferTypeName; + private String transferType; private String incomeCode; private String expenseCode; private String cropCode; 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 index b19b720f..175da5eb 100644 --- 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 @@ -12,8 +12,7 @@ import lombok.Setter; public class GetDailyFarming { private String householdNum; private String ownerName; - private String startDay; - private String endDay; + private String weekOfMonth; private String incomeMark; private String expenseMark; private String productName; 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 index 94eca131..309b978c 100644 --- 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 @@ -12,7 +12,8 @@ import lombok.Setter; public class GetDailyForestry { private String householdNum; private String ownerName; - private String weekOfMonth; + private String startDay; + private String endDay; private String incomeMark; private String expenseMark; private String productName; diff --git a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml index 6b20c09c..d9504e79 100644 --- a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml +++ b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml @@ -369,7 +369,8 @@ select h.household_num , h.owner_name , - extract(week from dr.start_date) - extract(week from DATE_TRUNC('month', dr.start_date)) + 1 AS week_of_month, + dg.start_day , + case when dg.start_day = dg.end_day then null else dg.end_day end as end_day , df.income_mark, df.expense_mark, df.product_name, @@ -396,8 +397,12 @@ select h.household_num , h.owner_name , - dg.start_day , - case when dg.start_day = dg.end_day then null else dg.end_day end as end_day , + CASE + WHEN EXTRACT(DAY FROM dr.start_date) <= 7 THEN 1 + WHEN EXTRACT(DAY FROM dr.start_date) <= 14 THEN 2 + WHEN EXTRACT(DAY FROM dr.start_date) <= 21 THEN 3 + ELSE 4 + END AS week_of_month, df.income_mark , df.expense_mark , case when df.product_code = 'code.record.farming.self' then df.product_self