Merge branch 'bo_fixes' into 'dev'

[BO] 엑셀다운로드 : 일계부 등록 데이터 - 자가임업생산물, 자가농업생산물의 "날","짜" 칼럼 "차수" 칼럼 변경. "차수"는 날짜...

See merge request korea-research/korea-research!132
This commit is contained in:
이강선 매니저/ST
2025-07-18 07:46:24 +00:00
10 changed files with 36 additions and 25 deletions

View File

@@ -205,7 +205,7 @@
SELECT
h.household_num,
h.owner_name,
transfer_type.code_text as transfer_type_name,
case when transfer_type.id = 'code.bank.input' then '1' else '2' end as transfer_type,
bat.income_code,
bat.expense_code,
split_part( bat.crop_code,'code.record.crop.',2 ) as crop_code,
@@ -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