From 5d80d3ff32b3bfd19ce8891f35fd4032cae5e899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 8 Jul 2025 14:16:11 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=81=EC=88=98=EC=A6=9D=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EB=B0=8F=20=EC=9D=BC=EC=9D=BC=20=EA=B0=9C=EC=88=98?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/persistence/RemoveDailyDao.java | 2 + .../persistence/RemoveDailyMapper.java | 12 +++++ .../household/daily/RemoveDailyMapper.xml | 26 ++++++++++ .../adapters/persistence/DailyExpenseDao.java | 27 ++-------- .../persistence/DailyExpenseMapper.java | 10 ---- .../model/DailyExpenseTypeCount.java | 15 ------ .../adapters/persistence/DailyIncomeDao.java | 35 ++----------- .../persistence/DailyIncomeMapper.java | 8 --- .../model/DailyIncomeTypeCount.java | 15 ------ .../adapters/persistence/DailyReceiptDao.java | 7 +++ .../persistence/DailyReceiptMapper.java | 10 ++++ .../adapters/web/DailyReceiptController.java | 13 ++++- .../receipt/ports/DailyReceiptPortIn.java | 8 ++- .../receipt/ports/DailyReceiptPortOut.java | 8 +++ .../application/DailyReceiptService.java | 7 +++ .../mappers/daily/DailyExpenseMapper.xml | 24 +-------- .../mappers/daily/DailyIncomeMapper.xml | 27 +--------- .../mappers/daily/DailyReceiptMapper.xml | 8 +++ .../templates/record/income/form.html | 1 + .../templates/record/income/index.html | 52 +++++++++++++++---- 20 files changed, 152 insertions(+), 163 deletions(-) delete mode 100644 front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseTypeCount.java delete mode 100644 front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeTypeCount.java diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java index f4627b87..669da223 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java @@ -22,10 +22,12 @@ public class RemoveDailyDao implements RemoveDailyPortOut { if (DailySort.INCOME.equals(command.getCurrentStep())) { mapper.removeDailyIncome(command); + mapper.removeDailyIncomeReceipt(command); } else if (DailySort.WORK.equals(command.getCurrentStep())) { mapper.removeDailyWork(command); } else if (DailySort.EXPENSE.equals(command.getCurrentStep())) { mapper.removeDailyExpense(command); + mapper.removeDailyExpenseReceipt(command); } else if (DailySort.POWER.equals(command.getCurrentStep())) { mapper.removeDailyPower(command); } else if (DailySort.FORESTRY.equals(command.getCurrentStep())) { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyMapper.java index 5de04c22..2ad946f7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyMapper.java @@ -11,6 +11,12 @@ public interface RemoveDailyMapper { */ void removeDailyIncome(RemoveDailyCmd command); + /** + * 특정일의 수입 영수증 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyIncomeReceipt(RemoveDailyCmd command); + /** * 특정일의 임업노동 투입 전체 삭제 * @param command 검색 조건 @@ -23,6 +29,12 @@ public interface RemoveDailyMapper { */ void removeDailyExpense(RemoveDailyCmd command); + /** + * 특정일의 지출 영수증 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyExpenseReceipt(RemoveDailyCmd command); + /** * 동력 사용시간 전체 삭제 * @param command 검색 조건 diff --git a/admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml b/admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml index e829295d..66864718 100644 --- a/admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml +++ b/admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml @@ -14,6 +14,19 @@ + + + + - insert into daily_expense ( daily_record_seq, input_type, category, income_mark @@ -94,8 +73,9 @@ update receipt_has_record set where is_deleted = false + and type = 'EXPENSE' - and receipt_type_id = #{id} + and receipt_type_id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml index 58d777d5..2647a3b1 100644 --- a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml @@ -27,30 +27,6 @@ - - - - insert into daily_income ( daily_record_seq, input_type, category, expense_mark @@ -98,8 +74,9 @@ update receipt_has_record set where is_deleted = false + and type = 'INCOME' - and receipt_type_id = #{id} + and receipt_type_id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyReceiptMapper.xml b/front/src/main/resources/mappers/daily/DailyReceiptMapper.xml index e9c6bd80..2b50a9ea 100644 --- a/front/src/main/resources/mappers/daily/DailyReceiptMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyReceiptMapper.xml @@ -17,4 +17,12 @@ ) + + diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index 7db0fbb8..84d1590b 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -206,6 +206,7 @@