Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
주수현
2025-07-14 14:58:12 +09:00

View File

@@ -35,10 +35,15 @@ public class DailyRecordDao implements DailyRecordPortOut {
if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) {
// 종료일의 달이 변경되면 시작일=종료일 처리
detail.setEndDate(detail.getStartDate());
detail.setEndDay(dailyUtil.getLastDay(detail.getStartDate()));
}
}
detail.setLastDay(dailyUtil.isLastDay(detail.getEndDate()));
if (detail.isLastDay()) {
detail.setEndDay(dailyUtil.getLastDay(detail.getStartDate()));
}
detail.setFarmingOpen(dailyUtil.isFarmingOpen(detail.getGroupNo(), detail.getEndDate()));
detail.setRegistrable(dailyUtil.isRegisterPossible(detail.getStartDate(), detail.getEndDate()));
detail.setModifiable(dailyUtil.isModifiable(detail.getStartDate(), detail.getEndDate()));