From 436826e02b88d89b8e8a733d87fb3eab18e4d605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 8 Jul 2025 17:36:02 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EA=B6=8C?= =?UTF-8?q?=EA=B3=A0=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=9E=AC=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/application/util/DailyUtil.java | 18 +++--- .../constants/DailyRecordConstants.java | 12 ++++ .../persistence/RecordCalendarDao.java | 28 +++++----- .../persistence/RecordCalendarMapper.java | 8 ++- .../web/RecordCalendarUIController.java | 2 +- .../calendar/ports/RecordCalendarPortIn.java | 7 ++- .../calendar/ports/RecordCalendarPortOut.java | 3 + .../application/RecordCalendarService.java | 22 +++++++- .../application/domain/RecordCalendar.java | 3 +- .../usecase/info/GetInfoUIController.java | 2 +- .../mappers/daily/RecordCalendarMapper.xml | 56 ++----------------- .../main/resources/templates/info/main.html | 24 ++++++-- .../resources/templates/record/calendar.html | 22 ++++++-- 13 files changed, 111 insertions(+), 96 deletions(-) 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 4262053d..47b92661 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 @@ -1,5 +1,6 @@ package app.module.core.config.application.util; +import app.module.core.config.constants.DailyRecordConstants; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -84,13 +85,13 @@ public class DailyUtil { /** * 데이터 수정 가능 여부 - * [정책] 15일전까지 데이터 수정 가능(등록도 불가) - * @param startDate - * @param endDate + * + * @param startDate 시작일 + * @param endDate 종료일 * @return true=수정 가능, false=수정 불가 */ public boolean isModifiable(LocalDate startDate, LocalDate endDate) { - LocalDate limitStart = LocalDate.now().minusDays(15); + 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)); @@ -98,12 +99,13 @@ public class DailyUtil { /** * 데이터 등록 가능 여부 - * @param startDate - * @param endDate - * @return + * + * @param startDate 시작일 + * @param endDate 종료일 + * @return true=등록 가능, false=등록 불가 */ public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) { - LocalDate limitStart = LocalDate.now().minusDays(15); + 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)); diff --git a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java index 2cb90d50..54f535a0 100644 --- a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java +++ b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java @@ -34,4 +34,16 @@ public class DailyRecordConstants { * [정책] 81011 고정 */ public static final String FORESTRY_EXPENSE_MARK = "81011"; + + /** + * 일계부 등록 가능 일 + * [정책] 15일전까지 데이터 등록 가능 + */ + public static final int REGISTER_LIMIT_DAY = 15; + + /** + * 일계부 수정 가능 일 + * [정책] 15일전까지 데이터 수정 가능 + */ + public static final int MODIFIY_LIMIT_DAY = 15; } 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 f11a5248..df8f95ce 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 @@ -4,6 +4,7 @@ import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.enums.DailyTargetStatus; import app.module.core.config.application.enums.MonthStatus; import app.module.core.config.application.util.DailyUtil; +import app.module.core.config.constants.DailyRecordConstants; import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto; import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut; @@ -34,7 +35,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); + MonthlyStatusDto monthlyStatus = this.getMonthlyStatus(command); String pathFormat = "/record/%s/%s/%s"; @@ -136,9 +137,18 @@ public class RecordCalendarDao implements RecordCalendarPortOut { } @Override - public int getDataNoneCountBySomeDayAfter(Long householdSeq) { + public MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command) { + MonthlyStatusDto detail = recordCalendarMapper.getMonthlyStatus(command); - return recordCalendarMapper.getDataNoneCountBySomeDayAfter(householdSeq); + return detail == null ? new MonthlyStatusDto(MonthStatus.NONE, MonthStatus.NONE, MonthStatus.NONE) : detail; + } + + @Override + public int getDataNoneCountBySomeDayAfter(Long householdSeq) { + // 검색 당일을 제외하여 -1 처리 + int limitDay = DailyRecordConstants.REGISTER_LIMIT_DAY - 1; + + return recordCalendarMapper.getDataNoneCountBySomeDayAfter(householdSeq, limitDay); } @Override @@ -189,18 +199,6 @@ 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 050ff38b..4bdc5425 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 @@ -1,10 +1,11 @@ package app.module.front.usecase.daily.calendar.adapters.persistence; -import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; +import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto; 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; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -27,12 +28,13 @@ public interface RecordCalendarMapper { MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command); /** - * 3일전 ~ 15일전 미등록된 데이터 개수 조회 + * 등록가능 기간에 미등록된 데이터 개수 조회 * * @param householdSeq 임가회원 일련번호 + * @param limitDay 전일로부터 x일전 검색 일 * @return 미등록 건 수 */ - Integer getDataNoneCountBySomeDayAfter(Long householdSeq); + Integer getDataNoneCountBySomeDayAfter(@Param("householdSeq") Long householdSeq, @Param("limitDay") Integer limitDay); /** * 최신 등록일 데이터 조회 diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java index 1ea1440c..a31a6d07 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java @@ -28,7 +28,7 @@ public class RecordCalendarUIController { model.addAttribute("reqVO", reqVO); - model.addAttribute("dailyDataNone", recordCalendarPortIn.getDataNoneCountBySomeDayAfter()); + model.addAttribute("dailyDataNone", recordCalendarPortIn.getDailyNone(reqVO)); return "record/calendar"; } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java index ae177f0c..02e1e69c 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java @@ -1,5 +1,7 @@ package app.module.front.usecase.daily.calendar.ports; +import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; +import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; @@ -17,9 +19,10 @@ public interface RecordCalendarPortIn { /** * 특정기간의 데이터 미등록 여부 조회 * - * @return true=미등록 데이터 있음, false=없음 + * @param reqVO 검색 조건 + * @return 미등록 데이터 */ - boolean getDataNoneCountBySomeDayAfter(); + String getDailyNone(RecordCalendarUIReqVO reqVO); /** * 일계부 최신 데이터 등록일 조회 diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java index 72e050ab..9f2c5405 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.calendar.ports; +import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; @@ -9,6 +10,8 @@ import java.util.List; public interface RecordCalendarPortOut { List operate(RecordCalendarCmd command); + MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command); + int getDataNoneCountBySomeDayAfter(Long householdSeq); DailyRecordStatusDto getLatestDate(Long householdSeq); diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java index d4bf693d..eed3c8b7 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java @@ -1,6 +1,8 @@ package app.module.front.usecase.daily.calendar.ports.application; import app.module.front.config.application.util.AuthUtil; +import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; +import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; @@ -25,10 +27,24 @@ public class RecordCalendarService implements RecordCalendarPortIn { } @Override - public boolean getDataNoneCountBySomeDayAfter() { - int dataNoneCount = portOut.getDataNoneCountBySomeDayAfter(AuthUtil.getUserSeq()); + public String getDailyNone(RecordCalendarUIReqVO reqVO) { + RecordCalendarCmd command = new RecordCalendarCmd( + reqVO.getSearchMonth(), + reqVO.getHouseholdSeq()); - return dataNoneCount != 0; + int dataNoneCount = portOut.getDataNoneCountBySomeDayAfter(command.getHouseholdSeq()); + MonthlyStatusDto monthly = portOut.getMonthlyStatus(command); + + String returnValue = "DONE"; + if (dataNoneCount != 0) { + returnValue = "DATA_NONE"; + } else if (monthly != null && monthly.isForestNone()) { + returnValue = "FOREST_NONE"; + } else if (monthly != null && monthly.isBankNone()) { + returnValue = "BANK_NONE"; + } + + return returnValue; } @Override 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 65b75ddb..c0215c7b 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 @@ -16,8 +16,7 @@ public class RecordCalendar { private Integer no; private Integer start; private Integer end; - //TODO : JsonIgnore -// @JsonIgnore + @JsonIgnore private LocalDate startDate; @JsonIgnore private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java b/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java index d70ee8e4..95d065e7 100644 --- a/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java @@ -38,7 +38,7 @@ class GetInfoUIController { : null); model.addAttribute("userInfo", getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); - model.addAttribute("dailyDataNone", recordCalendarPortIn.getDataNoneCountBySomeDayAfter()); + model.addAttribute("dailyDataNone", recordCalendarPortIn.getDailyNone(new RecordCalendarUIReqVO())); model.addAttribute("dailyLatest", recordCalendarPortIn.getLatestDate()); return "info/main"; diff --git a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml index 111ab921..06356d7a 100644 --- a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml +++ b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml @@ -29,58 +29,14 @@ diff --git a/front/src/main/resources/templates/info/main.html b/front/src/main/resources/templates/info/main.html index cdada015..d59152dc 100644 --- a/front/src/main/resources/templates/info/main.html +++ b/front/src/main/resources/templates/info/main.html @@ -12,12 +12,24 @@ info : 인포(파랑) */-->
-

홍길동님,

- - 일계부를 등록하지 않은 날짜가 있습니다.
- 정확한 조사를 위해 꾸준히 입력해 주세요. -
+ th:classappend="${#strings.equals(dailyDataNone, 'DONE')} ? 'success' : 'warning'"> +

홍길동님,

+ + 일계부를 등록하지 않은 날짜가 있습니다.
+ 정확한 조사를 위해 꾸준히 입력해 주세요. +
+ + 이번 달 임산물 현황이 등록되지 않았습니다.
+ 정확한 조사를 위해 매월 1회 입력해 주세요. +
+ + 이번 달 자동이체 내역이 등록되지 않았습니다.
+ 정확한 조사를 위해 매월 1회 입력해 주세요. +
+ + 일계부를 성실하게 등록하고 계십니다.
+ 정확한 조사를 위해 지금처럼 계속 입력해 주세요. +
diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index 6b045e1f..4f2e78f9 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -10,13 +10,25 @@ success : 성공(초록) info : 인포(파랑) */--> -
+

홍길동님,

- - 일계부를 등록하지 않은 날짜가 있습니다.
- 정확한 조사를 위해 꾸준히 입력해 주세요. + + 일계부를 등록하지 않은 날짜가 있습니다.
+ 정확한 조사를 위해 꾸준히 입력해 주세요. +
+ + 이번 달 임산물 현황이 등록되지 않았습니다.
+ 정확한 조사를 위해 매월 1회 입력해 주세요. +
+ + 이번 달 자동이체 내역이 등록되지 않았습니다.
+ 정확한 조사를 위해 매월 1회 입력해 주세요. +
+ + 일계부를 성실하게 등록하고 계십니다.
+ 정확한 조사를 위해 지금처럼 계속 입력해 주세요.