From eaa6f1008a5fd190b10f6eb1548bd6efe1fd4455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 24 Jun 2025 15:50:37 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EB=85=B8?= =?UTF-8?q?=EB=8F=99=20=EC=9E=91=EC=97=85=EC=9D=98=20=EB=8B=A8=EC=9C=84=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usecase/daily/work/adapters/web/DailyWorkUIController.java | 2 ++ .../usecase/daily/work/ports/application/DailyWorkService.java | 3 ++- front/src/main/resources/templates/record/work/form.html | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) 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 @@
    -