From c0a50d3655afcc78b3b0fd9565ac9d2c34934c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Wed, 25 Jun 2025 09:29:08 +0900 Subject: [PATCH 01/19] =?UTF-8?q?[FO]=20=EC=97=90=EB=9F=AC=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20HTML=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/error/404.html | 42 +++++++-------- .../main/resources/templates/error/500.html | 50 +++++++----------- .../templates/layout/layout-error.html | 52 ++++++++++++++----- 3 files changed, 78 insertions(+), 66 deletions(-) diff --git a/front/src/main/resources/templates/error/404.html b/front/src/main/resources/templates/error/404.html index 250df487..0033f833 100644 --- a/front/src/main/resources/templates/error/404.html +++ b/front/src/main/resources/templates/error/404.html @@ -1,37 +1,33 @@ - + 404 - -
-
-
- -
-
-

- Oops, 404 Not Found :-(

-

- 존재하지 않는 URI 주소로 접근했습니다. 다시 확인해주세요. -

-

+

+
+
+ 요청하신 페이지를
+ 찾을 수 없습니다
+ 페이지를 찾을 수 없습니다.
+ 일계부 첫 화면으로 이동해 주세요.
+
+
+ +
+
+ +
Error
Message -

-
-
-
-
-
+ + + diff --git a/front/src/main/resources/templates/error/500.html b/front/src/main/resources/templates/error/500.html index a991b61e..28acf1ce 100644 --- a/front/src/main/resources/templates/error/500.html +++ b/front/src/main/resources/templates/error/500.html @@ -1,43 +1,33 @@ + xmlns:th="http://www.thymeleaf.org" lang="ko"> - 500 - 에러발생 + 500 - -
-
-
- -
-
-

- Oops, 에러가 발생했습니다! :-(

-

- 아래 에러 메세지를 담당자에게 전달해주세요. -

-

+

+
+
+ 요청하신 작업을
완료할 수 없습니다.
+ 서비스 이용 중 문제가 발생했습니다.
+ 잠시 후 다시 시도해 주세요.
+
+
+ + +
+
+ +
Error
Message - - - - - - -

-
-
-
-
-
-
+ + + - + \ No newline at end of file diff --git a/front/src/main/resources/templates/layout/layout-error.html b/front/src/main/resources/templates/layout/layout-error.html index ebf195a9..9be74fac 100644 --- a/front/src/main/resources/templates/layout/layout-error.html +++ b/front/src/main/resources/templates/layout/layout-error.html @@ -1,19 +1,45 @@ - + + + + + + + Error | KRI 임가경제조사 일계부 + + + + + + + + + + + + + + - -
-

Page content goes here

-
- -
-
-
- © 2022 All rights reserved -
-
+
+
+ page content +
- + From a654fcbce202dcc2ce0acf24b8c4013170d67cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Wed, 25 Jun 2025 10:07:58 +0900 Subject: [PATCH 02/19] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EC=9B=94=EB=B3=84=20=EC=86=8C=EC=8A=A4=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/RecordCalendarDao.java | 23 ++++-------------- .../persistence/RecordCalendarMapper.java | 8 +++---- .../web/RecordCalendarController.java | 5 ++++ .../web/RecordCalendarUIController.java | 5 ++++ .../calendar/ports/RecordCalendarPortIn.java | 2 +- .../calendar/ports/RecordCalendarPortOut.java | 5 ++-- .../application/RecordCalendarService.java | 24 +++++++++++++++---- .../mappers/daily/RecordCalendarMapper.xml | 7 ------ 8 files changed, 42 insertions(+), 37 deletions(-) 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 5d0d586c..f2569ffa 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 @@ -159,30 +159,15 @@ public class RecordCalendarDao implements RecordCalendarPortOut { } @Override - public boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command) { - int dataNoneCount = recordCalendarMapper.getDataNoneCountBySomeDayAfter(command); + public int getDataNoneCountBySomeDayAfter(Long householdSeq) { - return dataNoneCount != 0; + return recordCalendarMapper.getDataNoneCountBySomeDayAfter(householdSeq); } @Override - public String getLatestDate(RecordCalendarCmd command) { - String returnValue = null; - DailyRecordStatusDto detail = recordCalendarMapper.getLatestDate(command); - if (detail != null && detail.getStartDate() != null && detail.getEndDate() != null) { - if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) { - // 종료일의 달이 변경되면 시작일=종료일 처리 - detail.setEndDate(detail.getStartDate()); - } + public DailyRecordStatusDto getLatestDate(Long householdSeq) { - if (detail.getStartDate().equals(detail.getEndDate())) { - returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d일")); - } else { - returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d")) + "~" + detail.getEndDate().format(DateTimeFormatter.ofPattern("d일")); - } - } - - return returnValue; + return recordCalendarMapper.getLatestDate(householdSeq); } /** 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 6565701f..c03d1f1e 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 @@ -29,16 +29,16 @@ public interface RecordCalendarMapper { /** * 3일전 ~ 15일전 미등록된 데이터 개수 조회 * - * @param command 검색 조건 + * @param householdSeq 임가회원 일련번호 * @return 미등록 건 수 */ - Integer getDataNoneCountBySomeDayAfter(RecordCalendarCmd command); + Integer getDataNoneCountBySomeDayAfter(Long householdSeq); /** * 최신 등록일 데이터 조회 * - * @param command 검색 조건 + * @param householdSeq 임가회원 일련번호 * @return 최신 등록 데이터 */ - DailyRecordStatusDto getLatestDate(RecordCalendarCmd command); + DailyRecordStatusDto getLatestDate(Long householdSeq); } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java index d3ce0f14..ebae3594 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java @@ -22,6 +22,11 @@ import java.util.List; public class RecordCalendarController { private final RecordCalendarPortIn recordCalendarPortIn; + /** + * 일계부 월별 목록 + * + * @param searchMonth 검색 월(yyyyMM) + */ @GetMapping(path = "/{searchMonth}") public ResponseEntity list(@PathVariable("searchMonth") String searchMonth) { RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(searchMonth); 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 b33e7df4..1ea1440c 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 @@ -16,6 +16,11 @@ import org.springframework.web.bind.annotation.RequestMapping; public class RecordCalendarUIController { private final RecordCalendarPortIn recordCalendarPortIn; + /** + * 일계부 월별 현황 화면 + * + * @param model Model + */ @GetMapping(path = "") public String index(Model model) { RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(); 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 762fe3c0..ae177f0c 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 @@ -22,7 +22,7 @@ public interface RecordCalendarPortIn { boolean getDataNoneCountBySomeDayAfter(); /** - * 일계부 최신 데이터 조회 + * 일계부 최신 데이터 등록일 조회 * * @return 최신 등록 기간 */ 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 d4af4217..fbfe177a 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 @@ -2,13 +2,14 @@ package app.module.front.usecase.daily.calendar.ports; 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.record.adapters.persistence.model.DailyRecordStatusDto; import java.util.List; public interface RecordCalendarPortOut { List operate(RecordCalendarCmd command); - boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command); + int getDataNoneCountBySomeDayAfter(Long householdSeq); - String getLatestDate(RecordCalendarCmd command); + 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 2cc7c6c2..8fa7112e 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,14 +1,17 @@ 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.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.CalendarChildren; 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.record.adapters.persistence.model.DailyRecordStatusDto; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.time.format.DateTimeFormatter; import java.util.List; @Service @@ -25,15 +28,28 @@ public class RecordCalendarService implements RecordCalendarPortIn { @Override public boolean getDataNoneCountBySomeDayAfter() { - RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(); + int dataNoneCount = portOut.getDataNoneCountBySomeDayAfter(AuthUtil.getUserSeq()); - return portOut.getDataNoneCountBySomeDayAfter(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq())); + return dataNoneCount != 0; } @Override public String getLatestDate() { - RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(); + String returnValue = null; + DailyRecordStatusDto detail = portOut.getLatestDate(AuthUtil.getUserSeq()); + if (detail != null && detail.getStartDate() != null && detail.getEndDate() != null) { + if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) { + // 종료일의 달이 변경되면 시작일=종료일 처리 + detail.setEndDate(detail.getStartDate()); + } - return portOut.getLatestDate(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq())); + if (detail.getStartDate().equals(detail.getEndDate())) { + returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d일")); + } else { + returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d")) + "~" + detail.getEndDate().format(DateTimeFormatter.ofPattern("d일")); + } + } + + return returnValue; } } diff --git a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml index 3131677a..d44136d1 100644 --- a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml +++ b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml @@ -74,16 +74,9 @@ -- 이전월 마지막 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') - - /* - -- 현재 DAY 로 시작, 종료일이 같은지 여부 - or start_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days') - */ ) ) - --select count(tdg.group_no), count(dr.id) select case when count(tdg.group_no) = count(dr.id) then 0 else count(tdg.group_no) - count(dr.id) end - --select * from temp_day_group tdg left join daily_record dr on dr.record_month = tdg.current_month and dr.day_group_no = tdg.group_no From 3d7cfc32e8970802a070878bfc6130f22b2e8a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Wed, 25 Jun 2025 10:37:29 +0900 Subject: [PATCH 03/19] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EB=8B=A8=EA=B3=84=EC=97=90=EC=84=9C=20=EA=B1=B4=EC=9D=98?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=ED=8C=9D=EC=97=85=20=EC=98=A4=ED=94=88=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20TODO=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/application/util/DailyUtil.java | 19 +++-- .../persistence/RecordCalendarDao.java | 84 +++++++++---------- .../web/model/RecordCalendarUIReqVO.java | 2 +- .../templates/record/expense/index.html | 3 +- .../templates/record/farming/index.html | 3 +- .../templates/record/forestry/index.html | 3 +- .../templates/record/income/index.html | 3 +- .../templates/record/power/index.html | 3 +- .../templates/record/work/index.html | 3 +- 9 files changed, 64 insertions(+), 59 deletions(-) diff --git a/front/src/main/java/app/module/front/config/application/util/DailyUtil.java b/front/src/main/java/app/module/front/config/application/util/DailyUtil.java index 763e803d..57ec7d63 100644 --- a/front/src/main/java/app/module/front/config/application/util/DailyUtil.java +++ b/front/src/main/java/app/module/front/config/application/util/DailyUtil.java @@ -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); } /** 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 f2569ffa..0c811c4f 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 @@ -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 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 getNoneChildList(boolean farmingOpen) { - List 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 getCalendarList(RecordCalendarCmd command) { List calendarList = recordCalendarMapper.getCalendarByDailyRecord(command); @@ -182,8 +159,8 @@ public class RecordCalendarDao implements RecordCalendarPortOut { List 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 getDailyRecordStatus(RecordCalendarCmd command) { List 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 getNoneChildrenList(boolean farmingOpen) { + List 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; + } } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java index cd2df350..134ee23f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java @@ -27,7 +27,7 @@ public class RecordCalendarUIReqVO extends DailyUIReqVO { } /** - * 검색 일(yyyy-MM-dd) + * 검색일(yyyy-MM-dd) */ private LocalDate searchDate; diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index f298b838..0fae5f4f 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -105,7 +105,8 @@ - - - - - -
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/modal/modal-visit-info.html b/admin/src/main/resources/templates/households/modal/modal-visit-info.html index 7693e91d..5cad2367 100644 --- a/admin/src/main/resources/templates/households/modal/modal-visit-info.html +++ b/admin/src/main/resources/templates/households/modal/modal-visit-info.html @@ -5,7 +5,7 @@
- +