diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/MonthlyStatusDto.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/MonthlyStatusDto.java index ce13f8a9..0625aee0 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/MonthlyStatusDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/MonthlyStatusDto.java @@ -27,6 +27,6 @@ public class MonthlyStatusDto { */ public boolean isBankNone() { return (MonthStatus.NONE.equals(bankInput) || bankInput == null) - && (MonthStatus.NONE.equals(bankOutput) || bankOutput == null); + || (MonthStatus.NONE.equals(bankOutput) || bankOutput == null); } } 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 index 57bd5b11..50c7c22d 100644 --- 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 @@ -96,7 +96,7 @@ class CreateBankInputController { currentMonthlyInfo.getId(), AuthUtil.getUserSeq(), currentMonthlyInfo.getMonth(), - currentMonthlyInfo.getBankAutoTransferInputStatus(), + currentMonthlyInfo.getForestProductStatus(), reqVO.getTransferType().equals("code.bank.input") ? MonthStatus.REGISTERED : currentMonthlyInfo.getBankAutoTransferInputStatus(), reqVO.getTransferType().equals("code.bank.output") ? MonthStatus.REGISTERED : currentMonthlyInfo.getBankAutoTransferOutputStatus() )); diff --git a/front/src/main/resources/mappers/monthly/UpdateMonthlyInputStatusMapper.xml b/front/src/main/resources/mappers/monthly/UpdateMonthlyInputStatusMapper.xml index 14b1b1e3..a746d3c4 100644 --- a/front/src/main/resources/mappers/monthly/UpdateMonthlyInputStatusMapper.xml +++ b/front/src/main/resources/mappers/monthly/UpdateMonthlyInputStatusMapper.xml @@ -1,21 +1,19 @@ - + "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > + + + /* updateMonthlyInputStatus 월별현황 수정 */ + UPDATE monthly_input_status + SET + household_seq = #{householdSeq}, + month = #{month}, + forest_product_status = #{forestProductStatus}, + bank_auto_transfer_input_status = #{bankAutoTransferInputStatus}, + bank_auto_transfer_output_status = #{bankAutoTransferOutputStatus}, + + WHERE id = #{id} + - - - /* updateNotice 게시글 수정 */ - UPDATE monthly_input_status - SET - household_seq = #{householdSeq}, - month = #{month}, - forest_product_status = #{forestProductStatus}, - bank_auto_transfer_input_status = #{bankAutoTransferInputStatus}, - bank_auto_transfer_output_status = #{bankAutoTransferOutputStatus}, - - WHERE id = #{id} - \ No newline at end of file