diff --git a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatus.java b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatus.java index 7633010a..0313bf52 100644 --- a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatus.java +++ b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatus/ports/application/domain/GetMonthlyInputStatus.java @@ -6,7 +6,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter @@ -18,7 +17,8 @@ public class GetMonthlyInputStatus { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferStatus; + private MonthStatus bankAutoTransferOutputStatus; + private MonthStatus bankAutoTransferInputStatus; private LocalDateTime createdAt; private String createdBy; diff --git a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/adapters/persistence/GetMonthlyInputStatussDao.java b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/adapters/persistence/GetMonthlyInputStatussDao.java index cfd654a8..be1530d1 100644 --- a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/adapters/persistence/GetMonthlyInputStatussDao.java +++ b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/adapters/persistence/GetMonthlyInputStatussDao.java @@ -37,7 +37,8 @@ class GetMonthlyInputStatussDao implements GetMonthlyInputStatussPortOut { article.getHouseholdSeq(), article.getMonth(), article.getForestProductStatus(), - article.getBankAutoTransferStatus(), + article.getBankAutoTransferOutputStatus(), + article.getBankAutoTransferInputStatus(), article.getCreatedAt(), article.getCreatedBy(), article.getUpdatedAt(), diff --git a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/adapters/persistence/model/GetMonthlyInputStatussDto.java b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/adapters/persistence/model/GetMonthlyInputStatussDto.java index a4cf7db6..d22df2ca 100644 --- a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/adapters/persistence/model/GetMonthlyInputStatussDto.java +++ b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/adapters/persistence/model/GetMonthlyInputStatussDto.java @@ -5,7 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter @@ -17,7 +16,8 @@ public class GetMonthlyInputStatussDto { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferStatus; + private MonthStatus bankAutoTransferOutputStatus; + private MonthStatus bankAutoTransferInputStatus; private LocalDateTime createdAt; private String createdBy; diff --git a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatuss.java b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatuss.java index b48d5dae..98dc669d 100644 --- a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatuss.java +++ b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatuss.java @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter @@ -19,7 +18,8 @@ public class GetMonthlyInputStatuss { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferStatus; + private MonthStatus bankAutoTransferOutputStatus; + private MonthStatus bankAutoTransferInputStatus; private LocalDateTime createdAt; private String createdBy; diff --git a/core/src/main/java/app/module/core/usecase/monthly/getPrevMonthlyInputStatus/ports/application/domain/GetPrevMonthlyInputStatus.java b/core/src/main/java/app/module/core/usecase/monthly/getPrevMonthlyInputStatus/ports/application/domain/GetPrevMonthlyInputStatus.java index 9ef37973..b33c7188 100644 --- a/core/src/main/java/app/module/core/usecase/monthly/getPrevMonthlyInputStatus/ports/application/domain/GetPrevMonthlyInputStatus.java +++ b/core/src/main/java/app/module/core/usecase/monthly/getPrevMonthlyInputStatus/ports/application/domain/GetPrevMonthlyInputStatus.java @@ -17,7 +17,8 @@ public class GetPrevMonthlyInputStatus { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferStatus; + private MonthStatus bankAutoTransferOutputStatus; + private MonthStatus bankAutoTransferInputStatus; private LocalDateTime createdAt; private String createdBy; diff --git a/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java b/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java index bd20889a..0eca0489 100644 --- a/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java +++ b/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java @@ -23,7 +23,8 @@ class UpdateMonthlyInputStatusDao implements UpdateMonthlyInputStatusPortOut { command.getHouseholdSeq(), command.getMonth(), command.getForestProductStatus(), - command.getBankAutoTransferStatus(), + command.getBankAutoTransferOutputStatus(), + command.getBankAutoTransferInputStatus(), LocalDateTime.now(), CommonUtil.getLoginUsername() )); diff --git a/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/adapters/persistence/model/UpdateMonthlyInputStatusDto.java b/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/adapters/persistence/model/UpdateMonthlyInputStatusDto.java index 1b044487..2d01148d 100644 --- a/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/adapters/persistence/model/UpdateMonthlyInputStatusDto.java +++ b/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/adapters/persistence/model/UpdateMonthlyInputStatusDto.java @@ -6,7 +6,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter @@ -19,7 +18,8 @@ public class UpdateMonthlyInputStatusDto { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferStatus; + private MonthStatus bankAutoTransferOutputStatus; + private MonthStatus bankAutoTransferInputStatus; private LocalDateTime updatedAt; private String updatedBy; diff --git a/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/ports/application/domain/UpdateMonthlyInputStatusCmd.java b/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/ports/application/domain/UpdateMonthlyInputStatusCmd.java index c22c6cf5..9b48101d 100644 --- a/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/ports/application/domain/UpdateMonthlyInputStatusCmd.java +++ b/core/src/main/java/app/module/core/usecase/monthly/updateMonthlyInputStatus/ports/application/domain/UpdateMonthlyInputStatusCmd.java @@ -6,9 +6,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import java.math.BigDecimal; -import java.time.LocalDateTime; - @Getter @Setter @AllArgsConstructor @@ -19,7 +16,8 @@ public class UpdateMonthlyInputStatusCmd { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferStatus; + private MonthStatus bankAutoTransferOutputStatus; + private MonthStatus bankAutoTransferInputStatus; } diff --git a/core/src/main/resources/mappers/monthly/GetMonthlyInputStatusMapper.xml b/core/src/main/resources/mappers/monthly/GetMonthlyInputStatusMapper.xml index 364d1e4e..97a361fa 100644 --- a/core/src/main/resources/mappers/monthly/GetMonthlyInputStatusMapper.xml +++ b/core/src/main/resources/mappers/monthly/GetMonthlyInputStatusMapper.xml @@ -12,7 +12,8 @@ a.household_seq AS householdSeq, a.month AS month, a.forest_product_status AS forestProductStatus, - a.bank_auto_transfer_status AS bankAutoTransferStatus, + a.bank_auto_transfer_output_status AS bankAutoTransferOutputStatus, + a.bank_auto_transfer_input_status AS bankAutoTransferInputStatus, a.created_at AS createdAt, a.created_by AS createdBy, a.updated_at AS updatedAt, diff --git a/core/src/main/resources/mappers/monthly/GetMonthlyInputStatussMapper.xml b/core/src/main/resources/mappers/monthly/GetMonthlyInputStatussMapper.xml index 5c3439c6..0a9f911b 100644 --- a/core/src/main/resources/mappers/monthly/GetMonthlyInputStatussMapper.xml +++ b/core/src/main/resources/mappers/monthly/GetMonthlyInputStatussMapper.xml @@ -13,7 +13,8 @@ a.household_seq AS householdSeq, a.month AS month, a.forest_product_status AS forestProductStatus, - a.bank_auto_transfer_status AS bankAutoTransferStatus, + a.bank_auto_transfer_output_status AS bankAutoTransferOutputStatus, + a.bank_auto_transfer_input_status AS bankAutoTransferInputStatus, a.created_at AS createdAt, a.created_by AS createdBy, a.updated_at AS updatedAt, diff --git a/core/src/main/resources/mappers/monthly/GetPrevMonthlyInputStatusMapper.xml b/core/src/main/resources/mappers/monthly/GetPrevMonthlyInputStatusMapper.xml index ca128efd..1413a52a 100644 --- a/core/src/main/resources/mappers/monthly/GetPrevMonthlyInputStatusMapper.xml +++ b/core/src/main/resources/mappers/monthly/GetPrevMonthlyInputStatusMapper.xml @@ -12,7 +12,8 @@ a.household_seq AS householdSeq, a.month AS month, a.forest_product_status AS forestProductStatus, - a.bank_auto_transfer_status AS bankAutoTransferStatus, + a.bank_auto_transfer_output_status AS bankAutoTransferOutputStatus, + a.bank_auto_transfer_input_status AS bankAutoTransferInputStatus, a.created_at AS createdAt, a.created_by AS createdBy, a.updated_at AS updatedAt, diff --git a/core/src/main/resources/mappers/monthly/UpdateMonthlyInputStatusMapper.xml b/core/src/main/resources/mappers/monthly/UpdateMonthlyInputStatusMapper.xml index f6888690..e981912f 100644 --- a/core/src/main/resources/mappers/monthly/UpdateMonthlyInputStatusMapper.xml +++ b/core/src/main/resources/mappers/monthly/UpdateMonthlyInputStatusMapper.xml @@ -13,7 +13,8 @@ household_seq = #{householdSeq}, month = #{month}, forest_product_status = #{forestProductStatus}, - bank_auto_transfer_status = #{bankAutoTransferStatus}, + bank_auto_transfer_output_status = #{bankAutoTransferOutputStatus}, + bank_auto_transfer_input_status = #{bankAutoTransferInputStatus}, WHERE id = #{id} diff --git a/front/src/main/java/app/module/front/usecase/info/monthly/createMonthlyUI/adapters/web/CreateMonthlyController.java b/front/src/main/java/app/module/front/usecase/info/monthly/createMonthlyUI/adapters/web/CreateMonthlyController.java index 2cb0b940..dbc97a24 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthly/createMonthlyUI/adapters/web/CreateMonthlyController.java +++ b/front/src/main/java/app/module/front/usecase/info/monthly/createMonthlyUI/adapters/web/CreateMonthlyController.java @@ -1,44 +1,23 @@ package app.module.front.usecase.info.monthly.createMonthlyUI.adapters.web; import app.module.core.config.application.enums.MonthStatus; -import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.CoreUtil; -import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; -import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold; -import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; -import app.module.core.usecase.household.updateFrontHousehold.ports.UpdateFrontHouseholdPortIn; -import app.module.core.usecase.household.updateFrontHousehold.ports.application.domain.UpdateFrontHouseholdCmd; import app.module.core.usecase.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; import app.module.core.usecase.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; import app.module.core.usecase.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; -import app.module.core.usecase.monthly.getPrevMonthlyInputStatus.ports.GetPrevMonthlyInputStatusPortIn; -import app.module.core.usecase.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatus; -import app.module.core.usecase.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatusCmd; import app.module.core.usecase.monthly.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortIn; import app.module.core.usecase.monthly.updateMonthlyInputStatus.ports.application.domain.UpdateMonthlyInputStatusCmd; import app.module.core.usecase.product.createForestProduct.ports.CreateForestProductPortIn; import app.module.core.usecase.product.createForestProduct.ports.application.domain.CreateForestProductCmd; -import app.module.core.usecase.product.getMonthlyForestProducts.ports.GetMonthlyForestProductsPortIn; -import app.module.core.usecase.product.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProducts; -import app.module.core.usecase.product.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProductsCmd; -import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.config.application.response.ApiResponse; import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.info.monthly.createMonthlyUI.adapters.web.model.CreateMonthlyProductReqVO; import app.module.front.usecase.info.monthly.createMonthlyUI.adapters.web.model.CreateMonthlyReqVO; -import app.module.front.usecase.info.user.updateUserUI.adapters.web.model.UpdateUserReqVO; import jakarta.validation.Valid; 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; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -90,7 +69,8 @@ class CreateMonthlyController { AuthUtil.getUserSeq(), currentMonthlyInfo.getMonth(), MonthStatus.REGISTERED, - currentMonthlyInfo.getBankAutoTransferStatus() + currentMonthlyInfo.getBankAutoTransferOutputStatus(), + currentMonthlyInfo.getBankAutoTransferInputStatus() )); } else { updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd( @@ -98,7 +78,8 @@ class CreateMonthlyController { AuthUtil.getUserSeq(), currentMonthlyInfo.getMonth(), MonthStatus.NOTHING, - currentMonthlyInfo.getBankAutoTransferStatus() + currentMonthlyInfo.getBankAutoTransferOutputStatus(), + currentMonthlyInfo.getBankAutoTransferInputStatus() )); }