diff --git a/core/src/main/java/app/module/core/config/application/util/DailyUtil.java b/core/src/main/java/app/module/core/config/application/util/DailyUtil.java index 47b92661..9802b1d8 100644 --- a/core/src/main/java/app/module/core/config/application/util/DailyUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/DailyUtil.java @@ -92,7 +92,6 @@ public class DailyUtil { */ public boolean isModifiable(LocalDate startDate, LocalDate endDate) { LocalDate limitStart = LocalDate.now().minusDays(DailyRecordConstants.MODIFIY_LIMIT_DAY); - log.debug("isModifiable @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate); return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate)); } @@ -106,9 +105,8 @@ public class DailyUtil { */ public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) { LocalDate limitStart = LocalDate.now().minusDays(DailyRecordConstants.REGISTER_LIMIT_DAY); - log.debug("isRegisterPossible @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate); - return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate)); + return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate)); } /** diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java index df8f95ce..9136f42c 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java @@ -66,6 +66,16 @@ public class RecordCalendarDao implements RecordCalendarPortOut { refine.setRegistrable(dailyUtil.isRegisterPossible(refine.getStartDate(), refine.getEndDate())); refine.setModifiable(dailyUtil.isModifiable(refine.getStartDate(), refine.getEndDate())); + if (calendar.getGroupNo() == 1) { + Long carryOver = this.getMonthlyCarryOver(command); + + if (!LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")).equals(command.getSearchMonth()) && carryOver == null) { + carryOver = 0L; + } + + refine.setCarryOver(carryOver); + } + DailyRecordStatusDto findStatus = statusList.stream() .filter(f -> Objects.equals(calendar.getDailyId(), f.getDailyId())) .findFirst().orElse(null); @@ -184,6 +194,17 @@ public class RecordCalendarDao implements RecordCalendarPortOut { return refineList; } + /** + * 특정월의 월초이월금 조회 + * + * @param command 검색 조건 + * @return 월초이월금 + */ + private Long getMonthlyCarryOver(RecordCalendarCmd command) { + + return recordCalendarMapper.getMonthlyCarryOver(command); + } + /** * 특정월의 일계부 등록 상태 조회 * diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java index 4bdc5425..390238e6 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java @@ -19,6 +19,13 @@ public interface RecordCalendarMapper { */ List getCalendarByDailyRecord(RecordCalendarCmd command); + /** + * 특정월의 월초이월금 조회 + * @param command 검색 조건 + * @return 월초이월금 + */ + Long getMonthlyCarryOver(RecordCalendarCmd command); + /** * 특정월의 월별 작성 상태 조회 * diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java index c0215c7b..cd373845 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java @@ -24,4 +24,8 @@ public class RecordCalendar { private boolean isModifiable; private List children; private List monthly; + /** + * 월초이월금 + */ + private Long carryOver; } diff --git a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml index 06356d7a..7f040da6 100644 --- a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml +++ b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml @@ -16,6 +16,16 @@ ddg.group_no asc + +