diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java index 8e2cb578..28a75a9c 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.income.web; import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.config.application.util.CoreUtil; import app.module.front.usecase.daily.income.service.DailyIncomeService; import app.module.front.usecase.daily.income.web.model.CreateDailyIncomeReqVO; import app.module.front.usecase.daily.income.web.model.RemoveDailyIncomeReqVO; @@ -25,6 +26,7 @@ public class DailyIncomeController { private final DailyRecordService dailyRecordService; private final DailyIncomeService dailyIncomeService; private final CreateDailyIncomeValidator createDailyIncomeValidator; + private final CoreUtil coreUtil; /** * 일계부 수입내역 등록 처리 @@ -43,8 +45,9 @@ public class DailyIncomeController { createDailyIncomeValidator.validate(formVO, bindingResult); if (bindingResult.hasErrors()) { - return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) - .body(bindingResult.getFieldErrors()); +// return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) +// .body(bindingResult.getFieldErrors()); + return coreUtil.getErrorInfo(bindingResult); } DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/model/CreateDailyIncomeReqVO.java b/front/src/main/java/app/module/front/usecase/daily/income/web/model/CreateDailyIncomeReqVO.java index 1eb18dd9..ff804f6c 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/model/CreateDailyIncomeReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/model/CreateDailyIncomeReqVO.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.income.web.model; import app.module.front.usecase.daily.record.web.model.DailyUIReqVO; +import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -32,6 +33,7 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO { /** * 수입의 종류 코드 */ + @NotBlank(message = "수입 종류를 선택해 주세요.") private String categoryCode; /** * 수입의 종류 직접입력 @@ -40,6 +42,7 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO { /** * 수입원 */ + @NotBlank(message = "수입원을 입력해 주세요.") private String sourcePurpose; /** * 수량 diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java b/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java index e305f3a4..545ff485 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java @@ -24,16 +24,27 @@ public class CreateDailyIncomeValidator implements Validator { public void validate(Object target, Errors errors) { CreateDailyIncomeReqVO vo = (CreateDailyIncomeReqVO) target; - if ("SELF".equals(vo.getInputType()) || StringUtils.isBlank(vo.getInputType())) { + if (StringUtils.isBlank(vo.getCategoryCode())) { + errors.rejectValue( + "categoryCode", "valid.common.required", + "수입 종류를 입력해 주세요."); + } - if (StringUtils.isBlank(vo.getCategoryCode())) { - errors.rejectValue( - "categoryCode", "valid.common.required", - "수입 종류를 선택해 주세요."); - } + if ("SELF".equals(vo.getCategoryCode()) && StringUtils.isBlank(vo.getCategorySelf())) { + errors.rejectValue( + "categorySelf", "valid.common.required", + "수입 종류를 입력해 주세요."); + } + + if (vo.getPrice() == null && vo.getEstimatedValue() == null) { + errors.rejectValue( + "price", "valid.common.required", + "현금 또는 현물평가액을 입력 해주세요."); + errors.rejectValue( + "estimatedValue", "valid.common.required", + "현금 또는 현물평가액을 입력 해주세요."); } // TODO : valid - } } diff --git a/front/src/main/resources/static/ui/ajaxUtil.js b/front/src/main/resources/static/ui/ajaxUtil.js index 2bc01d15..62fdd311 100644 --- a/front/src/main/resources/static/ui/ajaxUtil.js +++ b/front/src/main/resources/static/ui/ajaxUtil.js @@ -177,6 +177,18 @@ var ajaxUtil = { infoBox.html('
  • ' + oj.message + '
  • '); } } + + if (target.data('type') == 'select') { + const component = target.parent().parent().closest('.select-group'); + if(component){ + component.addClass('select-invalid'); + let infoBox = component.find('.input-info'); + if (infoBox.length === 0) { + infoBox = $('').appendTo(component); + } + infoBox.html('
  • ' + oj.message + '
  • '); + } + } }); if ($('.invalid-feedback').length === 0) { @@ -184,7 +196,6 @@ var ajaxUtil = { if (fieldErrors != null && fieldErrors.length > 0) { ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크'); } - } }, 500:function(rstData){ diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index 947b5d26..c8dcd248 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -56,18 +56,10 @@

    임산물 수입이 있는 경우, 등록해 주세요. -
    - - - +
    @@ -102,19 +91,9 @@ *

    -
    - - - - - -
    - -
    -
    -
    -
    +
    +
    + +
    +
    @@ -179,18 +158,10 @@ 단위

    -
    - - - +
    diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index fd8c9112..93b66c20 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -104,7 +104,7 @@ -
    +