diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java index 2f40c68e..e21f023b 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java @@ -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; diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java index 9067335c..fd43b13f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java @@ -39,7 +39,7 @@ public class CreateDailyExpenseReqVO extends DailyUIReqVO { /** * 수량 */ - private Integer quantity; + private Double quantity; /** * 단위 코드 */ diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/validator/CreateDailyExpenseValidator.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/validator/CreateDailyExpenseValidator.java index 83aa1231..9bdfedc1 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/validator/CreateDailyExpenseValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/validator/CreateDailyExpenseValidator.java @@ -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", "단위를 입력해 주세요."); diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java index 2376b927..620a7787 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java @@ -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; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java index 9e19f61b..7b8d2b47 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java @@ -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; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java index 2b216586..813aa8db 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java @@ -43,7 +43,7 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO { /** * 수량 */ - private Integer quantity; + private Double quantity; /** * 단위 코드 */ diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java index 06d1ceb9..d8d7a57d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java @@ -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; diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java index dc2286e1..f664f631 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java @@ -22,7 +22,7 @@ public class CreateDailyPowerReqVO extends DailyUIReqVO { /** * 명칭 */ - @NotBlank(message = "사용 기계 이름을 입력해 주세요.") + @NotBlank(message = "명칭을 입력해 주세요.") private String equipmentName; /** * 자가 사용시간 diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java index f5f0cdac..097dc9a0 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java @@ -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", - "자가 또는 임차 사용시간을 입력 해주세요."); + "자가 사용시간 또는 임차 사용시간을 입력해 주세요."); } } } diff --git a/front/src/main/resources/templates/record/expense/form.html b/front/src/main/resources/templates/record/expense/form.html index 4f6b6dbd..397ebdba 100644 --- a/front/src/main/resources/templates/record/expense/form.html +++ b/front/src/main/resources/templates/record/expense/form.html @@ -5,7 +5,7 @@
- +
-
@@ -166,6 +165,7 @@
+
diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index 12e20794..e1cfd386 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -11,7 +11,7 @@ [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]],
- [[${#temporals.format(dailyRecord.startDate, 'M월 d')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]],
+ [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]],
지출 내역 [[${#lists.isEmpty(expenseList) ? 0 : #lists.size(expenseList)}]]건 등록
되었습니다. diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index 0cf33515..6b3a5225 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -5,7 +5,7 @@ diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index a7b5387b..f44cbeb3 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -11,7 +11,7 @@ [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]],
- [[${#temporals.format(dailyRecord.startDate, 'M월 d')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]],
+ [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]],
수입 내역 [[${#lists.isEmpty(incomeList) ? 0 : #lists.size(incomeList)}]]건 등록
되었습니다. diff --git a/front/src/main/resources/templates/record/power/form.html b/front/src/main/resources/templates/record/power/form.html index ac4ec902..592bc66d 100644 --- a/front/src/main/resources/templates/record/power/form.html +++ b/front/src/main/resources/templates/record/power/form.html @@ -45,7 +45,7 @@
- + 시간
@@ -57,12 +57,11 @@
- + 시간
-
@@ -71,6 +70,7 @@
+ diff --git a/front/src/main/resources/templates/record/power/index.html b/front/src/main/resources/templates/record/power/index.html index 04feb6b0..b6a13cb2 100644 --- a/front/src/main/resources/templates/record/power/index.html +++ b/front/src/main/resources/templates/record/power/index.html @@ -11,7 +11,7 @@ [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]],
- [[${#temporals.format(dailyRecord.startDate, 'M월 d')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]],
+ [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]],
동력 사용내역 [[${#lists.isEmpty(incomeList) ? 0 : #lists.size(incomeList)}]]건 등록
되었습니다. @@ -59,29 +59,16 @@