Compare commits
No commits in common. "caac765231d0fca5beb7e5473726ad7a5e34634c" and "02e6f71607371aac3bd6ee0aec09e248a273276a" have entirely different histories.
caac765231
...
02e6f71607
|
|
@ -6,7 +6,6 @@ import org.hibernate.annotations.DynamicUpdate;
|
||||||
|
|
||||||
import javax.persistence.*;
|
import javax.persistence.*;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Comparator;
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ package com.dbnt.faisp.main.userInfo;
|
||||||
|
|
||||||
import com.dbnt.faisp.kwms.service.KwmsService;
|
import com.dbnt.faisp.kwms.service.KwmsService;
|
||||||
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
|
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
|
||||||
import com.dbnt.faisp.main.codeMgt.model.CodeMgt;
|
|
||||||
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
|
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
|
||||||
import com.dbnt.faisp.main.fipTarget.model.PartInfo;
|
import com.dbnt.faisp.main.fipTarget.model.PartInfo;
|
||||||
import com.dbnt.faisp.main.fipTarget.model.ShipInfo;
|
import com.dbnt.faisp.main.fipTarget.model.ShipInfo;
|
||||||
|
|
@ -16,8 +15,6 @@ import com.dbnt.faisp.util.Utils;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
@ -38,7 +35,7 @@ public class FaispController {
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/policeList")
|
@GetMapping("/policeList")
|
||||||
public ModelAndView policeList(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo, HttpServletResponse response) {
|
public ModelAndView policeList(@AuthenticationPrincipal UserInfo loginUser,UserInfo userInfo, HttpServletResponse response) {
|
||||||
ModelAndView mav = new ModelAndView("faisp/policeList");
|
ModelAndView mav = new ModelAndView("faisp/policeList");
|
||||||
userInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
|
userInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
|
||||||
if(userInfo.getUserStatus() == null) {
|
if(userInfo.getUserStatus() == null) {
|
||||||
|
|
@ -148,52 +145,5 @@ public class FaispController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/personnelStatus")
|
|
||||||
public ModelAndView personnelStatus(@AuthenticationPrincipal UserInfo loginUser){
|
|
||||||
ModelAndView mav = new ModelAndView("faisp/personnelStatus");
|
|
||||||
List<CodeMgt> jtList = codeMgtService.selectCodeMgtList("JT");
|
|
||||||
jtList.sort((o1, o2) -> o2.getItemCd().compareTo(o1.getItemCd()));
|
|
||||||
mav.addObject("jtList", jtList);
|
|
||||||
return mav;
|
|
||||||
}
|
|
||||||
@GetMapping("/careerMgt")
|
|
||||||
public ModelAndView careerMgt(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo, HttpServletResponse response){
|
|
||||||
ModelAndView mav = new ModelAndView("faisp/careerMgt");
|
|
||||||
userInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
|
|
||||||
if(userInfo.getUserStatus() == null) {
|
|
||||||
userInfo.setUserStatus("USC003");
|
|
||||||
}
|
|
||||||
|
|
||||||
//메뉴권한 확인
|
|
||||||
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faisp/policeList").get(0).getAccessAuth();
|
|
||||||
mav.addObject("accessAuth", accessAuth);
|
|
||||||
userInfo.setQueryInfo();
|
|
||||||
mav.addObject("policeList", userInfoService.selectPoliceList(userInfo));
|
|
||||||
userInfo.setContentCnt(userInfoService.selectPoliceListCnt(userInfo));
|
|
||||||
userInfo.setPaginationInfo();
|
|
||||||
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
|
||||||
mav.addObject("userStatus", userInfo.getUserStatus());
|
|
||||||
mav.addObject("searchParams", userInfo);
|
|
||||||
return mav;
|
|
||||||
}
|
|
||||||
@GetMapping("/educationMgt")
|
|
||||||
public ModelAndView educationMgt(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo, HttpServletResponse response){
|
|
||||||
ModelAndView mav = new ModelAndView("faisp/educationMgt");
|
|
||||||
userInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
|
|
||||||
if(userInfo.getUserStatus() == null) {
|
|
||||||
userInfo.setUserStatus("USC003");
|
|
||||||
}
|
|
||||||
|
|
||||||
//메뉴권한 확인
|
|
||||||
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faisp/policeList").get(0).getAccessAuth();
|
|
||||||
mav.addObject("accessAuth", accessAuth);
|
|
||||||
userInfo.setQueryInfo();
|
|
||||||
mav.addObject("policeList", userInfoService.selectPoliceList(userInfo));
|
|
||||||
userInfo.setContentCnt(userInfoService.selectPoliceListCnt(userInfo));
|
|
||||||
userInfo.setPaginationInfo();
|
|
||||||
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
|
||||||
mav.addObject("userStatus", userInfo.getUserStatus());
|
|
||||||
mav.addObject("searchParams", userInfo);
|
|
||||||
return mav;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,177 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
|
|
||||||
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
|
||||||
layout:decorate="~{layout/layout}">
|
|
||||||
<th:block layout:fragment="script">
|
|
||||||
<script type="text/javascript" th:src="@{/js/faisp/police.js}"></script>
|
|
||||||
</th:block>
|
|
||||||
<div layout:fragment="content">
|
|
||||||
<main class="pt-3">
|
|
||||||
<h4>외사경찰 경력 현황</h4>
|
|
||||||
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
|
||||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
|
||||||
<div class="row mx-0">
|
|
||||||
<div class="col-12 card text-center">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="row justify-content-start">
|
|
||||||
<div class="col-12">
|
|
||||||
<ul class="nav nav-tabs" id="userTab" role="tablist">
|
|
||||||
<li class="nav-item" role="presentation">
|
|
||||||
<button class="nav-link" id="presentTab" th:classappend="${userStatus eq 'USC003'?' active':''}" data-userstatus="USC003" data-bs-toggle="tab" type="button" role="tab">現외사경찰</button>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item" role="presentation">
|
|
||||||
<button class="nav-link" id="previousTab" th:classappend="${userStatus eq 'USC006'?' active':''}" data-userstatus="USC006" data-bs-toggle="tab" type="button" role="tab">前외사경찰</button>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item" role="presentation">
|
|
||||||
<button class="nav-link" id="notPoliceTab" th:classappend="${userStatus eq 'USC007'?' active':''}" data-userstatus="USC007" data-bs-toggle="tab" type="button" role="tab">非외사경찰</button>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<div class="tab-content border border-top-0 p-3" id="userContent">
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12">
|
|
||||||
<form id="searchFm" method="get" th:action="@{/faisp/careerMgt}">
|
|
||||||
<input type="hidden" name="excel">
|
|
||||||
<input type="hidden" name="userStatus" th:value="${userStatus}">
|
|
||||||
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
|
|
||||||
<div class="row justify-content-between pe-3 py-1">
|
|
||||||
<div class="col-auto">
|
|
||||||
<select class="form-select" name="rowCnt" id="rowCnt">
|
|
||||||
<th:block th:each="num : ${#numbers.sequence(1,5)}">
|
|
||||||
<option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt==num*10}"></option>
|
|
||||||
</th:block>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<button type="button" class="btn btn-success" id="goExcel">엑셀다운</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row justify-content-end pe-3 py-1">
|
|
||||||
<div class="col-auto">
|
|
||||||
<div class="row justify-content-end">
|
|
||||||
<div class="col-auto">
|
|
||||||
<select class="form-select form-select-sm" name="ogCd">
|
|
||||||
<option value="">관서 선택</option>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
|
|
||||||
<th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
|
|
||||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.ogCd eq commonCode.itemCd}"></option>
|
|
||||||
</th:block>
|
|
||||||
</th:block>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<select class="form-select form-select-sm" name="sex">
|
|
||||||
<option value="">성별</option>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('SEX')}">
|
|
||||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.sex eq commonCode.itemCd}"></option>
|
|
||||||
</th:block>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<input type="text" class="form-control form-control-sm" placeholder="이름" name="userNm" th:value="${searchParams.userNm}">
|
|
||||||
</div>
|
|
||||||
<input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12">
|
|
||||||
<table class="table table-hover table-bordered">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>순번</th>
|
|
||||||
<th>계급</th>
|
|
||||||
<th>성명</th>
|
|
||||||
<th>청</th>
|
|
||||||
<th>현부서<br>과</th>
|
|
||||||
<th>생년월일</th>
|
|
||||||
<th>성별</th>
|
|
||||||
<th>외사경력</th>
|
|
||||||
<th>수사경력</th>
|
|
||||||
<th>정보경력</th>
|
|
||||||
<th>보안경력</th>
|
|
||||||
<th>국제경력</th>
|
|
||||||
<th>최종<br>수정일</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody class="table-group-divider">
|
|
||||||
<tr class="policeTr" th:each="list:${policeList}">
|
|
||||||
<th:block>
|
|
||||||
<input type="hidden" class="userSeq" th:value="${list.userSeq}">
|
|
||||||
</th:block>
|
|
||||||
<td th:text="${list.rownum}"></td>
|
|
||||||
<td th:text="${list.titleCd}"></td>
|
|
||||||
<td th:text="${list.userNm}"></td>
|
|
||||||
<td th:text="${list.organNm}"></td>
|
|
||||||
<td th:text="${list.ofcCd}"></td>
|
|
||||||
<td th:text="${list.birthDate}"></td>
|
|
||||||
<td th:text="${list.sex}"></td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row justify-content-between">
|
|
||||||
<div class="col-auto">
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<nav aria-label="Page navigation">
|
|
||||||
<ul class="pagination">
|
|
||||||
<th:block th:if="${searchParams.pageIndex>3}">
|
|
||||||
<li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
|
|
||||||
<a class="page-link" href="#" aria-label="Previous">
|
|
||||||
<span aria-hidden="true">«</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</th:block>
|
|
||||||
<th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
|
|
||||||
<li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex==num?'active':''}">
|
|
||||||
<a class="page-link" href="#" th:text="${num}"></a>
|
|
||||||
</li>
|
|
||||||
</th:block>
|
|
||||||
<th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
|
|
||||||
<li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
|
|
||||||
<a class="page-link" href="#" aria-label="Next">
|
|
||||||
<span aria-hidden="true">»</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</th:block>
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<button type="button" class="btn btn-success" id="outBtn" th:if="${userStatus eq 'USC003'} and ${accessAuth eq 'ACC003'}">전출</button>
|
|
||||||
<button type="button" class="btn btn-success" id="inBtn" th:if="${accessAuth eq 'ACC003'} and (${userStatus eq 'USC006'} or ${userStatus eq 'USC007'})">전입</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
|
|
||||||
<div class="modal fade" id="policeEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
|
|
||||||
<div class="modal-dialog modal-lg modal-dialog-scrollable">
|
|
||||||
<div class="modal-content" id="policeEditModalContent">
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,179 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
|
|
||||||
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
|
||||||
layout:decorate="~{layout/layout}">
|
|
||||||
<th:block layout:fragment="script">
|
|
||||||
<script type="text/javascript" th:src="@{/js/faisp/police.js}"></script>
|
|
||||||
</th:block>
|
|
||||||
<div layout:fragment="content">
|
|
||||||
<main class="pt-3">
|
|
||||||
<h4>외사경찰 교육 현황</h4>
|
|
||||||
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
|
||||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
|
||||||
<div class="row mx-0">
|
|
||||||
<div class="col-12 card text-center">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="row justify-content-start">
|
|
||||||
<div class="col-12">
|
|
||||||
<ul class="nav nav-tabs" id="userTab" role="tablist">
|
|
||||||
<li class="nav-item" role="presentation">
|
|
||||||
<button class="nav-link" id="presentTab" th:classappend="${userStatus eq 'USC003'?' active':''}" data-userstatus="USC003" data-bs-toggle="tab" type="button" role="tab">現외사경찰</button>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item" role="presentation">
|
|
||||||
<button class="nav-link" id="previousTab" th:classappend="${userStatus eq 'USC006'?' active':''}" data-userstatus="USC006" data-bs-toggle="tab" type="button" role="tab">前외사경찰</button>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item" role="presentation">
|
|
||||||
<button class="nav-link" id="notPoliceTab" th:classappend="${userStatus eq 'USC007'?' active':''}" data-userstatus="USC007" data-bs-toggle="tab" type="button" role="tab">非외사경찰</button>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<div class="tab-content border border-top-0 p-3" id="userContent">
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12">
|
|
||||||
<form id="searchFm" method="get" th:action="@{/faisp/educationMgt}">
|
|
||||||
<input type="hidden" name="excel">
|
|
||||||
<input type="hidden" name="userStatus" th:value="${userStatus}">
|
|
||||||
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
|
|
||||||
<div class="row justify-content-between pe-3 py-1">
|
|
||||||
<div class="col-auto">
|
|
||||||
<select class="form-select" name="rowCnt" id="rowCnt">
|
|
||||||
<th:block th:each="num : ${#numbers.sequence(1,5)}">
|
|
||||||
<option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt==num*10}"></option>
|
|
||||||
</th:block>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<button type="button" class="btn btn-success" id="goExcel">엑셀다운</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row justify-content-end pe-3 py-1">
|
|
||||||
<div class="col-auto">
|
|
||||||
<div class="row justify-content-end">
|
|
||||||
<div class="col-auto">
|
|
||||||
<select class="form-select form-select-sm" name="ogCd">
|
|
||||||
<option value="">관서 선택</option>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
|
|
||||||
<th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
|
|
||||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.ogCd eq commonCode.itemCd}"></option>
|
|
||||||
</th:block>
|
|
||||||
</th:block>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<select class="form-select form-select-sm" name="sex">
|
|
||||||
<option value="">성별</option>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('SEX')}">
|
|
||||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.sex eq commonCode.itemCd}"></option>
|
|
||||||
</th:block>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<input type="text" class="form-control form-control-sm" placeholder="이름" name="userNm" th:value="${searchParams.userNm}">
|
|
||||||
</div>
|
|
||||||
<input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12">
|
|
||||||
<table class="table table-hover table-bordered">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>순번</th>
|
|
||||||
<th>계급</th>
|
|
||||||
<th>성명</th>
|
|
||||||
<th>청</th>
|
|
||||||
<th>현부서<br>과</th>
|
|
||||||
<th>생년월일</th>
|
|
||||||
<th>성별</th>
|
|
||||||
<th>고등학교</th>
|
|
||||||
<th>전문대</th>
|
|
||||||
<th>대학교</th>
|
|
||||||
<th>석사</th>
|
|
||||||
<th>박사</th>
|
|
||||||
<th>전공</th>
|
|
||||||
<th>최종<br>수정일</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody class="table-group-divider">
|
|
||||||
<tr class="policeTr" th:each="list:${policeList}">
|
|
||||||
<th:block>
|
|
||||||
<input type="hidden" class="userSeq" th:value="${list.userSeq}">
|
|
||||||
</th:block>
|
|
||||||
<td th:text="${list.rownum}"></td>
|
|
||||||
<td th:text="${list.titleCd}"></td>
|
|
||||||
<td th:text="${list.userNm}"></td>
|
|
||||||
<td th:text="${list.organNm}"></td>
|
|
||||||
<td th:text="${list.ofcCd}"></td>
|
|
||||||
<td th:text="${list.birthDate}"></td>
|
|
||||||
<td th:text="${list.sex}"></td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row justify-content-between">
|
|
||||||
<div class="col-auto">
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<nav aria-label="Page navigation">
|
|
||||||
<ul class="pagination">
|
|
||||||
<th:block th:if="${searchParams.pageIndex>3}">
|
|
||||||
<li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
|
|
||||||
<a class="page-link" href="#" aria-label="Previous">
|
|
||||||
<span aria-hidden="true">«</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</th:block>
|
|
||||||
<th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
|
|
||||||
<li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex==num?'active':''}">
|
|
||||||
<a class="page-link" href="#" th:text="${num}"></a>
|
|
||||||
</li>
|
|
||||||
</th:block>
|
|
||||||
<th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
|
|
||||||
<li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
|
|
||||||
<a class="page-link" href="#" aria-label="Next">
|
|
||||||
<span aria-hidden="true">»</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</th:block>
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<button type="button" class="btn btn-success" id="outBtn" th:if="${userStatus eq 'USC003'} and ${accessAuth eq 'ACC003'}">전출</button>
|
|
||||||
<button type="button" class="btn btn-success" id="inBtn" th:if="${accessAuth eq 'ACC003'} and (${userStatus eq 'USC006'} or ${userStatus eq 'USC007'})">전입</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
|
|
||||||
<div class="modal fade" id="policeEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
|
|
||||||
<div class="modal-dialog modal-lg modal-dialog-scrollable">
|
|
||||||
<div class="modal-content" id="policeEditModalContent">
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,153 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
|
|
||||||
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
|
||||||
layout:decorate="~{layout/layout}">
|
|
||||||
<th:block layout:fragment="script">
|
|
||||||
<script type="text/javascript" th:src="@{/js/faisp/police.js}"></script>
|
|
||||||
</th:block>
|
|
||||||
<div layout:fragment="content">
|
|
||||||
<main class="pt-3">
|
|
||||||
<h4>외사경찰 정원/현원 현황</h4>
|
|
||||||
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
|
||||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
|
||||||
<div class="row mx-0">
|
|
||||||
<div class="col-12 card text-center">
|
|
||||||
<div class="card-body">
|
|
||||||
<form id="searchFm" method="get" th:action="@{/faisp/policeList}">
|
|
||||||
<div class="row justify-content-start pe-3 py-1">
|
|
||||||
<div class="col-auto">
|
|
||||||
<select class="form-select" name="rowCnt" id="rowCnt">
|
|
||||||
<option value="">연도</option>
|
|
||||||
<!--<th:block th:each="year : ${#numbers.sequence(2020, 2030)}">
|
|
||||||
<option th:value="${year}" th:text="${year}" th:selected="${searchParams.year eq year}"></option>
|
|
||||||
</th:block>-->
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
<div class="row justify-content-start">
|
|
||||||
<div class="col-12">
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-body">
|
|
||||||
<table class="table table-hover table-bordered">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th rowspan="3">관서</th>
|
|
||||||
<th>정원</th>
|
|
||||||
<th>현원</th>
|
|
||||||
<th>과부족</th>
|
|
||||||
<th:block th:each="code:${jtList}">
|
|
||||||
<th colspan="2" th:text="${code.itemValue}"></th>
|
|
||||||
</th:block>
|
|
||||||
<th rowspan="3">수정일</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th>계</th>
|
|
||||||
<th>계</th>
|
|
||||||
<th>계</th>
|
|
||||||
<th:block th:each="code:${jtList}">
|
|
||||||
<th>정원</th>
|
|
||||||
<th>현원</th>
|
|
||||||
</th:block>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th:block th:each="code:${jtList}">
|
|
||||||
<th>정원</th>
|
|
||||||
<th>현원</th>
|
|
||||||
</th:block>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
<th>cnt</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody class="table-group-divider">
|
|
||||||
<!--<tr class="policeTr" th:each="list:${policeList}">
|
|
||||||
<th:block>
|
|
||||||
<input type="hidden" class="userSeq" th:value="${list.userSeq}">
|
|
||||||
</th:block>
|
|
||||||
<td th:text="${list.rownum}"></td>
|
|
||||||
<td th:text="${list.titleCd}"></td>
|
|
||||||
<td th:text="${list.userNm}"></td>
|
|
||||||
<td th:text="${list.organNm}"></td>
|
|
||||||
<td th:text="${list.ofcCd}"></td>
|
|
||||||
<td th:text="${list.birthDate}"></td>
|
|
||||||
<td th:text="${list.sex}"></td>
|
|
||||||
<td th:text="${list.policeInDate}"></td>
|
|
||||||
<td th:text="${list.titleInDate}"></td>
|
|
||||||
<td th:text="${list.ofcInDate}"></td>
|
|
||||||
<td th:text="${list.outturnCd}"></td>
|
|
||||||
<td></td>
|
|
||||||
<td th:text="${list.jobInCd}"></td>
|
|
||||||
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
|
||||||
<th:block th:if="${userStatus eq 'USC003'} and ${accessAuth eq 'ACC003'}">
|
|
||||||
<td class="checkBoxTd"><input type="checkbox" name="policeChk" class="policeCheckBox"></td>
|
|
||||||
</th:block>
|
|
||||||
<th:block th:if="${accessAuth eq 'ACC003'} and (${userStatus eq 'USC006'} or ${userStatus eq 'USC007'})">
|
|
||||||
<td class="checkBoxTd"><input type="checkbox" name="policeChk" class="policeCheckBox"></td>
|
|
||||||
</th:block>
|
|
||||||
</tr>-->
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
<div class="row justify-content-between">
|
|
||||||
<div class="col-auto">
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<nav aria-label="Page navigation">
|
|
||||||
<!--<ul class="pagination">
|
|
||||||
<th:block th:if="${searchParams.pageIndex>3}">
|
|
||||||
<li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
|
|
||||||
<a class="page-link" href="#" aria-label="Previous">
|
|
||||||
<span aria-hidden="true">«</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</th:block>
|
|
||||||
<th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
|
|
||||||
<li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex==num?'active':''}">
|
|
||||||
<a class="page-link" href="#" th:text="${num}"></a>
|
|
||||||
</li>
|
|
||||||
</th:block>
|
|
||||||
<th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
|
|
||||||
<li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
|
|
||||||
<a class="page-link" href="#" aria-label="Next">
|
|
||||||
<span aria-hidden="true">»</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</th:block>
|
|
||||||
</ul>-->
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
|
|
||||||
<div class="modal fade" id="personnelStatusEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="personnelStatusEditModalLabel" aria-hidden="true">
|
|
||||||
<div class="modal-dialog modal-lg modal-dialog-scrollable">
|
|
||||||
<div class="modal-content" id="personnelStatusEditModalContent">
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</html>
|
|
||||||
|
|
@ -7,30 +7,12 @@
|
||||||
</th:block>
|
</th:block>
|
||||||
<div layout:fragment="content">
|
<div layout:fragment="content">
|
||||||
<main class="pt-3">
|
<main class="pt-3">
|
||||||
<h4 th:text="${userStatus eq 'USC003' ? '現 외사경찰 현황' : (userStatus eq 'USC006' ? '前 외사경찰 현황' : (userStatus eq 'USC007' ? '非 외사경찰 현황' : null))}"></h4>
|
<h4 th:text="${userStatus eq 'USC003' ? '現 외사경찰 현황' : userStatus eq 'USC006' ? '前 외사경찰 현황' : userStatus eq 'USC007' ? '非 외사경찰 현황' : null}"></h4>
|
||||||
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
||||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
||||||
<div class="row mx-0">
|
<div class="row mx-0">
|
||||||
<div class="col-12 card text-center">
|
<div class="col-12 card text-center">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="row justify-content-start">
|
|
||||||
<div class="col-12">
|
|
||||||
<ul class="nav nav-tabs" id="userTab" role="tablist">
|
|
||||||
<li class="nav-item" role="presentation">
|
|
||||||
<button class="nav-link" id="presentTab" th:classappend="${userStatus eq 'USC003'?' active':''}" data-userstatus="USC003" data-bs-toggle="tab" type="button" role="tab">現외사경찰</button>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item" role="presentation">
|
|
||||||
<button class="nav-link" id="previousTab" th:classappend="${userStatus eq 'USC006'?' active':''}" data-userstatus="USC006" data-bs-toggle="tab" type="button" role="tab">前외사경찰</button>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item" role="presentation">
|
|
||||||
<button class="nav-link" id="notPoliceTab" th:classappend="${userStatus eq 'USC007'?' active':''}" data-userstatus="USC007" data-bs-toggle="tab" type="button" role="tab">非외사경찰</button>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<div class="tab-content border border-top-0 p-3" id="userContent">
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12">
|
|
||||||
<form id="searchFm" method="get" th:action="@{/faisp/policeList}">
|
<form id="searchFm" method="get" th:action="@{/faisp/policeList}">
|
||||||
<input type="hidden" name="excel">
|
<input type="hidden" name="excel">
|
||||||
<input type="hidden" name="userStatus" th:value="${userStatus}">
|
<input type="hidden" name="userStatus" th:value="${userStatus}">
|
||||||
|
|
@ -76,10 +58,22 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
<div class="row justify-content-start">
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
|
<ul class="nav nav-tabs" id="userTab" role="tablist">
|
||||||
|
<li class="nav-item" role="presentation">
|
||||||
|
<button class="nav-link" id="presentTab" th:classappend="${userStatus eq 'USC003'?' active':''}" data-userstatus="USC003" data-bs-toggle="tab" type="button" role="tab">現외사경찰</button>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item" role="presentation">
|
||||||
|
<button class="nav-link" id="previousTab" th:classappend="${userStatus eq 'USC006'?' active':''}" data-userstatus="USC006" data-bs-toggle="tab" type="button" role="tab">前외사경찰</button>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item" role="presentation">
|
||||||
|
<button class="nav-link" id="notPoliceTab" th:classappend="${userStatus eq 'USC007'?' active':''}" data-userstatus="USC007" data-bs-toggle="tab" type="button" role="tab">非외사경찰</button>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="row">
|
||||||
<table class="table table-hover table-bordered">
|
<table class="table table-hover table-bordered">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -134,7 +128,6 @@
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="row justify-content-between">
|
<div class="row justify-content-between">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -175,7 +168,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<div class="modal fade" id="policeEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
|
<div class="modal fade" id="policeEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue