From 7d0cb85535a6f1017051085f826dd6a2df273a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=9A=B0=EC=84=B1?= Date: Mon, 16 Jun 2025 09:11:16 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"monthly=5Finput=5Fstatus=EC=9D=98=20b?= =?UTF-8?q?ank=5Fauto=5Ftransfer=5Fstatus=20=EC=9D=84=20=EB=91=90=EA=B0=9C?= =?UTF-8?q?=EB=A1=9C=20=EB=B6=84=EB=A6=AC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b5eaac82d559cf5ac56bb80bda0c3d3f57791d27. --- .../domain/GetMonthlyInputStatus.java | 4 +-- .../GetMonthlyInputStatussDao.java | 3 +-- .../model/GetMonthlyInputStatussDto.java | 4 +-- .../domain/GetMonthlyInputStatuss.java | 4 +-- .../domain/GetPrevMonthlyInputStatus.java | 3 +-- .../UpdateMonthlyInputStatusDao.java | 3 +-- .../model/UpdateMonthlyInputStatusDto.java | 4 +-- .../domain/UpdateMonthlyInputStatusCmd.java | 6 +++-- .../monthly/GetMonthlyInputStatusMapper.xml | 3 +-- .../monthly/GetMonthlyInputStatussMapper.xml | 3 +-- .../GetPrevMonthlyInputStatusMapper.xml | 3 +-- .../UpdateMonthlyInputStatusMapper.xml | 3 +-- .../adapters/web/CreateMonthlyController.java | 27 ++++++++++++++++--- 13 files changed, 42 insertions(+), 28 deletions(-) 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 0313bf52..7633010a 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,6 +6,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.math.BigDecimal; import java.time.LocalDateTime; @Getter @@ -17,8 +18,7 @@ public class GetMonthlyInputStatus { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferOutputStatus; - private MonthStatus bankAutoTransferInputStatus; + private MonthStatus bankAutoTransferStatus; 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 be1530d1..cfd654a8 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,8 +37,7 @@ class GetMonthlyInputStatussDao implements GetMonthlyInputStatussPortOut { article.getHouseholdSeq(), article.getMonth(), article.getForestProductStatus(), - article.getBankAutoTransferOutputStatus(), - article.getBankAutoTransferInputStatus(), + article.getBankAutoTransferStatus(), 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 d22df2ca..a4cf7db6 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,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.math.BigDecimal; import java.time.LocalDateTime; @Getter @@ -16,8 +17,7 @@ public class GetMonthlyInputStatussDto { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferOutputStatus; - private MonthStatus bankAutoTransferInputStatus; + private MonthStatus bankAutoTransferStatus; 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 98dc669d..b48d5dae 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,6 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.math.BigDecimal; import java.time.LocalDateTime; @Getter @@ -18,8 +19,7 @@ public class GetMonthlyInputStatuss { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferOutputStatus; - private MonthStatus bankAutoTransferInputStatus; + private MonthStatus bankAutoTransferStatus; 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 b33c7188..9ef37973 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,8 +17,7 @@ public class GetPrevMonthlyInputStatus { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferOutputStatus; - private MonthStatus bankAutoTransferInputStatus; + private MonthStatus bankAutoTransferStatus; 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 0eca0489..bd20889a 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,8 +23,7 @@ class UpdateMonthlyInputStatusDao implements UpdateMonthlyInputStatusPortOut { command.getHouseholdSeq(), command.getMonth(), command.getForestProductStatus(), - command.getBankAutoTransferOutputStatus(), - command.getBankAutoTransferInputStatus(), + command.getBankAutoTransferStatus(), 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 2d01148d..1b044487 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,6 +6,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.math.BigDecimal; import java.time.LocalDateTime; @Getter @@ -18,8 +19,7 @@ public class UpdateMonthlyInputStatusDto { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferOutputStatus; - private MonthStatus bankAutoTransferInputStatus; + private MonthStatus bankAutoTransferStatus; 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 9b48101d..c22c6cf5 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,6 +6,9 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.math.BigDecimal; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor @@ -16,8 +19,7 @@ public class UpdateMonthlyInputStatusCmd { private Long householdSeq; private String month; private MonthStatus forestProductStatus; - private MonthStatus bankAutoTransferOutputStatus; - private MonthStatus bankAutoTransferInputStatus; + private MonthStatus bankAutoTransferStatus; } diff --git a/core/src/main/resources/mappers/monthly/GetMonthlyInputStatusMapper.xml b/core/src/main/resources/mappers/monthly/GetMonthlyInputStatusMapper.xml index 97a361fa..364d1e4e 100644 --- a/core/src/main/resources/mappers/monthly/GetMonthlyInputStatusMapper.xml +++ b/core/src/main/resources/mappers/monthly/GetMonthlyInputStatusMapper.xml @@ -12,8 +12,7 @@ a.household_seq AS householdSeq, a.month AS month, a.forest_product_status AS forestProductStatus, - a.bank_auto_transfer_output_status AS bankAutoTransferOutputStatus, - a.bank_auto_transfer_input_status AS bankAutoTransferInputStatus, + a.bank_auto_transfer_status AS bankAutoTransferStatus, 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 0a9f911b..5c3439c6 100644 --- a/core/src/main/resources/mappers/monthly/GetMonthlyInputStatussMapper.xml +++ b/core/src/main/resources/mappers/monthly/GetMonthlyInputStatussMapper.xml @@ -13,8 +13,7 @@ a.household_seq AS householdSeq, a.month AS month, a.forest_product_status AS forestProductStatus, - a.bank_auto_transfer_output_status AS bankAutoTransferOutputStatus, - a.bank_auto_transfer_input_status AS bankAutoTransferInputStatus, + a.bank_auto_transfer_status AS bankAutoTransferStatus, 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 1413a52a..ca128efd 100644 --- a/core/src/main/resources/mappers/monthly/GetPrevMonthlyInputStatusMapper.xml +++ b/core/src/main/resources/mappers/monthly/GetPrevMonthlyInputStatusMapper.xml @@ -12,8 +12,7 @@ a.household_seq AS householdSeq, a.month AS month, a.forest_product_status AS forestProductStatus, - a.bank_auto_transfer_output_status AS bankAutoTransferOutputStatus, - a.bank_auto_transfer_input_status AS bankAutoTransferInputStatus, + a.bank_auto_transfer_status AS bankAutoTransferStatus, 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 e981912f..f6888690 100644 --- a/core/src/main/resources/mappers/monthly/UpdateMonthlyInputStatusMapper.xml +++ b/core/src/main/resources/mappers/monthly/UpdateMonthlyInputStatusMapper.xml @@ -13,8 +13,7 @@ household_seq = #{householdSeq}, month = #{month}, forest_product_status = #{forestProductStatus}, - bank_auto_transfer_output_status = #{bankAutoTransferOutputStatus}, - bank_auto_transfer_input_status = #{bankAutoTransferInputStatus}, + bank_auto_transfer_status = #{bankAutoTransferStatus}, 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 dbc97a24..2cb0b940 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,23 +1,44 @@ 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; @@ -69,8 +90,7 @@ class CreateMonthlyController { AuthUtil.getUserSeq(), currentMonthlyInfo.getMonth(), MonthStatus.REGISTERED, - currentMonthlyInfo.getBankAutoTransferOutputStatus(), - currentMonthlyInfo.getBankAutoTransferInputStatus() + currentMonthlyInfo.getBankAutoTransferStatus() )); } else { updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd( @@ -78,8 +98,7 @@ class CreateMonthlyController { AuthUtil.getUserSeq(), currentMonthlyInfo.getMonth(), MonthStatus.NOTHING, - currentMonthlyInfo.getBankAutoTransferOutputStatus(), - currentMonthlyInfo.getBankAutoTransferInputStatus() + currentMonthlyInfo.getBankAutoTransferStatus() )); }