From 4ed64e78879260b2083810f00fc467c3d5040ae1 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:18:56 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EB=86=8D=EC=97=85=EC=83=9D=EC=82=B0?= =?UTF-8?q?=EB=AC=BC=20=ED=95=AD=EB=AA=A9=20=EB=A7=88=EC=A7=80=EB=A7=89?= =?UTF-8?q?=EB=82=A0=20=EC=B2=B4=ED=81=AC=20TODO=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/web/DailyRecordController.java | 1 + .../web/model/CreateDailyRecordReqVO.java | 19 +++++++++++-------- .../templates/record/daily/index.html | 3 +-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java index b7e15444..cffcb0af 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java @@ -48,6 +48,7 @@ public class DailyRecordController { formVO.setDayGroupNo(reqVO.getGroupNo()); formVO.setStartDate(detail.getStartDate()); formVO.setEndDate(detail.getEndDate()); + formVO.setFarmingStatus(detail.isFarmingOpen()); log.debug("formVO: {}", formVO); dailyRecordPortIn.create(formVO); diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java index 360120e0..3182f5ab 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java @@ -23,6 +23,7 @@ public class CreateDailyRecordReqVO { private DailyTargetStatus farmingStatus; public void setTodayNone(String todayNone) { + this.todayNone = todayNone; if ("Y".equals(todayNone)) { this.allStatus = DailyStatus.TODAY_NONE; this.incomeStatus = DailyTargetStatus.TODAY_NONE; @@ -30,13 +31,6 @@ public class CreateDailyRecordReqVO { this.expenseStatus = DailyTargetStatus.TODAY_NONE; this.powerStatus = DailyTargetStatus.TODAY_NONE; this.forestryStatus = DailyTargetStatus.TODAY_NONE; - - // TODO : 7의 배수와 마지막날의 기준 - if (dayGroupNo == 4 || dayGroupNo == 8 || dayGroupNo == 12 || dayGroupNo == 16 || dayGroupNo == 17) { - this.farmingStatus = DailyTargetStatus.TODAY_NONE; - } else { - this.farmingStatus = DailyTargetStatus.NONE; - } } else { this.allStatus = DailyStatus.WAITING; @@ -55,9 +49,18 @@ public class CreateDailyRecordReqVO { if (forestryStatus == null) { this.forestryStatus = DailyTargetStatus.NONE; } - if (farmingStatus == null) { + } + } + + public void setFarmingStatus(boolean isOpen) { + if ("Y".equals(todayNone)) { + if (isOpen) { + this.farmingStatus = DailyTargetStatus.TODAY_NONE; + } else { this.farmingStatus = DailyTargetStatus.NONE; } + } else if (farmingStatus == null) { + this.farmingStatus = DailyTargetStatus.NONE; } } } diff --git a/front/src/main/resources/templates/record/daily/index.html b/front/src/main/resources/templates/record/daily/index.html index a8d357ff..ade1e598 100644 --- a/front/src/main/resources/templates/record/daily/index.html +++ b/front/src/main/resources/templates/record/daily/index.html @@ -82,8 +82,7 @@
+ th:if="${dailyRecord.farmingOpen}">