From 68039e2b342407a5de5968e162a9b94eb4a57e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 20 Jun 2025 13:50:43 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=B4=EC=A0=95=EB=B3=B4=20>=20=EC=B5=9C?= =?UTF-8?q?=EA=B7=BC=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EB=82=A0=EC=A7=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/domain/GetHousehold.java | 4 ++ .../mappers/household/GetHouseholdMapper.xml | 60 +++++++++++-------- .../main/resources/templates/info/main.html | 9 ++- 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java index aa5e40ea..dc64f04a 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java @@ -2,6 +2,8 @@ package app.module.core.usecase.household.getHousehold.ports.application.domain; import app.module.core.config.adapters.web.security.domain.CoreRole; import app.module.core.config.application.enums.SignUpType; + +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Set; import lombok.AllArgsConstructor; @@ -34,6 +36,8 @@ public class GetHousehold { private Boolean isPanel; private String memo; private String dropReason; + private LocalDate latestRegisterStartDate; + private LocalDate latestRegisterEndDate; private LocalDateTime createdAt; private String createdBy; private LocalDateTime updatedAt; diff --git a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml index b3995c19..ac18afdc 100644 --- a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml +++ b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml @@ -7,32 +7,39 @@ @@ -54,6 +61,7 @@ JOIN role r ON hhr.role_id = r.id AND r.is_deleted = false LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = false LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = false + LEFT JOIN daily_record dr ON dr.household_seq = hhr.household_seq WHERE hhr.household_seq = #{seq} AND hhr.is_deleted = false diff --git a/front/src/main/resources/templates/info/main.html b/front/src/main/resources/templates/info/main.html index 7e857ad0..31f2669f 100644 --- a/front/src/main/resources/templates/info/main.html +++ b/front/src/main/resources/templates/info/main.html @@ -11,7 +11,7 @@ success : 성공(초록) info : 인포(파랑) --> -
+

홍길동님,

일계부를 등록하지 않은 날짜가 있습니다.
@@ -24,10 +24,9 @@
-
- - +
+ 최근등록 :
+
등록된 일계부가 없습니다.