DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: DBNT:a0f462ae3e2163b215352b2df0f421defd2cf6fe
Branches Tags
DBNT:master
...
compare: DBNT:04e548ff2c82d4ae0cd583eb222a4c90bd7d88cc
Branches Tags
DBNT:master

2 Commits
a0f462ae3e ... 04e548ff2c

Author SHA1 Message Date
강석 최 04e548ff2c Merge branch 'master' of http://118.219.150.34:50501/DBNT/FAISP 2022-11-01 13:31:45 +09:00
강석 최 34cf6c0787 헤더 수정. 
공지사항 페이지 디자인 수정.
 2022-11-01 13:31:42 +09:00
11 changed files with 104 additions and 39 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java
View File

@ -134,6 +134,7 @@ public class PublicBoardController {
publicBoard.setWrtOrgan(loginUser.getOgCd());
publicBoard.setWrtPart(loginUser.getOfcCd());
publicBoard.setWrtUserSeq(loginUser.getUserSeq());
publicBoard.setWrtUserGrd(loginUser.getTitleCd());
publicBoard.setWrtUserNm(loginUser.getUserNm());
publicBoard.setWrtDt(LocalDateTime.now());
}
@ -177,6 +178,7 @@ public class PublicBoardController {
comment.setWrtOrgan(loginUser.getOgCd());
comment.setWrtPart(loginUser.getOfcCd());
comment.setWrtUserSeq(loginUser.getUserSeq());
comment.setWrtUserGrd(loginUser.getTitleCd());
comment.setWrtUserNm(loginUser.getUserNm());
comment.setWrtDt(LocalDateTime.now());
publicBoardService.saveComment(comment);

2
src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicBoard.java
View File

@ -37,6 +37,8 @@ public class PublicBoard extends BaseModel {
private String wrtPart;
@Column(name = "wrt_user_seq")
private Integer wrtUserSeq;
@Column(name = "wrt_user_grd")
private String wrtUserGrd;
@Column(name = "wrt_user_nm")
private String wrtUserNm;
@Column(name = "wrt_dt")

2
src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicComment.java
View File

@ -32,6 +32,8 @@ public class PublicComment {
private String wrtPart;
@Column(name = "wrt_user_seq")
private Integer wrtUserSeq;
@Column(name = "wrt_user_grd")
private String wrtUserGrd;
@Column(name = "wrt_user_nm")
private String wrtUserNm;
@Column(name = "wrt_dt")

4
src/main/resources/mybatisMapper/PublicBoardMapper.xml
View File

@ -15,6 +15,9 @@
<if test="title != null and title != ''">
AND a.title LIKE CONCAT('%', #{title}, '%')
</if>
<if test="wrtUserNm != null and wrtUserNm != ''">
AND a.wrt_user_nm LIKE CONCAT('%', #{wrtUserNm}, '%')
</if>
<if test='startDate != null and startDate != ""'>
and a.wrt_dt >= #{startDate}::date
</if>
@ -53,6 +56,7 @@
a.wrt_organ,
a.wrt_part,
a.wrt_user_nm,
a.wrt_user_grd,
a.wrt_user_seq,
a.wrt_dt,
a.organ_chk,

BIN
src/main/resources/static/img/logo2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

82
src/main/resources/templates/fragments/header.html
View File

@ -2,38 +2,70 @@
<html lang="ko"
xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
<header th:fragment="headerFragment" class="d-flex flex-wrap justify-content-between py-1 px-3 border-bottom">
<div sec:authorize="isAnonymous()">
<a href="/" class="d-flex">
<img id="logo" th:src="@{/img/logo.png}" alt="logo" title="logo">
<!--<span class="fs-4">해양경찰청 파일관리 시스템</span>-->
<header th:fragment="headerFragment" class="border-bottom row justify-content-between py-1 px-3">
<div class="col-auto row justify-content-start">
<div class="col-auto">
<div class="navbar-header">
<a href="/" class="navbar-brand">
<img id="logo" th:src="@{/img/logo2.png}" alt="logo" title="logo">
</a>
</div>
<div>
<ul class="nav nav-pills">
</div>
<div class="col-auto my-auto">
<ul class="nav nav-pills navbar-brand">
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle text-black" data-bs-toggle="dropdown" aria-expanded="false">
<span class="d-lg-inline d-md-none">관리기능</span>
<b class="caret ms-1"></b>
</a>
<ul class="dropdown-menu">
<th:block sec:authorize="hasRole('ROLE_ADMIN')">
<li class="nav-item"><a href="/codeMgt/codeMgtPage" class="nav-link p-1 link-dark">코드관리</a></li>
<li class="nav-item"><a href="/organMgt/organMgtPage" class="nav-link p-1 link-dark">관서설정</a></li>
<li class="nav-item"><a href="/menuMgt/menuMgtPage" class="nav-link p-1 link-dark">메뉴관리</a></li>
<li><a href="/codeMgt/codeMgtPage" class="dropdown-item">코드관리</a></li>
<li><a href="/organMgt/organMgtPage" class="dropdown-item">관서설정</a></li>
<li><a href="/menuMgt/menuMgtPage" class="dropdown-item">메뉴관리</a></li>
<li><hr class="dropdown-divider"></li>
</th:block>
<th:block sec:authorize="hasRole('ROLE_SUB_ADMIN')">
<li class="nav-item"><a href="/userMgt/userMgtPage" class="nav-link p-1 link-dark">외사경찰관리</a></li>
<li class="nav-item"><a href="/authMgt/authMgtPage" class="nav-link p-1 link-dark">권한설정</a></li>
<li class="nav-item"><a href="#" class="nav-link p-1 link-dark">사용자로그</a></li>
<li class="nav-item"><a href="#" class="nav-link p-1 link-dark">접속설정</a></li>
<li><a href="/userMgt/userMgtPage" class="dropdown-item">외사경찰관리</a></li>
<li><a href="/authMgt/authMgtPage" class="dropdown-item">권한설정</a></li>
<li><a href="#" class="dropdown-item">사용자로그</a></li>
<li><a href="#" class="dropdown-item">접속설정</a></li>
</th:block>
</ul>
</div>
<div sec:authorize="isAuthenticated()">
<ul class="nav nav-pills">
<li class="nav-item"><a href="#" class="nav-link p-1 link-dark"><i class="bi bi-bell-fill"></i></a></li>
<li class="nav-item"><a href="/publicBoard/noticePage" class="nav-link p-1 link-dark">공지사항</a></li>
<li class="nav-item"><a href="/publicBoard/boardPage" class="nav-link p-1 link-dark">게시판</a></li>
<li class="nav-item"><a href="/publicBoard/referencePage?tabStatus=RPC001" class="nav-link p-1 link-dark">자료실</a></li>
<li class="nav-item"><a href="/publicBoard/qnaPage" class="nav-link p-1 link-dark">Q&A</a></li>
<li class="nav-item"><a href="/myInfo/myInfoPage" class="nav-link p-1 link-dark">마이페이지</a></li>
<li class="nav-item"><a href="/logout" class="nav-link p-1 link-dark">로그아웃</a></li>
</li>
<li class="nav-item">
<a href="/publicBoard/noticePage" class="nav-link link-dark">공지사항</a>
</li>
<li class="nav-item">
<a href="/publicBoard/boardPage" class="nav-link link-dark">게시판</a>
</li>
<li class="nav-item">
<a href="/publicBoard/referencePage?tabStatus=RPC001" class="nav-link link-dark">자료실</a>
</li>
<li class="nav-item">
<a href="/publicBoard/qnaPage" class="nav-link link-dark">Q&A</a>
</li>
</ul>
</div>
</header>
</div>
<div class="col-auto my-auto">
<ul class="nav nav-pills" sec:authorize="isAuthenticated()">
<li class="nav-item"><a href="#" class="nav-link link-dark"><i class="bi bi-bell-fill"></i></a></li>
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle text-black" data-bs-toggle="dropdown" aria-expanded="false">
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<th:block th:if="${commonCode.itemCd eq #authentication.principal.titleCd}">
<span class="d-lg-inline d-md-none" th:text="|${commonCode.itemValue} ${#authentication.principal.userNm}|">관리기능</span>
</th:block>
</th:block>
<b class="caret ms-1"></b>
</a>
<ul class="dropdown-menu">
<li><a href="/myInfo/myInfoPage" class="dropdown-item">마이페이지</a></li>
<li><a href="/logout" class="dropdown-item">로그아웃</a></li>
</ul>
</li>
</ul>
</div>
</header>
</html>

3
src/main/resources/templates/fragments/leftMenu.html
View File

@ -1,9 +1,6 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="mx-3 pt-3" th:fragment="leftMenuFragment">
<a href="/" class="d-flex">
<img id="logo" th:src="@{/img/logo.png}" alt="logo" title="logo">
</a>
<div class="flex-shrink-0 pe-3 py-3 bg-transparent">
<ul class="list-unstyled ps-0">
<li class="mb-1" th:each="firstMenu:${session.menuList}">

3
src/main/resources/templates/publicBoard/commentDiv.html
View File

@ -10,6 +10,9 @@
<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
<div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtPart}" th:text="${commonCode.itemValue}"></div>
</th:block>
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtUserGrd}" th:text="${commonCode.itemValue}"></div>
</th:block>
<div class="col-auto" th:text="${comment.wrtUserNm}"></div>
<div class="col-auto" th:text="|작성일시: ${#temporals.format(comment.wrtDt, 'yyyy-MM-dd HH:mm')}|"></div>
<div class="col-auto">

8
src/main/resources/templates/publicBoard/notice/noticeEditModal.html
View File

@ -13,10 +13,16 @@
<input type="hidden" name="wrtOrgan" th:value="${info.wrtOrgan}">
<input type="hidden" name="wrtPart" th:value="${info.wrtPart}">
<input type="hidden" name="wrtUserSeq" th:value="${info.wrtUserSeq}">
<input type="hidden" name="wrtUserGrd" th:value="${info.wrtUserGrd}">
<input type="hidden" name="wrtUserNm" th:value="${info.wrtUserNm}">
<div class="mb-3 row">
<label for="wrtUserNm" class="col-sm-2 col-form-label text-center">작성자</label>
<div class="col-sm-2">
<input type="text" class="form-control" id="wrtUserNm" name="wrtUserNm" th:value="${info.wrtUserNm}" readonly>
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<th:block th:if="${commonCode.itemCd eq info.wrtUserGrd}">
<input type="text" class="form-control" id="wrtUserNm" th:value="|${commonCode.itemValue} ${info.wrtUserNm}|" readonly>
</th:block>
</th:block>
</div>
<label for="wrtDt" class="col-sm-2 col-form-label text-center">작성일시</label>
<div class="col-sm-2">

13
src/main/resources/templates/publicBoard/notice/noticePage.html
View File

@ -27,7 +27,7 @@
</div>
<div class="col-auto">
<div class="row justify-content-end">
<div class="col-auto" sec:authorize="hasRole('ROLE_SUB_ADMIN')">
<div class="col-auto">
<select class="form-select form-select-sm" name="wrtOrgan">
<option value="">관서 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
@ -37,6 +37,9 @@
</th:block>
</select>
</div>
<div class="col-auto">
<input type="text" class="form-control form-control-sm" placeholder="작성자" name="wrtUserNm" th:value="${searchParams.wrtUserNm}">
</div>
<div class="col-auto">
<input type="text" class="form-control form-control-sm" placeholder="제목" name="title" th:value="${searchParams.title}">
</div>
@ -56,20 +59,21 @@
<div class="card">
<div class="card-body">
<div class="row">
<table class="table table-hover">
<table class="table table-hover table-bordered">
<thead>
<tr>
<th></th>
<th>제목</th>
<th>관서</th>
<th>부서</th>
<th>계급</th>
<th>작성자</th>
<th>작성일시</th>
<th>첨부파일</th>
<th>댓글</th>
</tr>
</thead>
<tbody>
<tbody class="table-group-divider">
<tr class="noticeTr" th:each="notice:${noticeList}">
<input type="hidden" class="publicKey" th:value="${notice.publicKey}">
<td><input type="checkbox" class="trChkBox"></td>
@ -80,6 +84,9 @@
<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
<td th:if="${notice.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block>
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<td th:if="${notice.wrtUserGrd eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block>
<td th:text="${notice.wrtUserNm}"></td>
<td th:text="${#temporals.format(notice.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
<td th:text="${notice.fileCnt eq null?'파일 없음':#strings.concat(notice.fileCnt,' 건')}"></td>

12
src/main/resources/templates/publicBoard/notice/noticeViewModal.html
View File

@ -11,7 +11,11 @@
<div class="mb-3 row">
<label for="wrtUserNm" class="col-sm-1 col-form-label text-center">작성자</label>
<div class="col-sm-2">
<input type="text" class="form-control border-0" id="wrtUserNm" name="wrtUserNm" th:value="${info.wrtUserNm}" readonly>
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<th:block th:if="${commonCode.itemCd eq info.wrtUserGrd}">
<input type="text" class="form-control border-0" id="wrtUserNm" name="wrtUserNm" th:value="|${commonCode.itemValue} ${info.wrtUserNm}|" readonly>
</th:block>
</th:block>
</div>
<label for="wrtDt" class="col-sm-1 col-form-label text-center">작성일시</label>
<div class="col-sm-2">
@ -93,6 +97,9 @@
<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
<div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtPart}" th:text="${commonCode.itemValue}"></div>
</th:block>
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtUserGrd}" th:text="${commonCode.itemValue}"></div>
</th:block>
<div class="col-auto" th:text="${comment.wrtUserNm}"></div>
<div class="col-auto" th:text="|작성일시: ${#temporals.format(comment.wrtDt, 'yyyy-MM-dd HH:mm')}|"></div>
<div class="col-auto">
@ -120,6 +127,9 @@
<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
<div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtPart}" th:text="${commonCode.itemValue}"></div>
</th:block>
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtUserGrd}" th:text="${commonCode.itemValue}"></div>
</th:block>
<div class="col-auto" th:text="${childComment.wrtUserNm}"></div>
<div class="col-auto" th:text="|작성일시: ${#temporals.format(childComment.wrtDt, 'yyyy-MM-dd HH:mm')}|"></div>
<div class="col-auto" th:if="${userSeq eq childComment.wrtUserSeq}">