[FO] 일계부 단계에서 건의사항 팝업 오픈 수정, TODO 정리
This commit is contained in:
@@ -51,24 +51,29 @@ public class DailyUtil {
|
||||
}
|
||||
|
||||
/**
|
||||
* 검색 일의 마지막 일 조회
|
||||
* @param searchDate 검색
|
||||
* 마지막 일 조회
|
||||
*
|
||||
* @param searchDate 검색일
|
||||
* @return 마지막 일
|
||||
*/
|
||||
public int getLastDay(LocalDate searchDate) {
|
||||
return searchDate.withDayOfMonth(searchDate.lengthOfMonth()).getDayOfMonth();
|
||||
if (searchDate != null) {
|
||||
return searchDate.withDayOfMonth(searchDate.lengthOfMonth()).getDayOfMonth();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 자가농업 항목 오픈 여부
|
||||
* [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날
|
||||
*
|
||||
* @param groupNo
|
||||
* @param searchDate 종료일
|
||||
* @param groupNo 그룹번호
|
||||
* @param endDate 종료일
|
||||
* @return true=대상, false=대상 아님
|
||||
*/
|
||||
public boolean isFarmingOpen(int groupNo, LocalDate searchDate) {
|
||||
return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay(searchDate);
|
||||
public boolean isFarmingOpen(int groupNo, LocalDate endDate) {
|
||||
return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay(endDate);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -13,7 +13,6 @@ import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCa
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
|
||||
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@@ -43,14 +42,14 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
|
||||
monthlyList.add(new CalendarChildren(
|
||||
"MONTHLY",
|
||||
"임산물 현황 등록",
|
||||
null, // TODO
|
||||
null,
|
||||
monthlyStatus.isForestNone() ? 0 : 1,
|
||||
monthlyStatus.isForestNone() ? "/info/monthly" : String.format("/info/monthly/month/%s", command.getSearchMonth())));
|
||||
|
||||
monthlyList.add(new CalendarChildren(
|
||||
"BANK",
|
||||
"은행 자동이체 내역 등록",
|
||||
null, // TODO
|
||||
null,
|
||||
monthlyStatus.isBankNone() ? 0 : 1,
|
||||
(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")).equals(command.getSearchMonth())) ? "/info/bank" : null));
|
||||
|
||||
@@ -60,9 +59,9 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
|
||||
refine.setNo(calendar.getGroupNo());
|
||||
refine.setStart(calendar.getStartDay());
|
||||
refine.setEnd(calendar.getEndDay());
|
||||
|
||||
refine.setStartDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getStartDay()));
|
||||
refine.setEndDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getEndDay()));
|
||||
|
||||
refine.setRegistrable(dailyUtil.isRegisterPossible(refine.getStartDate(), refine.getEndDate()));
|
||||
refine.setModifiable(dailyUtil.isModifiable(refine.getStartDate(), refine.getEndDate()));
|
||||
|
||||
@@ -72,64 +71,59 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
|
||||
|
||||
List<CalendarChildren> childList = new ArrayList<>();
|
||||
if (findStatus == null) {
|
||||
// 등록이 가능하지 않을 경우 미작성 데이터 반환
|
||||
if (!dailyUtil.isRegisterPossible(refine.getStartDate(), refine.getEndDate())) {
|
||||
childList.addAll(this.getNoneChildList(dailyUtil.isFarmingOpen(refine.getNo(), refine.getEndDate())));
|
||||
childList.addAll(this.getNoneChildrenList(dailyUtil.isFarmingOpen(refine.getNo(), refine.getEndDate())));
|
||||
}
|
||||
|
||||
} else {
|
||||
if (DailyTargetStatus.TARGET.equals(findStatus.getIncomeStatus())
|
||||
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getIncomeStatus())) {
|
||||
if (!DailyTargetStatus.TARGET.equals(findStatus.getIncomeStatus())) {
|
||||
childList.add(new CalendarChildren(
|
||||
DailySort.INCOME.name(),
|
||||
DailySort.INCOME.getDesc(),
|
||||
findStatus.getIncomeStatus(),
|
||||
findStatus.getIncomeCount(),
|
||||
String.format(pathFormat, "income", command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
String.format(pathFormat, DailySort.INCOME.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
}
|
||||
if (DailyTargetStatus.TARGET.equals(findStatus.getWorkStatus())
|
||||
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getWorkStatus())) {
|
||||
if (!DailyTargetStatus.NONE.equals(findStatus.getWorkStatus())) {
|
||||
childList.add(new CalendarChildren(
|
||||
DailySort.WORK.name(),
|
||||
DailySort.WORK.getDesc(),
|
||||
findStatus.getWorkStatus(),
|
||||
findStatus.getWorkCount(),
|
||||
String.format(pathFormat, "work", command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
String.format(pathFormat, DailySort.WORK.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
}
|
||||
if (DailyTargetStatus.TARGET.equals(findStatus.getExpenseStatus())
|
||||
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getExpenseStatus())) {
|
||||
if (!DailyTargetStatus.NONE.equals(findStatus.getExpenseStatus())) {
|
||||
childList.add(new CalendarChildren(
|
||||
DailySort.EXPENSE.name(),
|
||||
DailySort.EXPENSE.getDesc(),
|
||||
findStatus.getExpenseStatus(),
|
||||
findStatus.getExpenseCount(),
|
||||
String.format(pathFormat, "expense", command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
String.format(pathFormat, DailySort.EXPENSE.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
}
|
||||
if (DailyTargetStatus.TARGET.equals(findStatus.getPowerStatus())
|
||||
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getPowerStatus())) {
|
||||
if (!DailyTargetStatus.NONE.equals(findStatus.getPowerStatus())) {
|
||||
childList.add(new CalendarChildren(
|
||||
DailySort.POWER.name(),
|
||||
DailySort.POWER.getDesc(),
|
||||
findStatus.getPowerStatus(),
|
||||
findStatus.getPowerCount(),
|
||||
String.format(pathFormat, "power", command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
String.format(pathFormat, DailySort.POWER.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
}
|
||||
if (DailyTargetStatus.TARGET.equals(findStatus.getForestryStatus())
|
||||
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getForestryStatus())) {
|
||||
if (!DailyTargetStatus.NONE.equals(findStatus.getForestryStatus())) {
|
||||
childList.add(new CalendarChildren(
|
||||
DailySort.FORESTRY.name(),
|
||||
DailySort.FORESTRY.getDesc(),
|
||||
findStatus.getForestryStatus(),
|
||||
findStatus.getForestryCount(),
|
||||
String.format(pathFormat, "forestry", command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
String.format(pathFormat, DailySort.FORESTRY.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
}
|
||||
if (DailyTargetStatus.TARGET.equals(findStatus.getFarmingStatus())
|
||||
|| DailyTargetStatus.TODAY_NONE.equals(findStatus.getFarmingStatus())) {
|
||||
if (!DailyTargetStatus.NONE.equals(findStatus.getFarmingStatus())) {
|
||||
childList.add(new CalendarChildren(
|
||||
DailySort.FARMING.name(),
|
||||
DailySort.FARMING.getDesc(),
|
||||
findStatus.getFarmingStatus(),
|
||||
findStatus.getFarmingCount(),
|
||||
String.format(pathFormat, "farming", command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
String.format(pathFormat, DailySort.FARMING.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,23 +135,6 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
|
||||
return refineList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 미작성 목록 조회
|
||||
*
|
||||
* @param farmingOpen
|
||||
* @return 미작성 목록
|
||||
*/
|
||||
private List<CalendarChildren> getNoneChildList(boolean farmingOpen) {
|
||||
List<CalendarChildren> childList = new ArrayList<>();
|
||||
for (DailySort type : DailySort.values()) {
|
||||
if (!DailySort.FARMING.equals(type) || (DailySort.FARMING.equals(type) && farmingOpen)) {
|
||||
childList.add(new CalendarChildren(type.name(),type.getDesc()));
|
||||
}
|
||||
}
|
||||
|
||||
return childList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDataNoneCountBySomeDayAfter(Long householdSeq) {
|
||||
|
||||
@@ -173,8 +150,8 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
|
||||
/**
|
||||
* 특정월의 일 그룹 조회
|
||||
*
|
||||
* @param command
|
||||
* @return
|
||||
* @param command 검색 조건
|
||||
* @return 일 그룹 목록
|
||||
*/
|
||||
private List<DailyRecordCalendarDto> getCalendarList(RecordCalendarCmd command) {
|
||||
List<DailyRecordCalendarDto> calendarList = recordCalendarMapper.getCalendarByDailyRecord(command);
|
||||
@@ -182,8 +159,8 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
|
||||
List<DailyRecordCalendarDto> refineList = new ArrayList<>();
|
||||
for (DailyRecordCalendarDto calendar : calendarList) {
|
||||
LocalDate startDate = dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getStartDay());
|
||||
LocalDate endDate = dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getEndDay());
|
||||
int lastDay = dailyUtil.getLastDay(startDate);
|
||||
|
||||
calendar.setStartDate(startDate.toString());
|
||||
|
||||
if ((lastDay == 28 || lastDay == 30) && calendar.getStartDay() == lastDay) {
|
||||
@@ -200,8 +177,8 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
|
||||
/**
|
||||
* 특정월의 일계부 등록 상태 조회
|
||||
*
|
||||
* @param command
|
||||
* @return
|
||||
* @param command 검색 조건
|
||||
* @return 일계부 목록
|
||||
*/
|
||||
private List<DailyRecordStatusDto> getDailyRecordStatus(RecordCalendarCmd command) {
|
||||
List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(new GetDailyRecordCmd(command.getSearchMonth(), null, command.getHouseholdSeq()));
|
||||
@@ -223,4 +200,21 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
|
||||
|
||||
return detail == null ? new MonthlyStatusDto(MonthStatus.NONE, MonthStatus.NONE, MonthStatus.NONE) : detail;
|
||||
}
|
||||
|
||||
/**
|
||||
* 미작성 목록 조회
|
||||
*
|
||||
* @param farmingOpen 자가농업 항목 오픈 여부
|
||||
* @return 미작성 목록
|
||||
*/
|
||||
private List<CalendarChildren> getNoneChildrenList(boolean farmingOpen) {
|
||||
List<CalendarChildren> childList = new ArrayList<>();
|
||||
for (DailySort type : DailySort.values()) {
|
||||
if (!DailySort.FARMING.equals(type) || (DailySort.FARMING.equals(type) && farmingOpen)) {
|
||||
childList.add(new CalendarChildren(type.name(),type.getDesc()));
|
||||
}
|
||||
}
|
||||
|
||||
return childList;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ public class RecordCalendarUIReqVO extends DailyUIReqVO {
|
||||
}
|
||||
|
||||
/**
|
||||
* 검색 일(yyyy-MM-dd)
|
||||
* 검색일(yyyy-MM-dd)
|
||||
*/
|
||||
private LocalDate searchDate;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user