From 3f9b74d1f6da2577d61b69d84eff280e9d212dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=9A=B0=EC=84=B1?= Date: Tue, 17 Jun 2025 20:13:45 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EB=8F=99=EC=9D=B4=EC=B2=B4=20-=20?= =?UTF-8?q?=EC=88=98=EC=9E=85=20=EC=99=84=EB=A3=8C=20(=ED=98=95=ED=83=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EC=95=84=EC=A7=81=20=ED=95=84=EC=9A=94?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/persistence/CreateBankDao.java | 51 ++++++++ .../persistence/CreateBankMapper.java | 9 ++ .../model/CreateForestProductDto.java | 43 +++++++ .../createBank/ports/CreateBankPortIn.java | 11 ++ .../createBank/ports/CreateBankPortOut.java | 11 ++ .../ports/application/CreateBankService.java | 24 ++++ .../ports/application/domain/CreateBank.java | 14 +++ .../application/domain/CreateBankCmd.java | 33 ++++++ .../adapters/persistence/GetBanksDao.java | 57 +++++++++ .../adapters/persistence/GetBanksMapper.java | 17 +++ .../persistence/model/GetBanksDto.java | 41 +++++++ .../bank/getBanks/ports/GetBanksPortIn.java | 12 ++ .../bank/getBanks/ports/GetBanksPortOut.java | 12 ++ .../ports/application/GetBanksService.java | 23 ++++ .../ports/application/domain/GetBanks.java | 41 +++++++ .../ports/application/domain/GetBanksCmd.java | 16 +++ .../adapters/persistence/RemoveBanksDao.java | 26 ++++ .../persistence/RemoveBanksMapper.java | 9 ++ .../persistence/model/RemoveBanksDto.java | 20 ++++ .../removeBanks/ports/RemoveBanksPortIn.java | 7 ++ .../removeBanks/ports/RemoveBanksPortOut.java | 7 ++ .../ports/application/RemoveBanksService.java | 19 +++ .../application/domain/RemoveBanksCmd.java | 17 +++ .../web/CreateBankInputController.java | 112 ++++++++++++++++++ .../web/GetBankInputUIController.java | 32 ++++- .../model/CreateBankInputProductReqVO.java | 31 +++++ .../web/model/CreateBankInputReqVO.java | 29 +++++ .../RemoveMonthForestProductsDao.java | 2 +- .../model/RemoveMonthForestProductsParam.java | 2 +- .../domain/RemoveMonthForestProductsCmd.java | 2 +- .../mappers/bank/CreateBankMapper.xml | 57 +++++++++ .../resources/mappers/bank/GetBanksMapper.xml | 67 +++++++++++ .../mappers/bank/RemoveBanksMapper.xml | 16 +++ .../product/CreateForestProductMapper.xml | 2 +- .../RemoveMonthForestProductsMapper.xml | 2 +- .../resources/templates/info/bank/input.html | 71 +++++++---- .../templates/info/bank/inputForm.html | 3 +- 37 files changed, 920 insertions(+), 28 deletions(-) create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankMapper.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortIn.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortOut.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/CreateBankService.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBank.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksMapper.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortIn.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortOut.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/GetBanksService.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksDao.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksMapper.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/model/RemoveBanksDto.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortIn.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortOut.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/RemoveBanksService.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/domain/RemoveBanksCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java create mode 100644 front/src/main/resources/mappers/bank/CreateBankMapper.xml create mode 100644 front/src/main/resources/mappers/bank/GetBanksMapper.xml create mode 100644 front/src/main/resources/mappers/bank/RemoveBanksMapper.xml diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java new file mode 100644 index 00000000..b13c8fb6 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java @@ -0,0 +1,51 @@ +package app.module.front.usecase.info.bank.createBank.adapters.persistence; + +import app.module.front.usecase.info.bank.createBank.adapters.persistence.model.CreateForestProductDto; +import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortOut; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +@Repository +@RequiredArgsConstructor +class CreateBankDao implements CreateBankPortOut { + + private final CreateBankMapper mapper; + + @Override + @Transactional + public Optional operate(CreateBankCmd cmd) { + + + CreateForestProductDto dto = + new CreateForestProductDto( + null, + cmd.getHouseholdSeq(), + cmd.getTransferType(), + cmd.getCropCode(), + cmd.getTransferCategoryCode(), + cmd.getTransferCategory(), + cmd.getIncomeCode(), + cmd.getExpenseCode(), + cmd.getSourcePurpose(), + cmd.getCount(), + cmd.getUnitCode(), + cmd.getPrice(), + cmd.getMonth(), + cmd.getMonthlyInputStatusId(), + cmd.getCreatedAt(), + cmd.getCreatedBy(), + cmd.getUpdatedAt(), + cmd.getUpdatedBy() + ); + + mapper.createBank(dto); + + + return Optional.of(new CreateBank(dto.getId())); + } +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankMapper.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankMapper.java new file mode 100644 index 00000000..1b5087ae --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankMapper.java @@ -0,0 +1,9 @@ +package app.module.front.usecase.info.bank.createBank.adapters.persistence; + +import app.module.front.usecase.info.bank.createBank.adapters.persistence.model.CreateForestProductDto; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CreateBankMapper { + void createBank(CreateForestProductDto dto); +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java new file mode 100644 index 00000000..11f4bd93 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java @@ -0,0 +1,43 @@ +package app.module.front.usecase.info.bank.createBank.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class CreateForestProductDto { + + private Long id; + private Long householdSeq; + + private String transferType; + + private String cropCode; + private String transferCategoryCode; + private String transferCategory; + + private String incomeCode; + private String expenseCode; + + private String sourcePurpose; + + private Integer count; + private String unitCode; + private Integer price; + private String month; + + private Long monthlyInputStatusId; + + + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortIn.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortIn.java new file mode 100644 index 00000000..87e94452 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortIn.java @@ -0,0 +1,11 @@ +package app.module.front.usecase.info.bank.createBank.ports; + +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd; + +import java.util.Optional; + +public interface CreateBankPortIn { + + Optional operate(CreateBankCmd command); +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortOut.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortOut.java new file mode 100644 index 00000000..a4347bd2 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortOut.java @@ -0,0 +1,11 @@ +package app.module.front.usecase.info.bank.createBank.ports; + +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd; + +import java.util.Optional; + +public interface CreateBankPortOut { + + Optional operate(CreateBankCmd command); +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/CreateBankService.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/CreateBankService.java new file mode 100644 index 00000000..18e4e463 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/CreateBankService.java @@ -0,0 +1,24 @@ +package app.module.front.usecase.info.bank.createBank.ports.application; + +import app.module.core.config.application.annotation.CreateCommand; +import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortIn; +import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortOut; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +class CreateBankService implements CreateBankPortIn { + + private final CreateBankPortOut portOut; + + @Override + @CreateCommand + public Optional operate(CreateBankCmd command) { + return portOut.operate(command); + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBank.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBank.java new file mode 100644 index 00000000..cfee695b --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBank.java @@ -0,0 +1,14 @@ +package app.module.front.usecase.info.bank.createBank.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateBank { + private Long id; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java new file mode 100644 index 00000000..048fa4e2 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java @@ -0,0 +1,33 @@ +package app.module.front.usecase.info.bank.createBank.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 +@EqualsAndHashCode +public class CreateBankCmd extends AuditCommand { + private Long householdSeq; + private String transferType; + + private String cropCode; + private String transferCategoryCode; + private String transferCategory; + + private String incomeCode; + private String expenseCode; + + private String sourcePurpose; + + private Integer count; + private String unitCode; + private Integer price; + private String month; + + private Long monthlyInputStatusId; + +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java new file mode 100644 index 00000000..c8df24a7 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java @@ -0,0 +1,57 @@ +package app.module.front.usecase.info.bank.getBanks.adapters.persistence; + +import app.module.front.usecase.info.bank.getBanks.adapters.persistence.model.GetBanksDto; +import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortOut; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; +import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.ListUtils; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.stream.Collectors; + +@Repository +@RequiredArgsConstructor +class GetBanksDao implements GetBanksPortOut { + + private final GetBanksMapper mapper; + + @Override + public Page operate(Pageable pageable, GetBanksCmd command) { + // 게시물 목록 얻기 + List contents = + ListUtils.emptyIfNull(mapper.getBanks(pageable, command)); + + return new PageImpl<>( + contents.stream() + .map( + article -> + new GetBanks( + article.getId(), + article.getHouseholdSeq(), + article.getTransferType(), + article.getCropCode(), + article.getTransferCategoryCode(), + article.getTransferCategory(), + article.getIncomeCode(), + article.getExpenseCode(), + article.getSourcePurpose(), + article.getCount(), + article.getUnitCode(), + article.getPrice(), + article.getMonth(), + article.getMonthlyInputStatusId(), + article.getCreatedAt(), + article.getCreatedBy(), + article.getUpdatedAt(), + article.getUpdatedBy())) + .collect(Collectors.toList()), + pageable, + contents.isEmpty() ? 0 : contents.get(0).getTotal()); + } + +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksMapper.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksMapper.java new file mode 100644 index 00000000..60e629d4 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksMapper.java @@ -0,0 +1,17 @@ +package app.module.front.usecase.info.bank.getBanks.adapters.persistence; + +import app.module.front.usecase.info.bank.getBanks.adapters.persistence.model.GetBanksDto; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +@Mapper +public interface GetBanksMapper { + List getBanks( + @Param("pageable") Pageable pageable, @Param("cmd") GetBanksCmd cmd); + + +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java new file mode 100644 index 00000000..8ea9f471 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java @@ -0,0 +1,41 @@ +package app.module.front.usecase.info.bank.getBanks.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +public class GetBanksDto { + + private Long id; + private Long householdSeq; + + private String transferType; + + private String cropCode; + private String transferCategoryCode; + private String transferCategory; + + private String incomeCode; + private String expenseCode; + + private String sourcePurpose; + + private Integer count; + private String unitCode; + private Integer price; + private String month; + + private Long monthlyInputStatusId; + + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; + + private Long total; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortIn.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortIn.java new file mode 100644 index 00000000..ed2c3d81 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortIn.java @@ -0,0 +1,12 @@ +package app.module.front.usecase.info.bank.getBanks.ports; + +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface GetBanksPortIn { + + Page operate(Pageable pageable, GetBanksCmd command); + +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortOut.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortOut.java new file mode 100644 index 00000000..06032003 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortOut.java @@ -0,0 +1,12 @@ +package app.module.front.usecase.info.bank.getBanks.ports; + +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface GetBanksPortOut { + + Page operate(Pageable pageable, GetBanksCmd command); + +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/GetBanksService.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/GetBanksService.java new file mode 100644 index 00000000..74a07b28 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/GetBanksService.java @@ -0,0 +1,23 @@ +package app.module.front.usecase.info.bank.getBanks.ports.application; + +import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortIn; +import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortOut; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetBanksService implements GetBanksPortIn { + + private final GetBanksPortOut portOut; + + @Override + public Page operate(Pageable pageable, GetBanksCmd command) { + return portOut.operate(pageable, command); + } + +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java new file mode 100644 index 00000000..7d28cec1 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java @@ -0,0 +1,41 @@ +package app.module.front.usecase.info.bank.getBanks.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBanks { + + private Long id; + private Long householdSeq; + + private String transferType; + + private String cropCode; + private String transferCategoryCode; + private String transferCategory; + + private String incomeCode; + private String expenseCode; + + private String sourcePurpose; + + private Integer count; + private String unitCode; + private Integer price; + private String month; + + private Long monthlyInputStatusId; + + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java new file mode 100644 index 00000000..ed9ad650 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java @@ -0,0 +1,16 @@ +package app.module.front.usecase.info.bank.getBanks.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBanksCmd { + + private Long monthlyInputStatusId; + private Long householdSeq; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksDao.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksDao.java new file mode 100644 index 00000000..1f4d1edd --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksDao.java @@ -0,0 +1,26 @@ +package app.module.front.usecase.info.bank.removeBanks.adapters.persistence; + +import app.module.core.config.application.util.CommonUtil; +import app.module.front.usecase.info.bank.removeBanks.adapters.persistence.model.RemoveBanksDto; +import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortOut; +import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.time.LocalDateTime; + +@Repository +@RequiredArgsConstructor +class RemoveBanksDao implements RemoveBanksPortOut { + + private final RemoveBanksMapper mapper; + + @Override + public void operate(RemoveBanksCmd command) { + String loginUser = CommonUtil.getLoginUsername();; + LocalDateTime now = LocalDateTime.now(); + + mapper.deleteBanks( + new RemoveBanksDto(command.getMonthlyInputStatusId(), command.getHouseholdSeq(), command.getTransferType(), now, loginUser, now, loginUser)); + } +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksMapper.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksMapper.java new file mode 100644 index 00000000..8bcf3faf --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksMapper.java @@ -0,0 +1,9 @@ +package app.module.front.usecase.info.bank.removeBanks.adapters.persistence; + +import app.module.front.usecase.info.bank.removeBanks.adapters.persistence.model.RemoveBanksDto; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RemoveBanksMapper { + void deleteBanks(RemoveBanksDto param); +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/model/RemoveBanksDto.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/model/RemoveBanksDto.java new file mode 100644 index 00000000..092ba512 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/model/RemoveBanksDto.java @@ -0,0 +1,20 @@ +package app.module.front.usecase.info.bank.removeBanks.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +public class RemoveBanksDto { + private Long monthlyInputStatusId; + private Long householdSeq; + private String transferType; + private LocalDateTime updatedAt; + private String updatedBy; + private LocalDateTime deletedAt; + private String deletedBy; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortIn.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortIn.java new file mode 100644 index 00000000..522f6a59 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortIn.java @@ -0,0 +1,7 @@ +package app.module.front.usecase.info.bank.removeBanks.ports; + +import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd; + +public interface RemoveBanksPortIn { + void operate(RemoveBanksCmd command); +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortOut.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortOut.java new file mode 100644 index 00000000..80999619 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortOut.java @@ -0,0 +1,7 @@ +package app.module.front.usecase.info.bank.removeBanks.ports; + +import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd; + +public interface RemoveBanksPortOut { + void operate(RemoveBanksCmd command); +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/RemoveBanksService.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/RemoveBanksService.java new file mode 100644 index 00000000..63ef4bb8 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/RemoveBanksService.java @@ -0,0 +1,19 @@ +package app.module.front.usecase.info.bank.removeBanks.ports.application; + +import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortIn; +import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortOut; +import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class RemoveBanksService implements RemoveBanksPortIn { + + private final RemoveBanksPortOut portOut; + + @Override + public void operate(RemoveBanksCmd command) { + portOut.operate(command); + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/domain/RemoveBanksCmd.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/domain/RemoveBanksCmd.java new file mode 100644 index 00000000..026724bb --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/domain/RemoveBanksCmd.java @@ -0,0 +1,17 @@ +package app.module.front.usecase.info.bank.removeBanks.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveBanksCmd { + private Long monthlyInputStatusId; + private Long householdSeq; + + private String transferType; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java new file mode 100644 index 00000000..680fd404 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java @@ -0,0 +1,112 @@ +package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web; + +import app.module.core.config.application.enums.MonthStatus; +import app.module.core.config.application.util.CoreUtil; +import app.module.core.usecase.uicode.view.ports.UICodeViewPortIn; +import app.module.core.usecase.uicode.view.ports.application.domain.UICodeView; +import app.module.front.config.application.response.ApiResponse; +import app.module.front.config.application.util.AuthUtil; +import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortIn; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd; +import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortIn; +import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd; +import app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model.CreateBankInputProductReqVO; +import app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model.CreateBankInputReqVO; +import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; +import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; +import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; +import app.module.front.usecase.info.monthly.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortIn; +import app.module.front.usecase.info.monthly.updateMonthlyInputStatus.ports.application.domain.UpdateMonthlyInputStatusCmd; +import app.module.front.usecase.info.monthlyProduct.createForestProduct.ports.CreateForestProductPortIn; +import app.module.front.usecase.info.monthlyProduct.createForestProduct.ports.application.domain.CreateForestProductCmd; +import app.module.front.usecase.info.monthlyProduct.removeMonthForestProducts.ports.RemoveMonthForestProductsPortIn; +import app.module.front.usecase.info.monthlyProduct.removeMonthForestProducts.ports.application.domain.RemoveMonthForestProductsCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Controller +@RequiredArgsConstructor +class CreateBankInputController { + + + private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn; + private final CreateBankPortIn createBankPortIn; + private final UpdateMonthlyInputStatusPortIn updateMonthlyInputStatusPortIn; + + private final RemoveBanksPortIn removeBanksPortIn; + + private final CoreUtil coreUtil; + private final UICodeViewPortIn uiCodeViewPortIn; + + @PostMapping(path = "/api/front/info/bank/create") + ResponseEntity operate(@RequestBody @Valid CreateBankInputReqVO reqVO, BindingResult bindingResult){ + if (bindingResult.hasErrors()) { + return coreUtil.getErrorInfo(bindingResult); + } + + + GetMonthlyInputStatus currentMonthlyInfo = + getMonthlyInputStatusPortIn.operate( + new GetMonthlyInputStatusCmd( + reqVO.getId(), AuthUtil.getUserSeq())).orElse(null); + + + + if(currentMonthlyInfo!=null) { + //TODO 트렌젝션 고려 + removeBanksPortIn.operate(new RemoveBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq(), "code.bank.input")); + + if (!reqVO.getStatus() && reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님. + for (CreateBankInputProductReqVO item : reqVO.getBankList()) { + + UICodeView code = uiCodeViewPortIn.connect(item.getTransferCategoryCode()).orElse(null); + if(code != null) { + createBankPortIn.operate(new CreateBankCmd( + AuthUtil.getUserSeq(), + "code.bank.input", + item.getCropCode(), + item.getTransferCategoryCode(), + item.getTransferCategory(), + code.getCodeType().equals("INPUT") ? code.getCodeValue() : null, + code.getCodeType().equals("OUTPUT") ?code.getCodeValue() : null, + item.getSourcePurpose(), + item.getCount(), + item.getUnitCode(), + item.getPrice(), + currentMonthlyInfo.getMonth(), + currentMonthlyInfo.getId() + )); + } + } + + updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd( + currentMonthlyInfo.getId(), + AuthUtil.getUserSeq(), + currentMonthlyInfo.getMonth(), + currentMonthlyInfo.getBankAutoTransferInputStatus(), + MonthStatus.REGISTERED, + currentMonthlyInfo.getBankAutoTransferOutputStatus() + )); + } else { + updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd( + currentMonthlyInfo.getId(), + AuthUtil.getUserSeq(), + currentMonthlyInfo.getMonth(), + currentMonthlyInfo.getBankAutoTransferInputStatus(), + MonthStatus.NOTHING, + currentMonthlyInfo.getBankAutoTransferOutputStatus() + )); + } + return ResponseEntity.ok(ApiResponse.success(null)); + } else { + return ResponseEntity.ok(ApiResponse.failure(null)); + } + + + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java index a93297f1..022feaf6 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java @@ -3,13 +3,19 @@ package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web; import app.module.core.config.application.enums.MonthStatus; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.config.application.util.AuthUtil; +import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortIn; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.GetPrevMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatus; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatusCmd; +import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProducts; +import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProductsCmd; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; @@ -29,13 +35,14 @@ class GetBankInputUIController { private final GetPrevMonthlyInputStatusPortIn prevMonthlyInputStatusPortIn; private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn; - + private final GetBanksPortIn getBanksPortIn; private final UICodeListPortIn uiCodeListPortIn; @GetMapping(path = "/info/bank/create/input/{id}") public String operate(Model model, - @PathVariable Long id) { + @PathVariable Long id + ,@PageableDefault(sort = "createAt", direction = Sort.Direction.DESC, page = 0, size = 100) Pageable pageable) { String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")); @@ -54,6 +61,22 @@ class GetBankInputUIController { new GetMonthlyInputStatusCmd( id, AuthUtil.getUserSeq())).orElse(null); + + Page pastList = Page.empty(); + if (pastMonthlyInfo != null) { + pastList = getBanksPortIn.operate( + pageable, + new GetBanksCmd(pastMonthlyInfo.getId(), AuthUtil.getUserSeq())); + } + + Page currentList = Page.empty(); + if (currentMonthlyInfo != null) { + currentList = getBanksPortIn.operate( + pageable, + new GetBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq())); + } + + //수정 가능 여부 판단 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth(), formatter); @@ -66,6 +89,11 @@ class GetBankInputUIController { model.addAttribute("pastMonthlyInfo", pastMonthlyInfo); model.addAttribute("currentMonthlyInfo", currentMonthlyInfo); + + model.addAttribute("pastBankList", pastList); + model.addAttribute("bankList", currentList); + + model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java new file mode 100644 index 00000000..bd2dcf54 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java @@ -0,0 +1,31 @@ +package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model; + +import lombok.*; + +import java.math.BigDecimal; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class CreateBankInputProductReqVO { + + private Long id; + private String transferType; + + private String cropCode; + private String transferCategoryCode; + private String transferCategory; + + private String incomeCode; + private String expenseCode; + + private String sourcePurpose; + + private Integer count; + private String unitCode; + private Integer price; + + +} diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java new file mode 100644 index 00000000..df640af8 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java @@ -0,0 +1,29 @@ +package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model; + +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class CreateBankInputReqVO { + + + private Boolean status; + private Long id; + private List bankList; + + public List getBankList() { + return bankList != null ? bankList : new ArrayList<>(); + } + + public void setBankList(List bankList) { + this.bankList = bankList; + } + + +} diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/RemoveMonthForestProductsDao.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/RemoveMonthForestProductsDao.java index 4c128c38..71ae7e38 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/RemoveMonthForestProductsDao.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/RemoveMonthForestProductsDao.java @@ -21,6 +21,6 @@ class RemoveMonthForestProductsDao implements RemoveMonthForestProductsPortOut { LocalDateTime now = LocalDateTime.now(); mapper.deleteForestProducts( - new RemoveMonthForestProductsParam(command.getId(), command.getHouseholdSeq(), now, loginUser, now, loginUser)); + new RemoveMonthForestProductsParam(command.getMonthlyInputStatusId(), command.getHouseholdSeq(), now, loginUser, now, loginUser)); } } diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/model/RemoveMonthForestProductsParam.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/model/RemoveMonthForestProductsParam.java index 24adb835..bb0c2129 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/model/RemoveMonthForestProductsParam.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/model/RemoveMonthForestProductsParam.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Setter @AllArgsConstructor public class RemoveMonthForestProductsParam { - private Long id; + private Long monthlyInputStatusId; private Long householdSeq; private LocalDateTime updatedAt; private String updatedBy; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/ports/application/domain/RemoveMonthForestProductsCmd.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/ports/application/domain/RemoveMonthForestProductsCmd.java index 97211788..42d6c25c 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/ports/application/domain/RemoveMonthForestProductsCmd.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/ports/application/domain/RemoveMonthForestProductsCmd.java @@ -10,6 +10,6 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class RemoveMonthForestProductsCmd { - private Long id; + private Long monthlyInputStatusId; private Long householdSeq; } diff --git a/front/src/main/resources/mappers/bank/CreateBankMapper.xml b/front/src/main/resources/mappers/bank/CreateBankMapper.xml new file mode 100644 index 00000000..62f87f4d --- /dev/null +++ b/front/src/main/resources/mappers/bank/CreateBankMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + SELECT nextval('bank_auto_transfer_seq') + + + INSERT INTO bank_auto_transfer ( + id, + household_seq, + transfer_type, + crop_code, + transfer_category_code, + transfer_category, + income_code, + expense_code, + source_purpose, + count, + unit_code, + price, + month, + monthly_input_status_id, + created_at, + created_by, + updated_at, + updated_by, + is_deleted + ) VALUES ( + #{id}, + #{householdSeq}, + #{transferType}, + #{cropCode}, + #{transferCategoryCode}, + #{transferCategory}, + #{incomeCode}, + #{expenseCode}, + #{sourcePurpose}, + #{count}, + #{unitCode}, + #{price}, + #{month}, + #{monthlyInputStatusId}, + #{createdAt}, + #{createdBy}, + #{createdAt}, + #{createdBy}, + false + ) + + + + \ No newline at end of file diff --git a/front/src/main/resources/mappers/bank/GetBanksMapper.xml b/front/src/main/resources/mappers/bank/GetBanksMapper.xml new file mode 100644 index 00000000..06873d5a --- /dev/null +++ b/front/src/main/resources/mappers/bank/GetBanksMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/front/src/main/resources/mappers/bank/RemoveBanksMapper.xml b/front/src/main/resources/mappers/bank/RemoveBanksMapper.xml new file mode 100644 index 00000000..b0149009 --- /dev/null +++ b/front/src/main/resources/mappers/bank/RemoveBanksMapper.xml @@ -0,0 +1,16 @@ + + + + + UPDATE bank_auto_transfer + SET + WHERE + household_seq = #{householdSeq} + AND monthly_input_status_id = #{monthlyInputStatusId} + AND transfer_type = #{transferType} + + + + \ No newline at end of file diff --git a/front/src/main/resources/mappers/product/CreateForestProductMapper.xml b/front/src/main/resources/mappers/product/CreateForestProductMapper.xml index a21fed76..b7039c13 100644 --- a/front/src/main/resources/mappers/product/CreateForestProductMapper.xml +++ b/front/src/main/resources/mappers/product/CreateForestProductMapper.xml @@ -7,7 +7,7 @@ - SELECT nextval('notice_seq') + SELECT nextval('monthly_input_status_seq') INSERT INTO forest_product ( diff --git a/front/src/main/resources/mappers/product/RemoveMonthForestProductsMapper.xml b/front/src/main/resources/mappers/product/RemoveMonthForestProductsMapper.xml index 553ccd6f..aca44673 100644 --- a/front/src/main/resources/mappers/product/RemoveMonthForestProductsMapper.xml +++ b/front/src/main/resources/mappers/product/RemoveMonthForestProductsMapper.xml @@ -9,7 +9,7 @@ SET WHERE household_seq = #{householdSeq} - AND monthly_input_status_id = #{id} + AND monthly_input_status_id = #{monthlyInputStatusId} diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index dd963b61..28417a0b 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -53,7 +53,7 @@
-
@@ -97,7 +97,7 @@ -
+"/api/front/info/bank/create"