From 2af09fe7bd0e79f3b5de476aed9156f11e1f86d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Wed, 18 Jun 2025 17:45:11 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EC=9B=94?= =?UTF-8?q?=EB=B3=84=20=EC=9E=84=EC=82=B0=EB=AC=BC,=20=EC=9D=80=ED=96=89?= =?UTF-8?q?=20=EC=9E=90=EB=8F=99=EC=9D=B4=EC=B2=B4=20=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/RecordCalendarDao.java | 48 ++++++++++++------- .../persistence/RecordCalendarMapper.java | 17 +++++-- .../persistence/model/MonthlyStatusDto.java | 32 +++++++++++++ .../mappers/daily/RecordCalendarMapper.xml | 11 +++++ .../resources/templates/record/calendar.html | 2 +- 5 files changed, 89 insertions(+), 21 deletions(-) create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/MonthlyStatusDto.java 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 b13e9eef..076a2ab6 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 @@ -1,7 +1,9 @@ package app.module.front.usecase.daily.calendar.adapters.persistence; +import app.module.core.config.application.enums.MonthStatus; import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto; import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto; +import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren; @@ -10,6 +12,8 @@ import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatu import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -24,6 +28,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut { public List operate(RecordCalendarCmd command) { List calendarList = this.getCalendarList(command); List statusList = this.getDailyRecordStatus(command); + MonthlyStatusDto monthlyStatus = this.getBankExist(command); String pathFormat = "/record/%s/%s/%s"; @@ -38,10 +43,10 @@ public class RecordCalendarDao implements RecordCalendarPortOut { .filter(f -> Objects.equals(calendar.getDailyId(), f.getDailyId())) .findFirst().orElse(null); + List childList = new ArrayList<>(); if (findStatus == null) { refine.setChildren(new ArrayList<>()); } else { - List childList = new ArrayList<>(); if (DailyTargetStatus.TARGET.equals(findStatus.getIncomeStatus()) || DailyTargetStatus.TODAY_NONE.equals(findStatus.getIncomeStatus())) { childList.add(new CalendarChildren( @@ -90,23 +95,22 @@ public class RecordCalendarDao implements RecordCalendarPortOut { findStatus.getFarmingCount(), String.format(pathFormat, "farming", command.getSearchMonth(), findStatus.getDayGroupNo()))); } - - // TODO /info/monthly - childList.add(new CalendarChildren( - "MONTHLY", - "임산물 현황 등록", - 0, - String.format("/info/monthly/month/%s", command.getSearchMonth()))); - - childList.add(new CalendarChildren( - "BANK", - "은행 자동이체 내역 등록", - 0, - "/info/bank")); - - refine.setChildren(childList); } + childList.add(new CalendarChildren( + "MONTHLY", + "임산물 현황 등록", + monthlyStatus.isForestNone() ? 0 : 1, + String.format("/info/monthly/month/%s", command.getSearchMonth()))); + + childList.add(new CalendarChildren( + "BANK", + "은행 자동이체 내역 등록", + monthlyStatus.isBankNone() ? 0 : 1, + (LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")).equals(command.getSearchMonth())) ? "/info/bank" : null)); + + refine.setChildren(childList); + refineList.add(refine); } @@ -151,4 +155,16 @@ public class RecordCalendarDao implements RecordCalendarPortOut { return statusList; } + + /** + * 특정월의 월별 작성 상태 조회 + * + * @param command 검색 조건 + * @return true=등록완료, false=미등록 + */ + private MonthlyStatusDto getBankExist(RecordCalendarCmd command) { + MonthlyStatusDto detail = recordCalendarMapper.getMonthlyStatus(command); + + return detail == null ? new MonthlyStatusDto(MonthStatus.NONE, MonthStatus.NONE, MonthStatus.NONE) : detail; + } } 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 247bc3d7..03047ea2 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 @@ -2,6 +2,7 @@ package app.module.front.usecase.daily.calendar.adapters.persistence; import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto; import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordStatusDto; +import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; import org.apache.ibatis.annotations.Mapper; @@ -12,16 +13,24 @@ public interface RecordCalendarMapper { /** * 특정월의 일 그룹 조회 * - * @param cmd 검색 조건 + * @param command 검색 조건 * @return 일(DAY) 그룹 목록 */ - List getCalendarByDailyRecord(RecordCalendarCmd cmd); + List getCalendarByDailyRecord(RecordCalendarCmd command); /** * 특정일의 일계부 등록 상태 조회 * - * @param cmd 검색 조건 + * @param command 검색 조건 * @return 일계부 등록 현황 목록 */ - List getDailyRecordStatus(RecordCalendarCmd cmd); + List getDailyRecordStatus(RecordCalendarCmd command); + + /** + * 특정월의 월별 작성 상태 조회 + * + * @param command 검색 조건 + * @return 월별 작성 상태 + */ + MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/MonthlyStatusDto.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/MonthlyStatusDto.java new file mode 100644 index 00000000..ce13f8a9 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/model/MonthlyStatusDto.java @@ -0,0 +1,32 @@ +package app.module.front.usecase.daily.calendar.adapters.persistence.model; + +import app.module.core.config.application.enums.MonthStatus; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.ToString; + +@Data +@AllArgsConstructor +@ToString +public class MonthlyStatusDto { + private MonthStatus forestProduct; + private MonthStatus bankInput; + private MonthStatus bankOutput; + + /** + * 임산물 현황 등록 여부 + * @return true=미등록, false=등록완료 + */ + public boolean isForestNone() { + return MonthStatus.NONE.equals(forestProduct) || forestProduct == null; + } + + /** + * 은행 자동이체 내역 등록 여부 + * @return true=미등록, false=등록완료 + */ + public boolean isBankNone() { + return (MonthStatus.NONE.equals(bankInput) || bankInput == null) + && (MonthStatus.NONE.equals(bankOutput) || bankOutput == null); + } +} diff --git a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml index 96fdab6d..771495e2 100644 --- a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml +++ b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml @@ -39,4 +39,15 @@ and dr.record_month = #{searchMonth} + + diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index 90b9311a..65b058e1 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -780,7 +780,7 @@