[BO] 엑셀다운로드 : 일계부 등록 데이터 - 자가임업생산물, 자가농업생산물의 "날","짜" 칼럼 "차수" 칼럼 변경. "차수"는 날짜 기반 주차 계산이 아닌 고정 1~4주차 기준으로 계산되도록 변경

This commit is contained in:
kangsunlee
2025-07-18 15:54:46 +09:00
parent 746803b0f0
commit dad7b2903e
5 changed files with 19 additions and 14 deletions

View File

@@ -390,7 +390,7 @@ class GetHouseholdsExcelController {
rows.add(List.of( rows.add(List.of(
StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getHouseholdNum()),
StringUtils.defaultString(item.getOwnerName()), StringUtils.defaultString(item.getOwnerName()),
StringUtils.defaultString(item.getTransferTypeName()), StringUtils.defaultString(item.getTransferType()),
StringUtils.defaultString(item.getIncomeCode()), StringUtils.defaultString(item.getIncomeCode()),
StringUtils.defaultString(item.getExpenseCode()), StringUtils.defaultString(item.getExpenseCode()),
StringUtils.defaultString(item.getCropCode()), StringUtils.defaultString(item.getCropCode()),
@@ -577,7 +577,8 @@ class GetHouseholdsExcelController {
rows.add(List.of( rows.add(List.of(
StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getHouseholdNum()),
StringUtils.defaultString(item.getOwnerName()), StringUtils.defaultString(item.getOwnerName()),
StringUtils.defaultString(item.getWeekOfMonth()), StringUtils.defaultString(item.getStartDay()),
StringUtils.defaultString(item.getEndDay()),
StringUtils.defaultString(item.getIncomeMark()), StringUtils.defaultString(item.getIncomeMark()),
StringUtils.defaultString(item.getExpenseMark()), StringUtils.defaultString(item.getExpenseMark()),
StringUtils.defaultString(item.getProductName()), StringUtils.defaultString(item.getProductName()),
@@ -592,7 +593,8 @@ class GetHouseholdsExcelController {
List.of( List.of(
"임가번호", "임가번호",
"경영주 성명", "경영주 성명",
"차수", "날",
"짜",
"수입 부호", "수입 부호",
"지출 부호", "지출 부호",
"생산물", "생산물",
@@ -611,8 +613,7 @@ class GetHouseholdsExcelController {
rows.add(List.of( rows.add(List.of(
StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getHouseholdNum()),
StringUtils.defaultString(item.getOwnerName()), StringUtils.defaultString(item.getOwnerName()),
StringUtils.defaultString(item.getStartDay()), StringUtils.defaultString(item.getWeekOfMonth()),
StringUtils.defaultString(item.getEndDay()),
StringUtils.defaultString(item.getIncomeMark()), StringUtils.defaultString(item.getIncomeMark()),
StringUtils.defaultString(item.getExpenseMark()), StringUtils.defaultString(item.getExpenseMark()),
StringUtils.defaultString(item.getProductName()), StringUtils.defaultString(item.getProductName()),
@@ -627,8 +628,7 @@ class GetHouseholdsExcelController {
List.of( List.of(
"임가번호", "임가번호",
"경영주 성명", "경영주 성명",
"날", "차수",
"짜",
"수입 부호", "수입 부호",
"지출 부호", "지출 부호",
"생산물", "생산물",

View File

@@ -12,7 +12,7 @@ import lombok.Setter;
public class GetBankAutoTransfers { public class GetBankAutoTransfers {
private String householdNum; private String householdNum;
private String ownerName; private String ownerName;
private String transferTypeName; private String transferType;
private String incomeCode; private String incomeCode;
private String expenseCode; private String expenseCode;
private String cropCode; private String cropCode;

View File

@@ -12,8 +12,7 @@ import lombok.Setter;
public class GetDailyFarming { public class GetDailyFarming {
private String householdNum; private String householdNum;
private String ownerName; private String ownerName;
private String startDay; private String weekOfMonth;
private String endDay;
private String incomeMark; private String incomeMark;
private String expenseMark; private String expenseMark;
private String productName; private String productName;

View File

@@ -12,7 +12,8 @@ import lombok.Setter;
public class GetDailyForestry { public class GetDailyForestry {
private String householdNum; private String householdNum;
private String ownerName; private String ownerName;
private String weekOfMonth; private String startDay;
private String endDay;
private String incomeMark; private String incomeMark;
private String expenseMark; private String expenseMark;
private String productName; private String productName;

View File

@@ -369,7 +369,8 @@
select select
h.household_num , h.household_num ,
h.owner_name , 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.income_mark,
df.expense_mark, df.expense_mark,
df.product_name, df.product_name,
@@ -396,8 +397,12 @@
select select
h.household_num , h.household_num ,
h.owner_name , h.owner_name ,
dg.start_day , CASE
case when dg.start_day = dg.end_day then null else dg.end_day end as end_day , 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.income_mark ,
df.expense_mark , df.expense_mark ,
case when df.product_code = 'code.record.farming.self' then df.product_self case when df.product_code = 'code.record.farming.self' then df.product_self