From e355f54ce8835d3424d9b6b436e78fb184d2e525 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 28 Jul 2025 16:28:09 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EB=85=B8=EB=8F=99=ED=88=AC=EC=9E=85?= =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EC=BB=AC=EB=9F=BC=EB=AA=85=20=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95,=20=EC=9D=80=ED=96=89?= =?UTF-8?q?=EC=9E=90=EB=8F=99=EC=9D=B4=EC=B2=B4=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EC=A7=81=EC=A0=91=EC=9E=85=EB=A0=A5=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../household/GetBankAutoTransferRecordsMapper.xml | 2 +- .../modal/modal-bank-auto-transfer-expense.html | 1 + .../templates/households/modal/modal-daily-work.html | 8 ++++---- .../templates/households/tab/bank-auto-transfer.html | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml index 563816f2..57185338 100644 --- a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml @@ -58,7 +58,7 @@ bat.income_code, /* 수입부호(엑셀용) */ bat.expense_code, /* 지출부호(엑셀용) */ CASE - WHEN ui_category.id = 'code.bank.input.self' + WHEN ui_category.id = 'code.bank.output.self' THEN bat.transfer_category ELSE ui_category.code_text END AS categoryText, /* 지출의 종류 */ diff --git a/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html index 702b8286..d3327b4a 100644 --- a/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html +++ b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html @@ -178,6 +178,7 @@ form.price.value = data.price ?? ''; form.sourcePurpose.value = data.sourcePurpose ?? ''; form.transferCategoryCode.value = data.transferCategoryCode ?? ''; + form.transferCategory.value = data.transferCategory ?? ''; // 초기 상태 업데이트 toggleExpenseSelfInput(form.transferCategoryCode); diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-work.html b/admin/src/main/resources/templates/households/modal/modal-daily-work.html index da50531b..26d4654c 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-work.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-work.html @@ -148,7 +148,7 @@ - 가족노동(남) + 가족노동(여)
@@ -169,7 +169,7 @@
- 고용노동(남) + 고용노동(여)
@@ -190,7 +190,7 @@
- 품앗이(남) + 품앗이(여)
@@ -211,7 +211,7 @@
- 일손돕기(남) + 일손돕기(여)
diff --git a/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html b/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html index 7462d3c1..dbc005e5 100644 --- a/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html +++ b/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html @@ -136,7 +136,7 @@ tbody.append(tmpl); } - // 은행자동이체내역 수출 테이블 그리기 + // 은행자동이체내역 지출 테이블 그리기 const gridBankExpenseTable = (data) => { const tbody = $('#table-bank-expense tbody'); tbody.empty();