From 9cb33c4ba1bc65ee92e949c5d1082bee983eddc3 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Tue, 1 Jul 2025 17:57:39 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9=20-?= =?UTF-8?q?=20=EC=9D=80=ED=96=89=EC=9E=90=EB=8F=99=EC=9D=B4=EC=B2=B4?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EC=9E=91=EC=97=85=20=EC=A4=91=20(1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/GetHouseholdStatusUIController.java | 5 +- .../persistence/GetMonthlyInputStatusDao.java | 17 + .../GetMonthlyInputStatusMapper.java | 8 + .../ports/GetMonthlyInputStatusPortIn.java | 9 + .../ports/GetMonthlyInputStatusPortOut.java | 9 + .../GetMonthlyInputStatusService.java | 20 + .../domain/GetMonthlyInputStatus.java | 19 + .../domain/GetMonthlyInputStatusCmd.java | 15 + .../UpdateMonthlyInputStatusMapper.java | 1 + .../GetBankAutoTransferIncomeDao.java | 19 + .../GetBankAutoTransferIncomeMapper.java | 11 + .../GetBankAutoTransferIncomeController.java | 22 ++ .../model/GetBankAutoTransferIncomeReqVO.java | 13 + .../model/GetBankAutoTransferIncomeResVO.java | 13 + .../GetBankAutoTransferIncomePortIn.java | 9 + .../GetBankAutoTransferIncomePortOut.java | 9 + .../GetBankAutoTransferIncomeService.java | 20 + .../domain/GetBankAutoTransferIncome.java | 24 ++ .../domain/GetBankAutoTransferIncomeCmd.java | 14 + .../SaveBankAutoTransferIncomeDao.java | 40 ++ .../SaveBankAutoTransferIncomeMapper.java | 10 + .../SaveBankAutoTransferIncomeController.java | 34 ++ .../SaveBankAutoTransferIncomeReqVO.java | 26 ++ .../SaveBankAutoTransferIncomeResVO.java | 14 + .../SaveBankAutoTransferIncomeValidator.java | 40 ++ .../SaveBankAutoTransferIncomePortIn.java | 7 + .../SaveBankAutoTransferIncomePortOut.java | 7 + .../SaveBankAutoTransferIncomeService.java | 48 +++ .../SaveBankAutoTransferIncomeInCmd.java | 26 ++ .../SaveBankAutoTransferIncomeOutCmd.java | 30 ++ .../GetBankAutoTransferIncomeMapper.xml | 25 ++ .../household/GetMonthlyInputStatusMapper.xml | 20 + .../SaveBankAutoTransferIncomeMapper.xml | 64 +++ .../UpdateMonthlyInputStatusMapper.xml | 9 + admin/src/main/resources/static/ui/uiUtil.js | 10 +- .../modal-bank-auto-transfer-income.html | 368 ++++++++++++++++++ .../households/tab/bank-auto-transfer.html | 4 +- .../resources/templates/households/{seq}.html | 19 + 38 files changed, 1054 insertions(+), 4 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/GetMonthlyInputStatusService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatus.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatusCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/GetBankAutoTransferIncomeController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/model/GetBankAutoTransferIncomeReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/model/GetBankAutoTransferIncomeResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/GetBankAutoTransferIncomeService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncome.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncomeCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/SaveBankAutoTransferIncomeController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/SaveBankAutoTransferIncomePortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/SaveBankAutoTransferIncomePortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeInCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeOutCmd.java create mode 100644 admin/src/main/resources/mappers/household/GetBankAutoTransferIncomeMapper.xml create mode 100644 admin/src/main/resources/mappers/household/GetMonthlyInputStatusMapper.xml create mode 100644 admin/src/main/resources/mappers/household/SaveBankAutoTransferIncomeMapper.xml create mode 100644 admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-income.html diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java index 45b08fc1..dd1fcf48 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java @@ -32,12 +32,15 @@ class GetHouseholdStatusUIController { model.addAttribute("recordMonth", recordMonth); model.addAttribute("userRole", AdminUtil.getLoginUserRole()); - model.addAttribute("unitCodes", uiCodeListPortIn.connect("code.record.unit")); model.addAttribute("recordCrop", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit")); model.addAttribute("recordArea", uiCodeListPortIn.connect("code.record.area")); model.addAttribute("recordFarming", uiCodeListPortIn.connect("code.record.farming")); + model.addAttribute("countUnitCodes", uiCodeListPortIn.connect("code.count.unit")); + model.addAttribute("bankInputCodes", uiCodeListPortIn.connect("code.bank.input")); + model.addAttribute("bankOutputCodes", uiCodeListPortIn.connect("code.bank.output")); + // 임가 상세 정보 model.addAttribute("householdInfo", getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null)); diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusDao.java new file mode 100644 index 00000000..7684ba65 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusDao.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.adapters.persistence; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortOut; +import java.util.Optional; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetMonthlyInputStatusDao implements GetMonthlyInputStatusPortOut { + @Override + public Optional operate(GetMonthlyInputStatusCmd cmd) { + return Optional.empty(); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusMapper.java new file mode 100644 index 00000000..e3e8dce1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusMapper.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.adapters.persistence; + +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; + +public interface GetMonthlyInputStatusMapper { + GetMonthlyInputStatus getMonthlyInputStatus(GetMonthlyInputStatusCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortIn.java new file mode 100644 index 00000000..2598241e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; + +public interface GetMonthlyInputStatusPortIn { + Optional operate(GetMonthlyInputStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortOut.java new file mode 100644 index 00000000..5e80fc1d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; + +public interface GetMonthlyInputStatusPortOut { + Optional operate(GetMonthlyInputStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/GetMonthlyInputStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/GetMonthlyInputStatusService.java new file mode 100644 index 00000000..33292ee0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/GetMonthlyInputStatusService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortOut; +import java.util.Optional; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetMonthlyInputStatusService implements GetMonthlyInputStatusPortIn { + private final GetMonthlyInputStatusPortOut portOut; + + @Override + public Optional operate(GetMonthlyInputStatusCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatus.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatus.java new file mode 100644 index 00000000..105836c1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatus.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetMonthlyInputStatus { + private Long id; + private Long householdSeq; + private String month; + private String forestProductStatus; + private String bankAutoTransferInputStatus; + private String bankAutoTransferOutputStatus; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatusCmd.java new file mode 100644 index 00000000..8b2a1f07 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatusCmd.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetMonthlyInputStatusCmd { + private Long householdSeq; + private String recordMonth; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java index cdfc03d9..e64c9c32 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java @@ -6,4 +6,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UpdateMonthlyInputStatusMapper { void updateForestProductStatus(UpdateForestProductStatusCmd cmd); + void updateBankInputStatus(UpdateForestProductStatusCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeDao.java new file mode 100644 index 00000000..82bc2071 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.adapters.persistence; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.GetBankAutoTransferIncomePortOut; +import java.util.Optional; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetBankAutoTransferIncomeDao implements GetBankAutoTransferIncomePortOut { + private final GetBankAutoTransferIncomeMapper mapper; + + @Override + public Optional operate(GetBankAutoTransferIncomeCmd cmd) { + return mapper.getBankAutoTransferIncome(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeMapper.java new file mode 100644 index 00000000..179cab9a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.adapters.persistence; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetBankAutoTransferIncomeMapper { + Optional getBankAutoTransferIncome(GetBankAutoTransferIncomeCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/GetBankAutoTransferIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/GetBankAutoTransferIncomeController.java new file mode 100644 index 00000000..573512ce --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/GetBankAutoTransferIncomeController.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.adapters.web; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.GetBankAutoTransferIncomePortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +class GetBankAutoTransferIncomeController { + private final GetBankAutoTransferIncomePortIn portIn; + + @GetMapping(path = "/api/household/bankAutoTransferIncome/{id}") + ResponseEntity operate(@PathVariable Long id) { + return ResponseEntity.status(HttpStatus.OK) + .body(portIn.operate(new GetBankAutoTransferIncomeCmd(id)).orElse(null)); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/model/GetBankAutoTransferIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/model/GetBankAutoTransferIncomeReqVO.java new file mode 100644 index 00000000..b1c092f7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/model/GetBankAutoTransferIncomeReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferIncomeReqVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/model/GetBankAutoTransferIncomeResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/model/GetBankAutoTransferIncomeResVO.java new file mode 100644 index 00000000..8ba1db0a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/web/model/GetBankAutoTransferIncomeResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferIncomeResVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortIn.java new file mode 100644 index 00000000..f03ad002 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; + +public interface GetBankAutoTransferIncomePortIn { + Optional operate(GetBankAutoTransferIncomeCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortOut.java new file mode 100644 index 00000000..43c257b6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; + +public interface GetBankAutoTransferIncomePortOut { + Optional operate(GetBankAutoTransferIncomeCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/GetBankAutoTransferIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/GetBankAutoTransferIncomeService.java new file mode 100644 index 00000000..6d6d64b2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/GetBankAutoTransferIncomeService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.GetBankAutoTransferIncomePortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.GetBankAutoTransferIncomePortOut; +import java.util.Optional; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetBankAutoTransferIncomeService implements GetBankAutoTransferIncomePortIn { + private final GetBankAutoTransferIncomePortOut portOut; + + @Override + public Optional operate(GetBankAutoTransferIncomeCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncome.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncome.java new file mode 100644 index 00000000..928b982c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncome.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferIncome { + private Long id; + private Long householdSeq; + private String cropCode; + private String incomeCode; + private String expenseCode; + private String transferCategoryCode; + private String transferCategory; + private String count; + private String unitCode; + private String unit; + private Long price; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncomeCmd.java new file mode 100644 index 00000000..c00db585 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncomeCmd.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferIncomeCmd { + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeDao.java new file mode 100644 index 00000000..5f46cced --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeDao.java @@ -0,0 +1,40 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.persistence; + +import app.module.admin.config.application.enums.MonthlyInputStatusType; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence.UpdateMonthlyInputStatusMapper; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeOutCmd; +import app.module.core.config.adapters.persistence.component.AuditCommand; +import app.module.core.config.application.util.AuditUtil; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeInCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.SaveBankAutoTransferIncomePortOut; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +class SaveBankAutoTransferIncomeDao implements SaveBankAutoTransferIncomePortOut { + private final SaveBankAutoTransferIncomeMapper saveBankAutoTransferIncomeMapper; + private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper; + + @Override + @Transactional + public void operate(SaveBankAutoTransferIncomeOutCmd outCmd) { + if (outCmd.getBankAutoTransferId() == null) { + // 등록 상태가 "REGISTERED"가 아닐 경우 "REGISTERED"로 update + if(!MonthlyInputStatusType.REGISTERED.name().equals(outCmd.getBankAutoTransferInputStatus())) { + updateMonthlyInputStatusMapper.updateBankInputStatus( + new UpdateForestProductStatusCmd( + outCmd.getMonthlyInputStatusId(), + MonthlyInputStatusType.REGISTERED.name())); + } + + // 은행자동이체(수입) 등록 + saveBankAutoTransferIncomeMapper.createBankAutoTransferIncome(AuditUtil.create(outCmd)); + } else { + // 은행자동이체(수입) update + saveBankAutoTransferIncomeMapper.updateBankAutoTransferIncome(AuditUtil.update(outCmd)); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeMapper.java new file mode 100644 index 00000000..d151792f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeMapper.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.persistence; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeOutCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveBankAutoTransferIncomeMapper { + void createBankAutoTransferIncome(SaveBankAutoTransferIncomeOutCmd cmd); + void updateBankAutoTransferIncome(SaveBankAutoTransferIncomeOutCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/SaveBankAutoTransferIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/SaveBankAutoTransferIncomeController.java new file mode 100644 index 00000000..4a1e863d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/SaveBankAutoTransferIncomeController.java @@ -0,0 +1,34 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web; + +import app.module.core.config.application.util.MessageUtil; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.BindingResult; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.model.SaveBankAutoTransferIncomeReqVO; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.model.SaveBankAutoTransferIncomeResVO; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.validator.SaveBankAutoTransferIncomeValidator; + +@RestController +@RequiredArgsConstructor +class SaveBankAutoTransferIncomeController { + private final SaveBankAutoTransferIncomeValidator validator; + private final MessageUtil messageUtil; + + @PostMapping(path = "/api/household/bank/income/save") + ResponseEntity operate( + @Valid @RequestBody SaveBankAutoTransferIncomeReqVO reqVO, BindingResult bindingResult) { + validator.validate(reqVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + return ResponseEntity.status(HttpStatus.OK) + .body(new SaveBankAutoTransferIncomeResVO(messageUtil.getMessage("operation.common.save.done"))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeReqVO.java new file mode 100644 index 00000000..fea66726 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeReqVO.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.model; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class SaveBankAutoTransferIncomeReqVO { + private Long bankAutoTransferId; + private Long householdSeq; + private String recordMonth; + private String cropCode; + private String incomeCode; + private String expenseCode; + private String transferCategoryCode; + private String transferCategory; + private String sourcePurpose; + private String count; + private String unitCode; + private String unit; + private String price; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeResVO.java new file mode 100644 index 00000000..b277f64e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeResVO.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class SaveBankAutoTransferIncomeResVO { + private String message; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java new file mode 100644 index 00000000..2af7242c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java @@ -0,0 +1,40 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.validator; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.model.SaveBankAutoTransferIncomeReqVO; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +public class SaveBankAutoTransferIncomeValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return SaveBankAutoTransferIncomeReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveBankAutoTransferIncomeReqVO vo = (SaveBankAutoTransferIncomeReqVO) target; + + if(!StringUtils.hasText(vo.getTransferCategoryCode())) { + errors.rejectValue("transferCategoryCode", "error.transferCategoryCode", "수입의 종류를 선택해주세요."); + return; + } + + // 수입의 종류가 특정 코드가 아닐 때만 대상 체크 + if (!vo.getTransferCategoryCode().equals("code.bank.input.10") && + !vo.getTransferCategoryCode().equals("code.bank.input.12") && + !vo.getTransferCategoryCode().equals("code.bank.input.13") && + !StringUtils.hasText(vo.getTransferCategory())) { + errors.rejectValue("transferCategory", "error.transferCategory", "대상을 입력해주세요."); + return; + } + + // 현금 + if(!StringUtils.hasText(vo.getPrice())) { + errors.rejectValue("price", "error.price", "현금(원)을 입력해주세요."); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/SaveBankAutoTransferIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/SaveBankAutoTransferIncomePortIn.java new file mode 100644 index 00000000..0691a468 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/SaveBankAutoTransferIncomePortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeInCmd; + +public interface SaveBankAutoTransferIncomePortIn { + void operate(SaveBankAutoTransferIncomeInCmd inCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/SaveBankAutoTransferIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/SaveBankAutoTransferIncomePortOut.java new file mode 100644 index 00000000..67ecb558 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/SaveBankAutoTransferIncomePortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeOutCmd; + +public interface SaveBankAutoTransferIncomePortOut { + void operate(SaveBankAutoTransferIncomeOutCmd outCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java new file mode 100644 index 00000000..08ac26e2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java @@ -0,0 +1,48 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application; + +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeOutCmd; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeInCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.SaveBankAutoTransferIncomePortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.SaveBankAutoTransferIncomePortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class SaveBankAutoTransferIncomeService implements SaveBankAutoTransferIncomePortIn { + private final SaveBankAutoTransferIncomePortOut portOut; + private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn; + + @Override + public void operate(SaveBankAutoTransferIncomeInCmd inCmd) { + + // 월별 등록상태 조회 + GetMonthlyInputStatus monthlyInputStatus = + getMonthlyInputStatusPortIn + .operate(new GetMonthlyInputStatusCmd(inCmd.getHouseholdSeq(), inCmd.getRecordMonth())) + .orElse(null); + + portOut.operate(new SaveBankAutoTransferIncomeOutCmd( + inCmd.getBankAutoTransferId(), + inCmd.getHouseholdSeq(), + inCmd.getRecordMonth(), + inCmd.getCropCode(), + inCmd.getIncomeCode(), + inCmd.getExpenseCode(), + inCmd.getTransferCategoryCode(), + inCmd.getTransferCategory(), + inCmd.getSourcePurpose(), + inCmd.getCount(), + inCmd.getUnitCode(), + inCmd.getUnit(), + inCmd.getPrice(), + "code.bank.input", // 수입 type code + "1", // 수입 유형 1 + monthlyInputStatus.getId(), + monthlyInputStatus.getBankAutoTransferInputStatus() + )); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeInCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeInCmd.java new file mode 100644 index 00000000..2cf4d594 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeInCmd.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class SaveBankAutoTransferIncomeInCmd { + private Long bankAutoTransferId; + private Long householdSeq; + private String recordMonth; + private String cropCode; + private String incomeCode; + private String expenseCode; + private String transferCategoryCode; + private String transferCategory; + private String sourcePurpose; + private String count; + private String unitCode; + private String unit; + private String price; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeOutCmd.java new file mode 100644 index 00000000..126fc2f1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeOutCmd.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class SaveBankAutoTransferIncomeOutCmd extends AuditCommand { + private Long bankAutoTransferId; + private Long householdSeq; + private String recordMonth; + private String cropCode; + private String incomeCode; + private String expenseCode; + private String transferCategoryCode; + private String transferCategory; + private String sourcePurpose; + private String count; + private String unitCode; + private String unit; + private String price; + private String transferType; + private String category; + private Long monthlyInputStatusId; + private String bankAutoTransferInputStatus; +} diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferIncomeMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferIncomeMapper.xml new file mode 100644 index 00000000..0a71e3b1 --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferIncomeMapper.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetMonthlyInputStatusMapper.xml b/admin/src/main/resources/mappers/household/GetMonthlyInputStatusMapper.xml new file mode 100644 index 00000000..b042bc4f --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetMonthlyInputStatusMapper.xml @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/SaveBankAutoTransferIncomeMapper.xml b/admin/src/main/resources/mappers/household/SaveBankAutoTransferIncomeMapper.xml new file mode 100644 index 00000000..458d41e5 --- /dev/null +++ b/admin/src/main/resources/mappers/household/SaveBankAutoTransferIncomeMapper.xml @@ -0,0 +1,64 @@ + + + + + /* createBankAutoTransferIncome : 은행자동이체(수입) 등록 */ + INSERT INTO bank_auto_transfer + ( + household_seq, + month, + crop_code, + income_code, + expense_code, + transfer_category_code, + transfer_category, + source_purpose, + count, + unit_code, + unit, + price, + transfer_type, + monthly_input_status_id, + category, + + ) + VALUES + ( + #{householdSeq}, + #{recordMonth}, + #{cropCode}, + #{incomeCode}, + #{expenseCode}, + #{transferCategoryCode}, + #{transferCategory}, + #{sourcePurpose}, + #{count}, + #{unitCode}, + #{price}, + #{transferType}, + #{monthlyInputStatusId}, + #{category}, + + ) + + + + /* updateBankAutoTransferIncome : 은행자동이체(수입) 수정 */ + UPDATE bank_auto_transfer + SET + household_seq = #{householdSeq}, + crop_code = #{cropCode}, + income_code = #{incomeCode}, + expense_code = #{expenseCode}, + transfer_category_code = #{transferCategoryCode}, + transfer_category = #{transferCategory}, + source_purpose = #{sourcePurpose}, + count = #{count}, + unit_code = #{unitCode}, + price = #{price}, + + WHERE id = #{bankAutoTransferId} + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml b/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml index be531bf9..b1b08ea9 100644 --- a/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml @@ -11,4 +11,13 @@ WHERE is_deleted = false AND id = #{id} + + + /* updateBankInputStatus : 은행자동이체(수입) 입력상태 수정 */ + UPDATE monthly_input_status + SET bank_auto_transfer_input_status = #{status}, + + WHERE is_deleted = false + AND id = #{id} + \ No newline at end of file diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index 07f90d08..d22f126f 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -467,7 +467,15 @@ const formatNumberWithComma = (value) => { const limitMaxLength = (el) => { const maxLength = parseInt(el.getAttribute('maxlength'), 10); - el.value = el.value.replace(/\D/g, '').slice(0, maxLength); + let $el = $(el); + + if ($el.val().length > maxLength) { + $el.val(el.val().slice(0, $el.attr('maxlength'))); + } + + if ($el.attr('inputmode') === 'numeric') { + $el.val($el.val().replace('.', '')); + } } /** diff --git a/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-income.html b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-income.html new file mode 100644 index 00000000..1260a8a9 --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-income.html @@ -0,0 +1,368 @@ + + + +
+ +
+ + + + + + + + +
+ + + + + + + + +
+ \ No newline at end of file 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 2cf21b68..df7a2d3b 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 @@ -15,7 +15,7 @@ - @@ -123,7 +123,7 @@ ${ifNullHyphen(item.cropText)} - ${ifNullHyphen(item.categoryText)} + ${ifNullHyphen(item.categoryText)} ${ifNullHyphen(item.target)} ${ifNullHyphen(item.sourcePurpose)} ${ifNullHyphen(item.count)} diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index 9d4bd5ea..be8568c4 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -186,6 +186,9 @@ + + +
@@ -340,6 +343,22 @@ disableArea.classList.add('input-disabled'); } } + + // 직접입력 선택시 input 활성화 + const selectedSelf = (el) => { + const tr = el.closest('tr'); + const unitArea = tr.querySelector('.self-input'); + const unitInput = tr.querySelector('.self-input input'); + + if (el.value?.endsWith('.self')) { + unitInput.disabled = false; + unitArea.classList.remove('input-disabled'); + } else { + unitInput.disabled = true; + unitInput.value = ''; + unitArea.classList.add('input-disabled'); + } + }