Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
김현주
2025-06-20 15:12:51 +09:00
8 changed files with 88 additions and 76 deletions

View File

@@ -53,7 +53,7 @@
<script th:src="@{/static/library/jsUri/Uri.js}"></script>
<script th:src="@{/static/library/jsRender/jsrender.min.js}"></script>
<script th:src="@{/static/library/bootstrap/bootstrap.min.js}"></script>
<!-- <script th:src="@{/static/library/bootstrap/bootstrap.min.js}"></script>-->
<script th:src="@{/static/ui/uiUtil.js}"></script>
<script th:src="@{/static/library/jquery/jquery-serializeObject.min.js}"></script>
<script th:src="@{/static/scripts/ajaxUtils.js}"></script>

View File

@@ -1,7 +1,12 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org">
<head th:replace="~{common/components :: head}"></head>
<head>
<link rel="stylesheet" th:href="@{/static/assets/styles/style.css}" />
<script th:src="@{/static/assets/scripts/common.ui.plugin.js}" ></script>
<script th:src="@{/static/assets/scripts/common.ui.js}" ></script>
<script th:src="@{/static/assets/scripts/common.js}"></script>
</head>
<body>
<div id="wrap">

View File

@@ -45,7 +45,7 @@
<div class="component-tab" data-active="tab1">
<div class="tab-head">
<button type="button" class="tab-label" data-tab-value="tab1">담당 임가 목록</button>
<button type="button" class="tab-label" data-tab-value="tab2">임가방문정보</button>
<button type="button" class="tab-label" data-tab-value="tab2" th:unless="${activeProfile != 'local'}">임가방문정보</button>
<div class="component-select select-date" id="monthTab2" style="display: none;">
<select name="searchMonth" class="select-list search-month-container" onchange="getHouseholdVisitList(0);">
<option th:each="month : ${monthList}"
@@ -67,7 +67,7 @@
<section class="table-group">
<div class="table-tit-group">
<h3>총 <strong id="household-totalElements"></strong>건</h3>
<div class="component-btns bottom-btn-group">
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small" th:data-researcher-seq="${researcherDto.seq}" th:data-region-main-code="${researcherDto.regionMainCode}" th:data-researcher-name="${researcherDto.name}" onclick="showHouseholdModal(this)">
<span class="btn-txt">임가 매핑</span>
@@ -95,7 +95,7 @@
</section>
</div>
</div>
<div class="tab-content" data-tab-value="tab2">
<div class="tab-content" data-tab-value="tab2" th:unless="${activeProfile != 'local'}">
<div class="content-inner">
<section class="table-group">
<div class="table-tit-group">
@@ -138,7 +138,7 @@
<span class="btn-txt">목록</span>
</button>
</div>
<div class="btns-col-2 align-right">
<div class="btns-col-2 align-right" th:unless="${activeProfile != 'local'}">
<button type="button" class="btn">
<span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
</button>

View File

@@ -4,47 +4,46 @@
<div layout:fragment="content">
<div id="content" role="main">
<form method="post" th:action="@{/login}" name="loginForm">
<div class="inner">
<div class="logo">
<div class="inner">
<div class="logo">
<img th:src="@{/static/assets/images/common/logo_kri.svg}" class="profile-img" alt="kri 로고 이미지" />
</div>
</div>
<div class="content-inner">
<section class="form-area">
<div class="input-group">
<div class="input-label">
<p class="label-txt">
<label for="floatingInput">아이디</label>
</p>
</div>
<div class="component-input">
<div class="input-field">
<input type="text" id="floatingInput" name="username" placeholder="아이디 입력">
<form method="post" th:action="@{/login}" name="loginForm">
<div class="input-group">
<div class="input-label">
<p class="label-txt">
<label for="floatingInput">아이디</label>
</p>
</div>
<div class="component-input">
<div class="input-field">
<input type="text" id="floatingInput" name="username" placeholder="아이디 입력">
</div>
</div>
</div>
</div>
<div class="input-group">
<div class="input-label">
<p class="label-txt">
<label for="floatingPassword">비밀번호</label>
</p>
</div>
<div class="component-input">
<div class="input-field">
<input type="password" id="floatingPassword" name="password" placeholder="비밀번호 입력">
<div class="input-group">
<div class="input-label">
<p class="label-txt">
<label for="floatingPassword">비밀번호</label>
</p>
</div>
<div class="component-input">
<div class="input-field">
<input type="password" id="floatingPassword" name="password" placeholder="비밀번호 입력">
</div>
</div>
</div>
</div>
<div class="component-btns">
<button type="submit" class="btn btn-primary btn-full" >
<span class="btn-txt">로그인</span>
</button>
</div>
<ul class="info-bullet-list">
<li>정보시스템 보호 정책 강화로 IP접근 통제가 시행됩니다.</li>
<li><a href="">공식가입센터 관리자 바로가기</a></li>
</ul>
<div class="component-btns">
<button type="submit" class="btn btn-primary btn-full" >
<span class="btn-txt">로그인</span>
</button>
</div>
<ul class="info-bullet-list">
<li><a href="">공식가입센터 관리자 바로가기</a></li>
</ul>
</form>
</section>
<ul class="logo-list">
<li>
@@ -55,15 +54,12 @@
</li>
</ul>
</div>
</div>
<!-- <div class="row" th:if="${session['SPRING_SECURITY_LAST_EXCEPTION']} != null">
<div class="alert alert-danger fw-bold"
th:utext="${session['SPRING_SECURITY_LAST_EXCEPTION'].message}">
</div>
</div>-->
</form>
</div>
</div>
</div>
<th:block layout:fragment="script">

View File

@@ -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';

View File

@@ -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;

View File

@@ -7,32 +7,39 @@
<select id="findByHouseholdNum"
resultType="app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold">
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
</select>
<resultMap id="HouseholdRoleHasPrivilegesMap" type="app.module.core.config.adapters.web.security.domain.CoreRole">
@@ -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
</select>

View File

@@ -11,7 +11,7 @@
success : 성공(초록)
info : 인포(파랑)
-->
<article class="alert-box warning" th:if="${isUnregisteredDate}"> <!-- TODO Controller 단에서 처리 필요. 임시 -->
<article class="alert-box warning" > <!-- TODO Controller 단에서 처리 필요. 임시 항상 노출로 수정 -->
<p class="tit"><strong th:text="${userInfo?.ownerName}">홍길동</strong>님,</p>
<span class="txt">
일계부를 등록하지 않은 날짜가 있습니다. <br>
@@ -24,10 +24,9 @@
<dl class="info-card">
<dt class="name" th:text="${userInfo?.ownerName}"></dt>
<dd class="location" th:text="${userInfo?.address}"></dd><!-- TODO 임가 주소 위치 임시로 . 처리함. -->
<dd class="date" th:if="${latestRegisteredDate != null or !#strings.isEmpty(latestRegisteredDate)}"
th:text="${'최근등록 : <span>'+latestRegisteredDate}+'</span>'"></dd>
<!-- TODO : 등록된 일계부가 없을 시 -->
<!-- <dd class="date">등록된 일게부가 없습니다.</dd> -->
<dd class="date" th:if="${userInfo.latestRegisterStartDate != null or !#strings.isEmpty(userInfo.latestRegisterStartDate)}">
최근등록 :<span th:text="${#temporals.format(userInfo.latestRegisterStartDate, 'M월 d일')+'-'+#temporals.format(userInfo.latestRegisterEndDate, 'd일')}"></span></dd>
<dd class="date" th:if="${userInfo.latestRegisterStartDate == null or #strings.isEmpty(userInfo.latestRegisterStartDate)}">등록된 일계부가 없습니다.</dd>
</dl>
<th:block th:if="${notice != null}">
<a th:href="@{'/info/notice/' + ${notice.id}}" class="notice-box">