From d775238165c4d7ebf985d23ff9efe7133c41e7af 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 11:20:11 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=A1=B0=EC=82=AC=EC=9B=90=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B6=84=EA=B8=B0?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/researcher/detail.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 @@
- +
SELECT - seq, - household_num, - owner_name, - owner_age, - tel, - phone, - password, - region_main_code, - region_sub_code, - region_detail_code, - address, - industry_large_code, - industry_middle_code, - industry_sub_middle, - industry_detail, - employment_code, - is_panel, - memo, - drop_reason, - created_at, - created_by, - updated_at, - updated_by - FROM household - WHERE household_num = #{householdNum} - AND is_deleted = false + h.seq, + h.household_num, + h.owner_name, + h.owner_age, + h.tel, + h.phone, + h.password, + h.region_main_code, + h.region_sub_code, + h.region_detail_code, + h.address, + h.industry_large_code, + h.industry_middle_code, + h.industry_sub_middle, + h.industry_detail, + h.employment_code, + h.is_panel, + h.memo, + h.drop_reason, + dr.start_date as latest_register_start_date, + dr.end_date as latest_register_end_date, + h.created_at, + h.created_by, + h.updated_at, + h.updated_by + FROM household h + LEFT JOIN ( + SELECT start_date , end_date ,household_seq + FROM daily_record dr + ORDER BY start_date desc + LIMIT 1 ) dr ON dr.household_seq = h.seq + WHERE h.household_num = #{householdNum} + AND h.is_deleted = false @@ -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 @@
-
- - +
+ 최근등록 :
+
등록된 일계부가 없습니다.
From d8d8bc8b85f7d8b47338bb4a9bafbe48df6411a5 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 14:19:55 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/common/components.html | 2 +- .../templates/layout/layout-login.html | 7 +- .../resources/templates/security/login.html | 72 +++++++++---------- .../templates/uiCode/uiCodeList.html | 2 +- 4 files changed, 42 insertions(+), 41 deletions(-) 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/security/login.html b/admin/src/main/resources/templates/security/login.html index 6ed0a558..6cde9987 100644 --- a/admin/src/main/resources/templates/security/login.html +++ b/admin/src/main/resources/templates/security/login.html @@ -4,47 +4,46 @@
-
- -
-
+
+
kri 로고 이미지 -
+
-
-
-

- -

-
-
-
- + +
+
+

+ +

+
+
+
+ +
-
-
-
-

- -

-
-
-
- +
+
+

+ +

+
+
+
+ +
-
-
- -
-
    -
  • 정보시스템 보호 정책 강화로 IP접근 통제가 시행됩니다.
  • -
  • 공식가입센터 관리자 바로가기
  • -
+
+ +
+
    +
  • 공식가입센터 관리자 바로가기
  • +
+
  • @@ -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';