[FO] 일계부 권고메세지 재정의

This commit is contained in:
김현주
2025-07-08 17:36:02 +09:00
parent 2415a3090e
commit 436826e02b
13 changed files with 111 additions and 96 deletions

View File

@@ -1,5 +1,6 @@
package app.module.core.config.application.util; 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 app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -84,13 +85,13 @@ public class DailyUtil {
/** /**
* 데이터 수정 가능 여부 * 데이터 수정 가능 여부
* [정책] 15일전까지 데이터 수정 가능(등록도 불가) *
* @param startDate * @param startDate 시작일
* @param endDate * @param endDate 종료일
* @return true=수정 가능, false=수정 불가 * @return true=수정 가능, false=수정 불가
*/ */
public boolean isModifiable(LocalDate startDate, LocalDate endDate) { 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); log.debug("isModifiable @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate)); return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
@@ -98,12 +99,13 @@ public class DailyUtil {
/** /**
* 데이터 등록 가능 여부 * 데이터 등록 가능 여부
* @param startDate *
* @param endDate * @param startDate 시작일
* @return * @param endDate 종료일
* @return true=등록 가능, false=등록 불가
*/ */
public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) { 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); log.debug("isRegisterPossible @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate)); return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate));

View File

@@ -34,4 +34,16 @@ public class DailyRecordConstants {
* [정책] 81011 고정 * [정책] 81011 고정
*/ */
public static final String FORESTRY_EXPENSE_MARK = "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;
} }

View File

@@ -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.DailyTargetStatus;
import app.module.core.config.application.enums.MonthStatus; import app.module.core.config.application.enums.MonthStatus;
import app.module.core.config.application.util.DailyUtil; 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.DailyRecordCalendarDto;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; 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.RecordCalendarPortOut;
@@ -34,7 +35,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
public List<RecordCalendar> operate(RecordCalendarCmd command) { public List<RecordCalendar> operate(RecordCalendarCmd command) {
List<DailyRecordCalendarDto> calendarList = this.getCalendarList(command); List<DailyRecordCalendarDto> calendarList = this.getCalendarList(command);
List<DailyRecordStatusDto> statusList = this.getDailyRecordStatus(command); List<DailyRecordStatusDto> statusList = this.getDailyRecordStatus(command);
MonthlyStatusDto monthlyStatus = this.getBankExist(command); MonthlyStatusDto monthlyStatus = this.getMonthlyStatus(command);
String pathFormat = "/record/%s/%s/%s"; String pathFormat = "/record/%s/%s/%s";
@@ -136,9 +137,18 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
} }
@Override @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 @Override
@@ -189,18 +199,6 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
return statusList; 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;
}
/** /**
* 미작성 목록 조회 * 미작성 목록 조회
* *

View File

@@ -1,10 +1,11 @@
package app.module.front.usecase.daily.calendar.adapters.persistence; 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.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.adapters.persistence.model.MonthlyStatusDto;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@@ -27,12 +28,13 @@ public interface RecordCalendarMapper {
MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command); MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command);
/** /**
* 3일전 ~ 15일전 미등록된 데이터 개수 조회 * 등록가능 기간에 미등록된 데이터 개수 조회
* *
* @param householdSeq 임가회원 일련번호 * @param householdSeq 임가회원 일련번호
* @param limitDay 전일로부터 x일전 검색 일
* @return 미등록 건 수 * @return 미등록 건 수
*/ */
Integer getDataNoneCountBySomeDayAfter(Long householdSeq); Integer getDataNoneCountBySomeDayAfter(@Param("householdSeq") Long householdSeq, @Param("limitDay") Integer limitDay);
/** /**
* 최신 등록일 데이터 조회 * 최신 등록일 데이터 조회

View File

@@ -28,7 +28,7 @@ public class RecordCalendarUIController {
model.addAttribute("reqVO", reqVO); model.addAttribute("reqVO", reqVO);
model.addAttribute("dailyDataNone", recordCalendarPortIn.getDataNoneCountBySomeDayAfter()); model.addAttribute("dailyDataNone", recordCalendarPortIn.getDailyNone(reqVO));
return "record/calendar"; return "record/calendar";
} }

View File

@@ -1,5 +1,7 @@
package app.module.front.usecase.daily.calendar.ports; 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.RecordCalendar;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; 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);
/** /**
* 일계부 최신 데이터 등록일 조회 * 일계부 최신 데이터 등록일 조회

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.calendar.ports; 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.RecordCalendar;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
@@ -9,6 +10,8 @@ import java.util.List;
public interface RecordCalendarPortOut { public interface RecordCalendarPortOut {
List<RecordCalendar> operate(RecordCalendarCmd command); List<RecordCalendar> operate(RecordCalendarCmd command);
MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command);
int getDataNoneCountBySomeDayAfter(Long householdSeq); int getDataNoneCountBySomeDayAfter(Long householdSeq);
DailyRecordStatusDto getLatestDate(Long householdSeq); DailyRecordStatusDto getLatestDate(Long householdSeq);

View File

@@ -1,6 +1,8 @@
package app.module.front.usecase.daily.calendar.ports.application; package app.module.front.usecase.daily.calendar.ports.application;
import app.module.front.config.application.util.AuthUtil; 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.RecordCalendarPortIn;
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut; 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.RecordCalendar;
@@ -25,10 +27,24 @@ public class RecordCalendarService implements RecordCalendarPortIn {
} }
@Override @Override
public boolean getDataNoneCountBySomeDayAfter() { public String getDailyNone(RecordCalendarUIReqVO reqVO) {
int dataNoneCount = portOut.getDataNoneCountBySomeDayAfter(AuthUtil.getUserSeq()); 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 @Override

View File

@@ -16,8 +16,7 @@ public class RecordCalendar {
private Integer no; private Integer no;
private Integer start; private Integer start;
private Integer end; private Integer end;
//TODO : JsonIgnore @JsonIgnore
// @JsonIgnore
private LocalDate startDate; private LocalDate startDate;
@JsonIgnore @JsonIgnore
private LocalDate endDate; private LocalDate endDate;

View File

@@ -38,7 +38,7 @@ class GetInfoUIController {
: null); : null);
model.addAttribute("userInfo", getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); 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()); model.addAttribute("dailyLatest", recordCalendarPortIn.getLatestDate());
return "info/main"; return "info/main";

View File

@@ -29,58 +29,14 @@
<select id="getDataNoneCountBySomeDayAfter"> <select id="getDataNoneCountBySomeDayAfter">
<![CDATA[ <![CDATA[
with temp_day_group as ( with register_period as (
select group_no, start_day, end_day select generate_series((CURRENT_DATE - INTERVAL '${limitDay} days')::date , (CURRENT_DATE - INTERVAL '1 days')::date, '1 day'::interval)::date as record_date
, DATE_PART('day', CURRENT_DATE - INTERVAL '3 days') as current_day
, DATE_PART('day', CURRENT_DATE - INTERVAL '15 days') as prev_day
, DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days') as prev_last_day
, DATE_PART('month', CURRENT_DATE - INTERVAL '3 days') as current_month1
, DATE_PART('month', CURRENT_DATE - INTERVAL '15 days') as prev_month
, TO_CHAR(CURRENT_DATE, 'YYYYMM') as current_month
from daily_day_group
where DATE_PART('month', CURRENT_DATE - INTERVAL '3 days') = DATE_PART('month', CURRENT_DATE - INTERVAL '15 days')
and (
(
start_day >= DATE_PART('day', CURRENT_DATE - INTERVAL '15 days') and end_day <= DATE_PART('day', CURRENT_DATE - INTERVAL '3 days'))
or start_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
or end_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
or start_day = DATE_PART('day', CURRENT_DATE - INTERVAL '15 days')
or end_day = DATE_PART('day', CURRENT_DATE - INTERVAL '15 days')
)
union all
select group_no, start_day, end_day
, DATE_PART('day', CURRENT_DATE - INTERVAL '3 days') as current_day
, DATE_PART('day', CURRENT_DATE - INTERVAL '15 days') as prev_day
, DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days') as prev_last_day
, DATE_PART('month', CURRENT_DATE - INTERVAL '3 days') as current_month1
, DATE_PART('month', CURRENT_DATE - INTERVAL '15 days') as prev_month
, (case when start_day <= 16 then
TO_CHAR(CURRENT_DATE, 'YYYYMM')
else
TO_CHAR(CURRENT_DATE - INTERVAL '15 days', 'YYYYMM')
end
) as current_month
from daily_day_group
where DATE_PART('month', CURRENT_DATE - INTERVAL '3 days') != DATE_PART('month', CURRENT_DATE - INTERVAL '15 days')
and (
-- 현재월 DAY 조회
start_day >= 1 and end_day <= DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
or start_day >= DATE_PART('day', CURRENT_DATE - INTERVAL '15 days') and end_day <= DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days')
-- 3일전 DAY 로 시작, 종료일이 같은지 여부
or start_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
or end_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
-- 이전월 마지막 DAY 로 시작, 종료일이 같은지 여부
or start_day = DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days')
or end_day = DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days')
)
) )
select case when count(tdg.group_no) = count(dr.id) then 0 else count(tdg.group_no) - count(dr.id) end select count(rp.record_date) filter (where dr.id is null or dr.all_status = 'WAITING')
from temp_day_group tdg from register_period rp
left join left join
daily_record dr on dr.record_month = tdg.current_month and dr.day_group_no = tdg.group_no daily_record dr on dr.household_seq = #{householdSeq} and dr.is_deleted = false
and dr.household_seq = #{householdSeq} and dr.start_date <= rp.record_date and dr.end_date >= rp.record_date
]]> ]]>
</select> </select>

View File

@@ -12,12 +12,24 @@
info : 인포(파랑) info : 인포(파랑)
*/--> */-->
<article class="alert-box warning" <article class="alert-box warning"
th:if="${dailyDataNone}"> th:classappend="${#strings.equals(dailyDataNone, 'DONE')} ? 'success' : 'warning'">
<p class="tit"><strong th:text="${userInfo?.ownerName}">홍길동</strong>님,</p> <p class="tit"><strong th:text="${userInfo?.ownerName}">홍길동</strong>님,</p>
<span class="txt"> <span class="txt" th:if="${#strings.equals(dailyDataNone, 'DATA_NONE')}">
일계부를 등록하지 않은 날짜가 있습니다. <br> 일계부를 등록하지 않은 날짜가 있습니다. <br>
정확한 조사를 위해 꾸준히 입력해 주세요. 정확한 조사를 위해 꾸준히 입력해 주세요.
</span> </span>
<span class="txt" th:if="${#strings.equals(dailyDataNone, 'FOREST_NONE')}">
이번 달 임산물 현황이 등록되지 않았습니다. <br>
정확한 조사를 위해 매월 1회 입력해 주세요.
</span>
<span class="txt" th:if="${#strings.equals(dailyDataNone, 'BANK_NONE')}">
이번 달 자동이체 내역이 등록되지 않았습니다. <br>
정확한 조사를 위해 매월 1회 입력해 주세요.
</span>
<span class="txt" th:if="${#strings.equals(dailyDataNone, 'DONE')}">
일계부를 성실하게 등록하고 계십니다. <br>
정확한 조사를 위해 지금처럼 계속 입력해 주세요.
</span>
</article> </article>
<section class="info-top-area"> <section class="info-top-area">

View File

@@ -10,13 +10,25 @@
success : 성공(초록) success : 성공(초록)
info : 인포(파랑) info : 인포(파랑)
*/--> */-->
<article class="alert-box warning" <article class="alert-box"
th:if="${dailyDataNone}"> th:classappend="${#strings.equals(dailyDataNone, 'DONE')} ? 'success' : 'warning'">
<p class="tit" <p class="tit"
sec:authorize="isAuthenticated()"><strong th:text="${#authentication.principal.ownerName}">홍길동</strong>님,</p> sec:authorize="isAuthenticated()"><strong th:text="${#authentication.principal.ownerName}">홍길동</strong>님,</p>
<span class="txt"> <span class="txt" th:if="${#strings.equals(dailyDataNone, 'DATA_NONE')}">
일계부를 등록하지 않은 날짜가 있습니다. <br> 일계부를 등록하지 않은 날짜가 있습니다. <br>
정확한 조사를 위해 꾸준히 입력해 주세요. 정확한 조사를 위해 꾸준히 입력해 주세요.
</span>
<span class="txt" th:if="${#strings.equals(dailyDataNone, 'FOREST_NONE')}">
이번 달 임산물 현황이 등록되지 않았습니다. <br>
정확한 조사를 위해 매월 1회 입력해 주세요.
</span>
<span class="txt" th:if="${#strings.equals(dailyDataNone, 'BANK_NONE')}">
이번 달 자동이체 내역이 등록되지 않았습니다. <br>
정확한 조사를 위해 매월 1회 입력해 주세요.
</span>
<span class="txt" th:if="${#strings.equals(dailyDataNone, 'DONE')}">
일계부를 성실하게 등록하고 계십니다. <br>
정확한 조사를 위해 지금처럼 계속 입력해 주세요.
</span> </span>
</article> </article>