diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/application/domain/GetForestProductStatus.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/application/domain/GetForestProductStatus.java index d17d6006..e8ce029c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/application/domain/GetForestProductStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/application/domain/GetForestProductStatus.java @@ -14,6 +14,7 @@ public class GetForestProductStatus { private String streetNum; private String landType; private String town; + private String availableArea; private String cropName; private String landArea; private String mainYield; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java index 20d7dcfb..5d223c09 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java @@ -20,26 +20,26 @@ public class SaveHouseholdVisitInfoValidator implements Validator { SaveHouseholdVisitInfoReqVO vo = (SaveHouseholdVisitInfoReqVO) target; if (vo.getHouseholdSeq() == null) { - errors.reject("householdSeq", "임가 정보가 없습니다."); + errors.rejectValue("householdSeq", "error.householdSeq", "임가 정보가 없습니다."); return; } if (vo.getVisitDate() == null) { - errors.reject("visitDate", "방문일자를 입력해 주세요."); + errors.rejectValue("visitDate", "error.visitDate","방문일자를 입력해 주세요."); return; } if (vo.getVisitDate().after(new Date())) { - errors.reject("visitDate", "미래 날짜는 입력할 수 없습니다."); + errors.rejectValue("visitDate", "error.visitDate","미래 날짜는 입력할 수 없습니다."); return; } if (vo.getManagementType() == null) { - errors.reject("managementType", "방문조사 유형을 선택해 주세요."); + errors.rejectValue("managementType", "error.managementType","방문조사 유형을 선택해 주세요."); } if (!StringUtils.hasText(vo.getContent())) { - errors.reject("content", "내용을 입력해 주세요."); + errors.rejectValue("content", "error.content","내용을 입력해 주세요."); } } } \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetForestProductStatusMapper.xml b/admin/src/main/resources/mappers/household/GetForestProductStatusMapper.xml index 2cd9e713..600c8908 100644 --- a/admin/src/main/resources/mappers/household/GetForestProductStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetForestProductStatusMapper.xml @@ -10,6 +10,7 @@ street_num, land_type, town, + available_area, crop_name, land_area, main_yield, diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index bfa70c65..3d681c70 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -461,7 +461,8 @@ const ifNullHyphen = (value, fallback = '-') => { } const formatNumberWithComma = (value) => { - if (value == null || isNaN(value)) return '-'; + if (value == null || value === '' || Number(value) === 0) return '-'; + if (isNaN(value)) return '-'; return Number(value).toLocaleString(); } diff --git a/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html index a26775bb..5461e6a2 100644 --- a/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html +++ b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html @@ -49,7 +49,7 @@