diff --git a/admin/src/main/resources/templates/common/components.html b/admin/src/main/resources/templates/common/components.html index 69e79b9d..a1240d0b 100644 --- a/admin/src/main/resources/templates/common/components.html +++ b/admin/src/main/resources/templates/common/components.html @@ -53,7 +53,7 @@ - + diff --git a/admin/src/main/resources/templates/layout/layout-login.html b/admin/src/main/resources/templates/layout/layout-login.html index d18886ba..2e68abee 100644 --- a/admin/src/main/resources/templates/layout/layout-login.html +++ b/admin/src/main/resources/templates/layout/layout-login.html @@ -1,7 +1,12 @@ - + + + + + +
diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 31a06354..a0cd3256 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -45,7 +45,7 @@
- + -
-
-

- -

-
-
-
- +
+
+

+ +

+
+
+
+ +
-
-
- -
- +
+ +
+ +
  • @@ -55,15 +54,12 @@
-
- - - +
diff --git a/admin/src/main/resources/templates/uiCode/uiCodeList.html b/admin/src/main/resources/templates/uiCode/uiCodeList.html index 5189521c..46fcc19a 100644 --- a/admin/src/main/resources/templates/uiCode/uiCodeList.html +++ b/admin/src/main/resources/templates/uiCode/uiCodeList.html @@ -168,7 +168,7 @@ function renderNode(node, parentUl, depth) { const li = document.createElement('li'); // 1depth와 2depth는 기본적으로 확장, 3depth는 축소 - li.className = depth <= 2 ? 'open' : ''; + li.className = depth <= 1 ? '' : 'folding'; const button = document.createElement('button'); button.type = 'button'; 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 @@
-
- - +
+ 최근등록 :
+
등록된 일계부가 없습니다.