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 ce4b828c..57bd5b11 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 @@ -61,7 +61,8 @@ class CreateBankInputController { //TODO 트렌젝션 고려 removeBanksPortIn.operate(new RemoveBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq(), reqVO.getTransferType())); - if (!reqVO.getStatus() && reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님. +// if (!reqVO.getStatus() && reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님. + if (reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님. for (CreateBankInputProductReqVO item : reqVO.getBankList()) { UICodeView code = uiCodeViewPortIn.connect(item.getTransferCategoryCode()).orElse(null); @@ -99,16 +100,17 @@ class CreateBankInputController { reqVO.getTransferType().equals("code.bank.input") ? MonthStatus.REGISTERED : currentMonthlyInfo.getBankAutoTransferInputStatus(), reqVO.getTransferType().equals("code.bank.output") ? MonthStatus.REGISTERED : currentMonthlyInfo.getBankAutoTransferOutputStatus() )); - } else { - updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd( - currentMonthlyInfo.getId(), - AuthUtil.getUserSeq(), - currentMonthlyInfo.getMonth(), - currentMonthlyInfo.getBankAutoTransferInputStatus(), - reqVO.getTransferType().equals("code.bank.input") ? MonthStatus.NOTHING : currentMonthlyInfo.getBankAutoTransferInputStatus(), - reqVO.getTransferType().equals("code.bank.output") ? MonthStatus.NOTHING : currentMonthlyInfo.getBankAutoTransferOutputStatus() - )); } +// else { +// updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd( +// currentMonthlyInfo.getId(), +// AuthUtil.getUserSeq(), +// currentMonthlyInfo.getMonth(), +// currentMonthlyInfo.getBankAutoTransferInputStatus(), +// reqVO.getTransferType().equals("code.bank.input") ? MonthStatus.NOTHING : currentMonthlyInfo.getBankAutoTransferInputStatus(), +// reqVO.getTransferType().equals("code.bank.output") ? MonthStatus.NOTHING : currentMonthlyInfo.getBankAutoTransferOutputStatus() +// )); +// } return ResponseEntity.ok(ApiResponse.success(null)); } else { return ResponseEntity.ok(ApiResponse.failure(null)); 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 index 79af3aad..d53511b4 100644 --- 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 @@ -13,7 +13,7 @@ import java.util.List; public class CreateBankInputReqVO { - private Boolean status; +// private Boolean status; private Long id; private String transferType; private List bankList; diff --git a/front/src/main/resources/mappers/monthly/GetPrevMonthlyInputStatusMapper.xml b/front/src/main/resources/mappers/monthly/GetPrevMonthlyInputStatusMapper.xml index 6c261176..ad9f4e7f 100644 --- a/front/src/main/resources/mappers/monthly/GetPrevMonthlyInputStatusMapper.xml +++ b/front/src/main/resources/mappers/monthly/GetPrevMonthlyInputStatusMapper.xml @@ -23,7 +23,7 @@ AND a.forest_product_status != 'NONE' AND a.household_seq = #{householdSeq} AND a.month = ( - SELECT TO_CHAR(TO_DATE(month, 'YYYY-MM') - INTERVAL '1 month', 'YYYY-MM') + SELECT TO_CHAR(TO_DATE(month, 'YYYYMM') - INTERVAL '1 month', 'YYYYMM') FROM monthly_input_status WHERE is_deleted = false AND id = #{id} ); diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js index 6506dcfe..a3051b5b 100644 --- a/front/src/main/resources/static/ui/commonUtil.js +++ b/front/src/main/resources/static/ui/commonUtil.js @@ -172,7 +172,7 @@ kri.form.errorInit = function (formElement) { if (formElement.length > 0) { $(formElement).find('.component-input').removeClass('input-invalid'); $(formElement).find('.input-flex-group').removeClass('invalid'); - $(formElement).find('.select-group').removeClass('select-invalid'); + $(formElement).find('.select-group').removeClass('input-invalid'); $(formElement).find('.input-info').each(function () { $(this).remove(); }); @@ -238,11 +238,12 @@ kri.form.error = function(errorList){ } }); - if(errorList && errorList.length > 0){ - const target = $('[name="' + errorList[0].field + '"]'); - if (target.length > 0) { - target.focus(); - } + // 포커스 이동 + if ($('.input-invalid').length != 0) { + $('.input-invalid').eq(0).find('input').focus(); + } + if ($('.select-invalid').length != 0) { + $('.select-invalid').eq(0).find('button').focus(); } } diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index 488a7b19..723df850 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -31,18 +31,18 @@ 추가 등록 - -
- -
+ + + + + + + @@ -97,7 +97,7 @@ -"/api/front/info/bank/create" +