diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java index 1bc158c4..ba6a4e0d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java @@ -85,6 +85,8 @@ public class DailyWorkUIController { } } + + model.addAttribute("recordArea", uiCodeListPortIn.connect("code.record.area")); model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit")); model.addAttribute("reqVO", reqVO); diff --git a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java index 22589f7f..1a95e235 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java @@ -53,13 +53,14 @@ public class DailyWorkService implements DailyWorkPortIn { reqVO.getHouseholdSeq(), reqVO.getId())); + List recordArea = uiCodeListPortIn.connect("code.record.area"); List recordUnit = uiCodeListPortIn.connect("code.record.unit"); for (DailyWorkDto dto : list) { if (CommonConstants.UNIT_CODE_SELF.equals(dto.getAreaUnitCode())) { dto.setAreaUnitLabel(dto.getAreaUnitSelf()); } else { - dto.setAreaUnitLabel(this.getCodeLabel(dto.getAreaUnitCode(), recordUnit)); + dto.setAreaUnitLabel(this.getCodeLabel(dto.getAreaUnitCode(), recordArea)); } if (CommonConstants.UNIT_CODE_SELF.equals(dto.getHarvestUnitCode())) { diff --git a/front/src/main/resources/templates/record/work/form.html b/front/src/main/resources/templates/record/work/form.html index 3b7eda2e..d83cbc1e 100644 --- a/front/src/main/resources/templates/record/work/form.html +++ b/front/src/main/resources/templates/record/work/form.html @@ -79,7 +79,7 @@
    -