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 @@