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

@@ -200,7 +200,7 @@
SELECT
detail_uicode.code_text AS region_detail_name,
parent_uicode.code_text AS region_name,
COUNT(DISTINCT h.seq) AS household_count,
COUNT(DISTINCT rhh.household_seq) AS household_count,
CASE
WHEN AVG(v.completion_rate) > 0 THEN ROUND(AVG(v.completion_rate), 1)
ELSE 0
@@ -215,6 +215,9 @@
ON h.region_detail_code = detail_uicode.id
AND h.is_deleted = false
AND h.is_panel = true
LEFT JOIN researcher_has_household rhh
ON rhh.household_seq = h.seq
AND rhh.is_deleted = false
LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq
AND v.record_month = #{recordMonth}
@@ -238,13 +241,16 @@
SELECT
'전체' AS region_detail_name,
'전체' AS region_name,
COUNT(DISTINCT h.seq) AS household_count,
COUNT(DISTINCT rhh.household_seq) AS household_count,
COALESCE(ROUND(AVG(v.completion_rate), 1), 0),
COUNT(DISTINCT hv_visit.household_seq),
COUNT(DISTINCT hv_gift.household_seq),
-1 AS region_order,
-1 AS region_detail_order
FROM household h
LEFT JOIN researcher_has_household rhh
ON rhh.household_seq = h.seq
AND rhh.is_deleted = false
LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq
AND v.record_month = #{recordMonth}

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

View File

@@ -1,6 +1,6 @@
AbstractUserDetailsAuthenticationProvider.badCredentials=\uC544\uC774\uB514\uB098 \uBE44\uBC00\uBC88\uD638\uAC00 \uB9DE\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.<br/>\uB2E4\uC2DC \uD655\uC778\uD574\uC8FC\uC138\uC694.
AbstractUserDetailsAuthenticationProvider.badCredentials=\uC544\uC774\uB514\uB098 \uBE44\uBC00\uBC88\uD638\uAC00 \uB9DE\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n\uB2E4\uC2DC \uD655\uC778\uD574\uC8FC\uC138\uC694.
AbstractUserDetailsAuthenticationProvider.credentialsExpired=\uBE44\uBC00\uBC88\uD638 \uC720\uD6A8\uAE30\uAC04\uC774 \uB9CC\uB8CC \uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uAD00\uB9AC\uC790\uC5D0\uAC8C \uBB38\uC758\uD558\uC138\uC694.
AbstractUserDetailsAuthenticationProvider.disabled=\uACC4\uC815\uC774 \uBE44\uD65C\uC131\uD654\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uAD00\uB9AC\uC790\uC5D0\uAC8C \uBB38\uC758\uD558\uC138\uC694
AbstractUserDetailsAuthenticationProvider.disabled=\uC0AC\uC6A9\uBD88\uAC00\uD55C \uACC4\uC815\uC785\uB2C8\uB2E4.
AbstractUserDetailsAuthenticationProvider.expired=\uACC4\uC815\uC774 \uB9CC\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uAD00\uB9AC\uC790\uC5D0\uAC8C \uBB38\uC758\uD558\uC138\uC694.
AbstractUserDetailsAuthenticationProvider.locked=\uACC4\uC815\uC774 \uC7A0\uACA8\uC788\uC2B5\uB2C8\uB2E4. \uAD00\uB9AC\uC790\uC5D0\uAC8C \uBB38\uC758\uD558\uC138\uC694.
security.password.change.notify=\uBE44\uBC00\uBC88\uD638 \uBCC0\uACBD \uB9CC\uB8CC {0}\uC77C\uC804 \uC785\uB2C8\uB2E4.

View File

@@ -65,7 +65,7 @@
document.addEventListener('DOMContentLoaded', function() {
const errorMessage = /*[[${session['SPRING_SECURITY_LAST_EXCEPTION']?.message}]]*/ null;
if (errorMessage) {
alert("입력하신 정보가 맞지 않습니다.\n 다시 확인해주세요.");
alert(errorMessage);
document.loginForm.reset();
}
});