monthly_input_status의 bank_auto_transfer_status 을 두개로 분리
This commit is contained in:
@@ -6,7 +6,6 @@ import lombok.Getter;
|
|||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@@ -18,7 +17,8 @@ public class GetMonthlyInputStatus {
|
|||||||
private Long householdSeq;
|
private Long householdSeq;
|
||||||
private String month;
|
private String month;
|
||||||
private MonthStatus forestProductStatus;
|
private MonthStatus forestProductStatus;
|
||||||
private MonthStatus bankAutoTransferStatus;
|
private MonthStatus bankAutoTransferOutputStatus;
|
||||||
|
private MonthStatus bankAutoTransferInputStatus;
|
||||||
|
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private String createdBy;
|
private String createdBy;
|
||||||
|
|||||||
@@ -37,7 +37,8 @@ class GetMonthlyInputStatussDao implements GetMonthlyInputStatussPortOut {
|
|||||||
article.getHouseholdSeq(),
|
article.getHouseholdSeq(),
|
||||||
article.getMonth(),
|
article.getMonth(),
|
||||||
article.getForestProductStatus(),
|
article.getForestProductStatus(),
|
||||||
article.getBankAutoTransferStatus(),
|
article.getBankAutoTransferOutputStatus(),
|
||||||
|
article.getBankAutoTransferInputStatus(),
|
||||||
article.getCreatedAt(),
|
article.getCreatedAt(),
|
||||||
article.getCreatedBy(),
|
article.getCreatedBy(),
|
||||||
article.getUpdatedAt(),
|
article.getUpdatedAt(),
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import lombok.AllArgsConstructor;
|
|||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@@ -17,7 +16,8 @@ public class GetMonthlyInputStatussDto {
|
|||||||
private Long householdSeq;
|
private Long householdSeq;
|
||||||
private String month;
|
private String month;
|
||||||
private MonthStatus forestProductStatus;
|
private MonthStatus forestProductStatus;
|
||||||
private MonthStatus bankAutoTransferStatus;
|
private MonthStatus bankAutoTransferOutputStatus;
|
||||||
|
private MonthStatus bankAutoTransferInputStatus;
|
||||||
|
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private String createdBy;
|
private String createdBy;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode;
|
|||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@@ -19,7 +18,8 @@ public class GetMonthlyInputStatuss {
|
|||||||
private Long householdSeq;
|
private Long householdSeq;
|
||||||
private String month;
|
private String month;
|
||||||
private MonthStatus forestProductStatus;
|
private MonthStatus forestProductStatus;
|
||||||
private MonthStatus bankAutoTransferStatus;
|
private MonthStatus bankAutoTransferOutputStatus;
|
||||||
|
private MonthStatus bankAutoTransferInputStatus;
|
||||||
|
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private String createdBy;
|
private String createdBy;
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ public class GetPrevMonthlyInputStatus {
|
|||||||
private Long householdSeq;
|
private Long householdSeq;
|
||||||
private String month;
|
private String month;
|
||||||
private MonthStatus forestProductStatus;
|
private MonthStatus forestProductStatus;
|
||||||
private MonthStatus bankAutoTransferStatus;
|
private MonthStatus bankAutoTransferOutputStatus;
|
||||||
|
private MonthStatus bankAutoTransferInputStatus;
|
||||||
|
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private String createdBy;
|
private String createdBy;
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ class UpdateMonthlyInputStatusDao implements UpdateMonthlyInputStatusPortOut {
|
|||||||
command.getHouseholdSeq(),
|
command.getHouseholdSeq(),
|
||||||
command.getMonth(),
|
command.getMonth(),
|
||||||
command.getForestProductStatus(),
|
command.getForestProductStatus(),
|
||||||
command.getBankAutoTransferStatus(),
|
command.getBankAutoTransferOutputStatus(),
|
||||||
|
command.getBankAutoTransferInputStatus(),
|
||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
CommonUtil.getLoginUsername()
|
CommonUtil.getLoginUsername()
|
||||||
));
|
));
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import lombok.Getter;
|
|||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@@ -19,7 +18,8 @@ public class UpdateMonthlyInputStatusDto {
|
|||||||
private Long householdSeq;
|
private Long householdSeq;
|
||||||
private String month;
|
private String month;
|
||||||
private MonthStatus forestProductStatus;
|
private MonthStatus forestProductStatus;
|
||||||
private MonthStatus bankAutoTransferStatus;
|
private MonthStatus bankAutoTransferOutputStatus;
|
||||||
|
private MonthStatus bankAutoTransferInputStatus;
|
||||||
|
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
|
|||||||
@@ -6,9 +6,6 @@ import lombok.EqualsAndHashCode;
|
|||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@@ -19,7 +16,8 @@ public class UpdateMonthlyInputStatusCmd {
|
|||||||
private Long householdSeq;
|
private Long householdSeq;
|
||||||
private String month;
|
private String month;
|
||||||
private MonthStatus forestProductStatus;
|
private MonthStatus forestProductStatus;
|
||||||
private MonthStatus bankAutoTransferStatus;
|
private MonthStatus bankAutoTransferOutputStatus;
|
||||||
|
private MonthStatus bankAutoTransferInputStatus;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,8 @@
|
|||||||
a.household_seq AS householdSeq,
|
a.household_seq AS householdSeq,
|
||||||
a.month AS month,
|
a.month AS month,
|
||||||
a.forest_product_status AS forestProductStatus,
|
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_at AS createdAt,
|
||||||
a.created_by AS createdBy,
|
a.created_by AS createdBy,
|
||||||
a.updated_at AS updatedAt,
|
a.updated_at AS updatedAt,
|
||||||
|
|||||||
@@ -13,7 +13,8 @@
|
|||||||
a.household_seq AS householdSeq,
|
a.household_seq AS householdSeq,
|
||||||
a.month AS month,
|
a.month AS month,
|
||||||
a.forest_product_status AS forestProductStatus,
|
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_at AS createdAt,
|
||||||
a.created_by AS createdBy,
|
a.created_by AS createdBy,
|
||||||
a.updated_at AS updatedAt,
|
a.updated_at AS updatedAt,
|
||||||
|
|||||||
@@ -12,7 +12,8 @@
|
|||||||
a.household_seq AS householdSeq,
|
a.household_seq AS householdSeq,
|
||||||
a.month AS month,
|
a.month AS month,
|
||||||
a.forest_product_status AS forestProductStatus,
|
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_at AS createdAt,
|
||||||
a.created_by AS createdBy,
|
a.created_by AS createdBy,
|
||||||
a.updated_at AS updatedAt,
|
a.updated_at AS updatedAt,
|
||||||
|
|||||||
@@ -13,7 +13,8 @@
|
|||||||
household_seq = #{householdSeq},
|
household_seq = #{householdSeq},
|
||||||
month = #{month},
|
month = #{month},
|
||||||
forest_product_status = #{forestProductStatus},
|
forest_product_status = #{forestProductStatus},
|
||||||
bank_auto_transfer_status = #{bankAutoTransferStatus},
|
bank_auto_transfer_output_status = #{bankAutoTransferOutputStatus},
|
||||||
|
bank_auto_transfer_input_status = #{bankAutoTransferInputStatus},
|
||||||
<include refid="common.fields.UpdateBaseSet"/>
|
<include refid="common.fields.UpdateBaseSet"/>
|
||||||
WHERE id = #{id}
|
WHERE id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
|||||||
@@ -1,44 +1,23 @@
|
|||||||
package app.module.front.usecase.info.monthly.createMonthlyUI.adapters.web;
|
package app.module.front.usecase.info.monthly.createMonthlyUI.adapters.web;
|
||||||
|
|
||||||
import app.module.core.config.application.enums.MonthStatus;
|
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.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.GetMonthlyInputStatusPortIn;
|
||||||
import app.module.core.usecase.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus;
|
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.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.UpdateMonthlyInputStatusPortIn;
|
||||||
import app.module.core.usecase.monthly.updateMonthlyInputStatus.ports.application.domain.UpdateMonthlyInputStatusCmd;
|
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.CreateForestProductPortIn;
|
||||||
import app.module.core.usecase.product.createForestProduct.ports.application.domain.CreateForestProductCmd;
|
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.response.ApiResponse;
|
||||||
import app.module.front.config.application.util.AuthUtil;
|
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.CreateMonthlyProductReqVO;
|
||||||
import app.module.front.usecase.info.monthly.createMonthlyUI.adapters.web.model.CreateMonthlyReqVO;
|
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 jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
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.http.ResponseEntity;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.ui.Model;
|
|
||||||
import org.springframework.validation.BindingResult;
|
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.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
|
||||||
@@ -90,7 +69,8 @@ class CreateMonthlyController {
|
|||||||
AuthUtil.getUserSeq(),
|
AuthUtil.getUserSeq(),
|
||||||
currentMonthlyInfo.getMonth(),
|
currentMonthlyInfo.getMonth(),
|
||||||
MonthStatus.REGISTERED,
|
MonthStatus.REGISTERED,
|
||||||
currentMonthlyInfo.getBankAutoTransferStatus()
|
currentMonthlyInfo.getBankAutoTransferOutputStatus(),
|
||||||
|
currentMonthlyInfo.getBankAutoTransferInputStatus()
|
||||||
));
|
));
|
||||||
} else {
|
} else {
|
||||||
updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd(
|
updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd(
|
||||||
@@ -98,7 +78,8 @@ class CreateMonthlyController {
|
|||||||
AuthUtil.getUserSeq(),
|
AuthUtil.getUserSeq(),
|
||||||
currentMonthlyInfo.getMonth(),
|
currentMonthlyInfo.getMonth(),
|
||||||
MonthStatus.NOTHING,
|
MonthStatus.NOTHING,
|
||||||
currentMonthlyInfo.getBankAutoTransferStatus()
|
currentMonthlyInfo.getBankAutoTransferOutputStatus(),
|
||||||
|
currentMonthlyInfo.getBankAutoTransferInputStatus()
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user