[FO] 일계부 숫자+도트 키보드 적용, 기타 공통 수정

This commit is contained in:
김현주
2025-06-19 09:44:15 +09:00
parent df76ae0623
commit 829069d296
15 changed files with 33 additions and 45 deletions

View File

@@ -13,7 +13,7 @@ public class DailyExpenseDto {
private Boolean credit;
private String categorySelf;
private String sourcePurpose;
private Integer quantity;
private Double quantity;
private String unitCode;
private String unitLabel;
private String unitSelf;

View File

@@ -39,7 +39,7 @@ public class CreateDailyExpenseReqVO extends DailyUIReqVO {
/**
* 수량
*/
private Integer quantity;
private Double quantity;
/**
* 단위 코드
*/

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.expense.adapters.web.validator;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;
@@ -29,7 +30,7 @@ public class CreateDailyExpenseValidator implements Validator {
"현금 또는 현물평가액을 입력해 주세요.");
}
if ("code.record.unit.self".equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"단위를 입력해 주세요.");

View File

@@ -19,7 +19,7 @@ public class CreateDailyExpenseCmd extends FrontAuditCommand {
private Boolean credit;
private String categorySelf;
private String sourcePurpose;
private Integer quantity;
private Double quantity;
private String unitCode;
private String unitSelf;
private Integer price;

View File

@@ -17,7 +17,7 @@ public class DailyIncomeDto {
private String cropLabel;
private String categorySelf;
private String sourcePurpose;
private Integer quantity;
private Double quantity;
private String unitCode;
private String unitLabel;
private String unitSelf;

View File

@@ -43,7 +43,7 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO {
/**
* 수량
*/
private Integer quantity;
private Double quantity;
/**
* 단위 코드
*/

View File

@@ -20,7 +20,7 @@ public class CreateDailyIncomeCmd extends FrontAuditCommand {
private String cropCode;
private String categorySelf;
private String sourcePurpose;
private Integer quantity;
private Double quantity;
private String unitCode;
private String unitSelf;
private Integer price;

View File

@@ -22,7 +22,7 @@ public class CreateDailyPowerReqVO extends DailyUIReqVO {
/**
* 명칭
*/
@NotBlank(message = "사용 기계 이름을 입력해 주세요.")
@NotBlank(message = "명칭을 입력해 주세요.")
private String equipmentName;
/**
* 자가 사용시간

View File

@@ -23,10 +23,10 @@ public class CreateDailyPowerValidator implements Validator {
if (vo.getOwnedHours() == null && vo.getLeasedHours() == null) {
errors.rejectValue(
"ownedHours", "valid.common.required",
"자가 또는 임차 사용시간을 입력 해주세요.");
"자가 사용시간 또는 임차 사용시간을 입력해 주세요.");
errors.rejectValue(
"leasedHours", "valid.common.required",
"자가 또는 임차 사용시간을 입력 해주세요.");
"자가 사용시간 또는 임차 사용시간을 입력해 주세요.");
}
}
}