[FO] 농업생산물 항목 마지막날 체크 TODO 수정
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user