국제범죄 검거현황 요청사항 반영

master
강석 최 2023-06-01 15:50:14 +09:00
parent 980a57ec07
commit 7758efe7e7
9 changed files with 507 additions and 479 deletions

View File

@ -34,12 +34,40 @@ public class InternationalCrimeArrestController {
private final OrganConfigService organConfigService;
private final MenuMgtService menuMgtService;
@GetMapping("/internationalCrimeArrest")
public ModelAndView internationalCrimeArrest(@AuthenticationPrincipal UserInfo loginUser,InternationalCrimeArrest internationalCrimeArrest) {
ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/internationalCrimeArrest");
@GetMapping("/icaStatistics")
public ModelAndView icaStatistics(@AuthenticationPrincipal UserInfo loginUser, IcaStatistics icaStatistics){
ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/icaStatistics");
//메뉴권한 확인
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/icaStatistics").get(0).getAccessAuth();
if(accessAuth.equals("ACC003")){
mav.addObject("downOrganCdList", loginUser.getDownOrganCdList());
}else{
icaStatistics.setOrgan(loginUser.getOgCd());
}
if(Utils.isEmpty(icaStatistics.getYear())){
icaStatistics.setYear(LocalDate.now().getYear());
}
List<IcaStatistics> icaStatisticsList = internationalCrimeArrestService.selectIcaStatistics(icaStatistics);
mav.addObject("total", internationalCrimeArrestService.getIcaStatisticsTotal(icaStatisticsList));
mav.addObject("icaStatisticsList", icaStatisticsList);
List<Integer> yearList = internationalCrimeArrestService.selectYearOptionList(icaStatistics.getOrgan());
if(yearList.size()==0){
yearList.add(icaStatistics.getYear());
}
mav.addObject("accessAuth", accessAuth);
mav.addObject("yearOptionList", yearList);
mav.addObject("searchParams", icaStatistics);
return mav;
}
@GetMapping("/icaList")
public ModelAndView icaList(@AuthenticationPrincipal UserInfo loginUser,InternationalCrimeArrest internationalCrimeArrest) {
ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/icaList");
//메뉴권한 확인
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/internationalCrimeArrest").get(0).getAccessAuth();
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/icaStatistics").get(0).getAccessAuth();
mav.addObject("accessAuth", accessAuth);
mav.addObject("userOrgan", loginUser.getOgCd());
@ -55,9 +83,9 @@ public class InternationalCrimeArrestController {
return mav;
}
@GetMapping("/internationalCrimeArrestEditModal")
@GetMapping("/icaEditModal")
public ModelAndView internationalCrimeArrestEditModal(@AuthenticationPrincipal UserInfo loginUser, InternationalCrimeArrest internationalCrimeArrest){
ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal");
ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/icaEditModal");
if(internationalCrimeArrest.getIcaKey()!=null){
internationalCrimeArrest = internationalCrimeArrestService.selectInternationalCrimeArrest(internationalCrimeArrest.getIcaKey());
}else{
@ -74,44 +102,19 @@ public class InternationalCrimeArrestController {
return mav;
}
@GetMapping("/internationalCrimeArrestViewModal")
@GetMapping("/icaViewModal")
public ModelAndView internationalCrimeArrestViewModal(@AuthenticationPrincipal UserInfo loginUser, InternationalCrimeArrest internationalCrimeArrest){
ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal");
ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/icaViewModal");
mav.addObject("ica", internationalCrimeArrestService.selectInternationalCrimeArrest(internationalCrimeArrest.getIcaKey()));
mav.addObject("userSeq",loginUser.getUserSeq());
//메뉴권한 확인
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/internationalCrimeArrest").get(0).getAccessAuth());
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/icaStatistics").get(0).getAccessAuth());
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
//마감여부
mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/internationalCrimeArrest"));
return mav;
}
@GetMapping("/icaStatisticsModal")
public ModelAndView icaStatisticsModal(@AuthenticationPrincipal UserInfo loginUser, IcaStatistics icaStatistics){
ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/icaStatisticsModal");
if(Utils.isEmpty(icaStatistics.getOrgan())){
icaStatistics.setOrgan(loginUser.getOgCd());
}
if(Utils.isEmpty(icaStatistics.getYear())){
icaStatistics.setYear(LocalDate.now().getYear());
}
if(Utils.isEmpty(icaStatistics.getMonth())){
icaStatistics.setMonth(LocalDate.now().getMonthValue());
}
List<IcaStatistics> icaStatisticsList = internationalCrimeArrestService.selectIcaStatistics(icaStatistics);
mav.addObject("total", internationalCrimeArrestService.getIcaStatisticsTotal(icaStatisticsList));
mav.addObject("icaStatisticsList", icaStatisticsList);
List<Integer> yearList = internationalCrimeArrestService.selectYearOptionList(icaStatistics.getOrgan());
if(yearList.size()==0){
yearList.add(icaStatistics.getYear());
}
mav.addObject("yearOptionList", yearList);
mav.addObject("searchParams", icaStatistics);
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
return mav;
}
@PostMapping("/saveInternationalCrimeArrest")
public Integer saveInternationalCrimeArrest(@AuthenticationPrincipal UserInfo loginUser,
InternationalCrimeArrest internationalCrimeArrest){

View File

@ -147,9 +147,17 @@
sum(case when ab.process_result = 'PCR006' then 1 else 0 end) as pcr006Cnt
from international_crime_arrest aa
inner join ica_suspect_info ab on aa.ica_key = ab.ica_key
where department = #{organ}
and EXTRACT(YEAR FROM wrt_dt) = ${year}
and EXTRACT(MONTH FROM wrt_dt) = ${month}
<where>
<if test='organ != null and organ != ""'>
and department = #{organ}
</if>
<if test='year != null and year != 0'>
and EXTRACT(YEAR FROM wrt_dt) = ${year}
</if>
<if test='month != null and month != 0'>
and EXTRACT(MONTH FROM wrt_dt) = ${month}
</if>
</where>
group by crime_type, violation_type
) c on a.item_cd = c.crime_type and b.item_cd = c.violation_type
order by a.item_cd, b.item_cd

View File

@ -9,15 +9,13 @@ $(function(){
language: "ko",
autoclose: true
});
//getStatisticsModal();
});
$(document).on('click', '#statisticsModalBtn', function (){
getStatisticsModal();
$(document).on('click', '#statisticsTab', function (){
location.href = '/faStatistics/icaStatistics';
})
$(document).on('click', '#statisticsSearchBtn', function (){
getStatisticsModal($('#organ').val(), $('#year').val(), $('#month').val())
$(document).on('click', '#listTab', function (){
location.href = '/faStatistics/icaList';
})
$(document).on('click', '#icaAddBtn', function () {
@ -226,27 +224,6 @@ function contentCheck(status){
return flag;
}
function getStatisticsModal(organ, year, month){
$.ajax({
url: '/faStatistics/icaStatisticsModal',
data: {
organ: organ,
year: year,
month: month,
},
type: 'GET',
dataType:"html",
success: function(html){
$("#icaStatisticsBody").empty().append(html)
$("#icaStatisticsModal").modal('show');
},
error:function(e){
ajaxErrorAction(e);
}
});
}
$(document).on('click', '#icaExcelDownBtn', function (){
debugger
exportExcel('국제범죄검거현황', 'icaTable')
});

View File

@ -0,0 +1,317 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout/layout}">
<th:block layout:fragment="script">
<script th:inline="javascript">
const internationalCrimeArrest = [[${internationalCrimeArrest}]];
const commonCode = [[${session.commonCode}]];
const organConfigList = [[${organConfigList}]];
</script>
<script type="text/javascript" th:src="@{/js/faStatistics/internationalCrimeArrest.js}"></script>
<script type="text/javascript" th:src="@{/js/menuMgt/deadline.js}"></script>
</th:block>
<div layout:fragment="content">
<main>
<input type="hidden" id="menuKey" value="41">
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<div class="row justify-content-between">
<div class="col-auto mb-2">
<div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
<h5 class="d-inline align-middle"> 국제범죄 검거현황</h5>
</div>
<div class="col-auto"><p class="mb-0 mt-2">외사통계 > 국제범죄검거현황</p></div>
</div>
<div class="row mx-0">
<div class="col-12 card bg-light">
<div class="card-body">
<ul class="nav nav-tabs" id="userTab" role="tablist">
<li class="nav-item" role="presentation">
<button class="nav-link" id="statisticsTab" data-bs-toggle="tab" type="button" role="tab">통계</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link active" id="listTab" data-bs-toggle="tab" type="button" role="tab">목록</button>
</li>
</ul>
<div class="tab-content bg-white border border-top-0 p-2">
<form method="get" th:action="@{/faStatistics/icaList}" id="icaSearchForm">
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
<input type="hidden" name="dateSelector" value="wrtDt">
<div class="row justify-content-between py-1">
<div class="col-auto">
<div class="row">
<div class="col-auto">
<select class="form-select form-select-sm" 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 eq num*10}"></option>
</th:block>
</select>
</div>
</div>
</div>
<div class="col-8">
<div class="row">
<div class="col-11">
<div class="row justify-content-end">
<!-- <div class="col-2">
<input type="text" class="form-control form-control-sm" placeholder="사건번호" name="caseNum" th:value="${searchParams.caseNum}">
</div>-->
<div class="col-2">
<select class="form-select form-select-sm" name="organ">
<option value="">지방청 선택</option>
<th:block th:each="organConfig:${organConfigList}">
<th:block th:if="${organConfig.parentOrgan eq 'OG001' or organConfig.organCd eq 'OG001'}">
<option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq searchParams.organ}"></option>
</th:block>
</th:block>
</select>
</div>
<div class="col-2" id="departmentDiv">
<select class="form-select form-select-sm" name="department">
<option value="">경찰서 선택</option>
<th:block th:each="organConfig:${organConfigList}">
<th:block th:if="${organConfig.parentOrgan ne null && organConfig.organType ne 'OGC002'}">
<option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq searchParams.department}"></option>
</th:block>
</th:block>
</select>
</div>
<div class="col-2">
<select class="form-select form-select-sm" name="crimeType" id="searchCrimeType">
<option value="">범죄테마 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('CTH')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.crimeType}"></option>
</th:block>
</select>
</div>
<div class="col-2">
<select class="form-select form-select-sm" name="violationType" id="searchViolationType">
<option value="">위반유형 선택</option>
<th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CTH')))}">
<th:block th:each="commonCode:${session.commonCode.get('CTH'+num)}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${internationalCrimeArrest.violationType eq commonCode.itemCd}"></option>
</th:block>
</th:block>
</select>
</div>
</div>
<div class="row justify-content-end">
<div class="col-2">
<input type="text" class="form-control form-control-sm" placeholder="죄명" name="crimeName" th:value="${searchParams.crimeName}">
</div>
<div class="col-2">
<input type="text" class="form-control form-control-sm" placeholder="발생원표" name="occurTable" th:value="${searchParams.occurTable}">
</div>
<div class="col-2">
<input type="text" class="form-control form-control-sm" placeholder="검거원표" name="arrestTable" th:value="${searchParams.arrestTable}">
</div>
<div class="col-2">
<input type="text" class="form-control form-control-sm" placeholder="피의자원표" name="suspectTable" th:value="${searchParams.suspectTable}">
</div>
</div>
<div class="row justify-content-end">
<div class="col-2">
<input type="text" class="form-control form-control-sm dateSelector" placeholder="범죄인지" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(searchParams.crimeAwarenessDt, 'yyyy-MM-dd')}" autocomplete="off">
</div>
<div class="col-2">
<input type="text" class="form-control form-control-sm dateSelector" placeholder="사건송치" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(searchParams.caseSentDt, 'yyyy-MM-dd')}" autocomplete="off">
</div>
<div class="col-2">
<select class="form-select form-select-sm" name="processResult" id="processResult">
<option value="">신병처리 선택</option>
<th:block th:each="code:${session.commonCode.get('PCR')}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}"
th:selected="${code.itemCd eq searchParams.processResult}"></option>
</th:block>
</select>
</div>
<div class="col-4">
<div class="input-group w-auto input-daterange" id="dateSelectorDiv">
<input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
<input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
</div>
</div>
</div>
</div>
<div class="col-1 d-grid gap-2">
<input type="submit" class="btn btn-primary" id="searchBtn" value="검색">
</div>
</div>
</div>
</div>
</form>
<div class="card">
<div class="card-body">
<div class="row">
<div class="col-12">
<table class="table table-sm table-hover table-bordered ws-nowrap" id="icaTable">
<thead class="align-middle text-center">
<tr class="table-secondary">
<th>순번</th>
<th>지방청</th>
<th>경찰서</th>
<th>담당경찰관</th>
<th>
<div>범죄테마</div>
<div>(대분류)</div>
</th>
<th>
<div>위반유형</div>
<div>(중분류)</div>
</th>
<th>
<div>죄명</div>
<div>(소분류)</div>
</th>
<th>발생원표</th>
<th>검거원표</th>
<th>피의자원표</th>
<th>피의자 인적사항</th>
<th>범죄인지</th>
<th>사건송치</th>
<th>작성자</th>
<th>작성일시</th>
</tr>
</thead>
<tbody class="table-group-divider text-center">
<th:block th:each="ica,cnt:${icaList}">
<tr class="tr" th:data-key="${ica.icaKey}">
<td th:text="${cnt.count}"></td>
<td>
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${ica.organ eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
</td>
<td>
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${ica.department eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
</td>
<td th:text="${ica.caseOfficer}"></td>
<td>
<th:block th:each="code:${session.commonCode.get('CTH')}">
<th:block th:if="${ica.crimeType eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
</td>
<td>
<th:block th:each="code:${session.commonCode.get(ica.crimeType)}">
<th:block th:if="${ica.violationType eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
</td>
<td th:text="${ica.crimeName}"></td>
<td th:text="${ica.occurTable}"></td>
<td th:text="${ica.arrestTable}"></td>
<td th:text="${ica.suspectTable}"></td>
<td>
<div th:each="suspect:${ica.suspectInfoList}">
<th:block th:each="code:${session.commonCode.get('SEX')}">
<th:block th:if="${suspect.sex eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:each="code:${session.commonCode.get('AGE')}">
<th:block th:if="${suspect.age eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:each="code:${session.commonCode.get('NNY')}">
<th:block th:if="${suspect.country eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:if="${suspect.country ne null && !#strings.contains(suspect.country, 'NNY')}">
<th:block th:text="${suspectPersonInfo.country}"></th:block>
</th:block>
<th:block th:each="code:${session.commonCode.get('PCR')}">
<th:block th:if="${suspect.processResult eq code.itemCd}" th:text="${#strings.concat('(', code.itemValue, ')')}"></th:block>
</th:block>
</div>
</td>
<td th:text="${#temporals.format(ica.crimeAwarenessDt, 'yyyy-MM-dd')}"></td>
<td th:text="${#temporals.format(ica.caseSentDt, 'yyyy-MM-dd')}"></td>
<td>
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${ica.wrtOrgan eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:each="code:${session.commonCode.get(ica.wrtOrgan)}">
<th:block th:if="${ica.wrtPart eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:each="code:${session.commonCode.get('GRD')}">
<th:block th:if="${ica.wrtUserGrd eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:text="${ica.wrtUserNm}"></th:block>
</td>
<td th:text="${#temporals.format(ica.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
</tr>
</th:block>
</tbody>
</table>
</div>
</div>
<!-- 페이징 -->
<div class="row justify-content-between">
<div class="col-auto">
<th:block th:if="${userOrgan eq 'OG001' and accessAuth eq 'ACC003'}">
<button class="btn btn-warning" id="deadlineBtn" data-menukey="41"
th:data-deadlinechk="${deadlineState}" th:text="${deadlineState eq 'F'?'마감':'등록허용'}"></button>
</th:block>
<button class="btn btn-success" id="icaExcelDownBtn">엑셀 다운로드</button>
</div>
<div class="col-auto">
<nav aria-label="Page navigation">
<ul class="pagination mb-0">
<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">&laquo;</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 eq 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">&raquo;</span>
</a>
</li>
</th:block>
</ul>
</nav>
</div>
<div class="col-auto">
<th:block th:if="${accessAuth ne 'ACC001'}">
<button class="btn btn-primary" id="icaAddBtn" th:disabled="${deadlineState eq 'T'}">등록</button>
</th:block>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal fade" id="icaEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="icaEditModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl modal-dialog-scrollable">
<div class="modal-content" id="icaEditModalContent">
</div>
</div>
</div>
<div class="modal fade" id="icaViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="icaViewModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl modal-dialog-scrollable">
<div class="modal-content" id="icaViewBody">
</div>
</div>
</div>
<div class="modal fade" id="icaStatisticsModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="icaStatisticsModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl modal-dialog-scrollable">
<div class="modal-content" id="icaStatisticsBody">
</div>
</div>
</div>
</main>
</div>
</html>

View File

@ -0,0 +1,138 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5"
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/faStatistics/internationalCrimeArrest.js}"></script>
</th:block>
<div layout:fragment="content">
<main>
<input type="hidden" id="menuKey" value="41">
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<div class="row justify-content-between">
<div class="col-auto mb-2">
<div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
<h5 class="d-inline align-middle"> 국제범죄 검거현황</h5>
</div>
<div class="col-auto"><p class="mb-0 mt-2">외사통계 > 국제범죄검거현황</p></div>
</div>
<div class="row mx-0">
<div class="col-12 card bg-light">
<div class="card-body">
<ul class="nav nav-tabs" id="userTab" role="tablist">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="statisticsTab" data-bs-toggle="tab" type="button" role="tab">통계</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="listTab" data-bs-toggle="tab" type="button" role="tab">목록</button>
</li>
</ul>
<div class="tab-content bg-white border border-top-0 p-2">
<form method="get" th:action="@{/faStatistics/icaStatistics}" id="icaSearchForm">
<div class="row justify-content-end mb-1">
<div class="col-1" th:if="${accessAuth eq 'ACC003'}">
<select class="form-select" id="organ" name="organ">
<option value="">전체</option>
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${code.useChk eq 'T' and #lists.contains(downOrganCdList, code.itemCd)}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.organ}"></option>
</th:block>
</th:block>
</select>
</div>
<div class="col-1">
<select class="form-select" id="year" name="year">
<th:block th:each="year:${yearOptionList}">
<option th:value="${year}" th:text="|${year}년|" th:selected="${year eq searchParams.year}"></option>
</th:block>
</select>
</div>
<div class="col-1">
<select class="form-select" id="month" name="month">
<option value="">전체</option>
<th:block th:each="num : ${#numbers.sequence(1,12)}">
<option th:value="${num}" th:text="|${num}월|" th:selected="${num eq searchParams.month}"></option>
</th:block>
</select>
</div>
<div class="col-1 d-grid gap-2">
<input type="submit" class="btn btn-primary" id="searchBtn" value="검색">
</div>
</div>
</form>
<div class="row">
<div class="col-12">
<table class="table table-sm table-hover table-bordered ws-nowrap">
<colgroup>
<col style="width: 12%">
<col style="width: 12%">
<col style="width: 4%">
<col style="width: 4%">
<col style="width: 4%">
<col style="width: 4%">
<th:block th:each="code:${session.commonCode.get('PCR')}">
<col style="width: 8%">
</th:block>
</colgroup>
<thead class="align-middle text-center">
<tr class="table-secondary">
<th rowspan="2">분야</th>
<th rowspan="2">위반유형</th>
<th colspan="2">발생</th>
<th colspan="2">검거</th>
<th th:colspan="${session.commonCode.get('PCR').size()}">피의자 신병 처리 결과</th>
</tr>
<tr class="table-secondary">
<th></th>
<th></th>
<th></th>
<th></th>
<th:block th:each="code:${session.commonCode.get('PCR')}">
<th th:text="${code.itemValue}"></th>
</th:block>
</tr>
<tr class="bg-warning">
<th colspan="2"></th>
<th th:text="${total.caseCnt}"></th>
<th th:text="${total.suspectCnt}"></th>
<th th:text="${total.arrestCnt}"></th>
<th th:text="${total.arrestSuspectCnt}"></th>
<th th:text="${total.pcr006Cnt}"></th>
<th th:text="${total.pcr001Cnt}"></th>
<th th:text="${total.pcr002Cnt}"></th>
<th th:text="${total.pcr003Cnt}"></th>
<th th:text="${total.pcr004Cnt}"></th>
<th th:text="${total.pcr005Cnt}"></th>
</tr>
<th:block th:each="statistics:${icaStatisticsList}">
<tr>
<th:block th:if="${session.commonCode.get(statistics.crimeTypeCd).get(0).itemCd eq statistics.violationTypeCd}">
<td th:rowspan="${session.commonCode.get(statistics.crimeTypeCd).size()}" th:text="${statistics.crimeType}"></td>
</th:block>
<td th:text="${statistics.violationType}"></td>
<th th:text="${statistics.caseCnt}"></th>
<th th:text="${statistics.suspectCnt}"></th>
<th th:text="${statistics.arrestCnt}"></th>
<th th:text="${statistics.arrestSuspectCnt}"></th>
<th th:text="${statistics.pcr006Cnt}"></th>
<th th:text="${statistics.pcr001Cnt}"></th>
<th th:text="${statistics.pcr002Cnt}"></th>
<th th:text="${statistics.pcr003Cnt}"></th>
<th th:text="${statistics.pcr004Cnt}"></th>
<th th:text="${statistics.pcr005Cnt}"></th>
</tr>
</th:block>
</thead>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</main>
</div>
</html>

View File

@ -1,103 +0,0 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="icaStatisticsModalLabel">국제범죄검거 통계</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="row justify-content-end mb-1">
<div class="col-1">
<select class="form-select form-select-sm" id="organ">
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${code.useChk eq 'T' and #lists.contains(mgtOrganList, code.itemCd)}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.organ}"></option>
</th:block>
</th:block>
</select>
</div>
<div class="col-1">
<select class="form-select form-select-sm" id="year">
<th:block th:each="year:${yearOptionList}">
<option th:value="${year}" th:text="|${year}년|" th:selected="${year eq searchParams.year}"></option>
</th:block>
</select>
</div>
<div class="col-1">
<select class="form-select form-select-sm" id="month">
<th:block th:each="num : ${#numbers.sequence(1,12)}">
<option th:value="${num}" th:text="|${num}월|" th:selected="${num eq searchParams.month}"></option>
</th:block>
</select>
</div>
<div class="col-1 d-grid gap-2">
<input type="button" class="btn btn-sm btn-primary" id="statisticsSearchBtn" value="검색">
</div>
</div>
<div class="row">
<div class="col-12">
<table class="table table-sm table-hover table-bordered ws-nowrap">
<colgroup>
<col style="width: 12%">
<col style="width: 12%">
<col style="width: 4%">
<col style="width: 4%">
<col style="width: 4%">
<col style="width: 4%">
<th:block th:each="code:${session.commonCode.get('PCR')}">
<col style="width: 8%">
</th:block>
</colgroup>
<thead class="align-middle text-center">
<tr class="table-secondary">
<th rowspan="2">분야</th>
<th rowspan="2">위반유형</th>
<th colspan="2">발생</th>
<th colspan="2">검거</th>
<th th:colspan="${session.commonCode.get('PCR').size()}">피의자 신병 처리 결과</th>
</tr>
<tr class="table-secondary">
<th></th>
<th></th>
<th></th>
<th></th>
<th:block th:each="code:${session.commonCode.get('PCR')}">
<th th:text="${code.itemValue}"></th>
</th:block>
</tr>
<tr class="bg-warning">
<th colspan="2"></th>
<th th:text="${total.caseCnt}"></th>
<th th:text="${total.suspectCnt}"></th>
<th th:text="${total.arrestCnt}"></th>
<th th:text="${total.arrestSuspectCnt}"></th>
<th th:text="${total.pcr006Cnt}"></th>
<th th:text="${total.pcr001Cnt}"></th>
<th th:text="${total.pcr002Cnt}"></th>
<th th:text="${total.pcr003Cnt}"></th>
<th th:text="${total.pcr004Cnt}"></th>
<th th:text="${total.pcr005Cnt}"></th>
</tr>
<th:block th:each="statistics:${icaStatisticsList}">
<tr>
<th:block th:if="${session.commonCode.get(statistics.crimeTypeCd).get(0).itemCd eq statistics.violationTypeCd}">
<td th:rowspan="${session.commonCode.get(statistics.crimeTypeCd).size()}" th:text="${statistics.crimeType}"></td>
</th:block>
<td th:text="${statistics.violationType}"></td>
<th th:text="${statistics.caseCnt}"></th>
<th th:text="${statistics.suspectCnt}"></th>
<th th:text="${statistics.arrestCnt}"></th>
<th th:text="${statistics.arrestSuspectCnt}"></th>
<th th:text="${statistics.pcr006Cnt}"></th>
<th th:text="${statistics.pcr001Cnt}"></th>
<th th:text="${statistics.pcr002Cnt}"></th>
<th th:text="${statistics.pcr003Cnt}"></th>
<th th:text="${statistics.pcr004Cnt}"></th>
<th th:text="${statistics.pcr005Cnt}"></th>
</tr>
</th:block>
</thead>
</table>
</div>
</div>
</div>
</html>

View File

@ -1,312 +0,0 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout/layout}">
<th:block layout:fragment="script">
<script th:inline="javascript">
const internationalCrimeArrest = [[${internationalCrimeArrest}]];
const commonCode = [[${session.commonCode}]];
const organConfigList = [[${organConfigList}]];
</script>
<script type="text/javascript" th:src="@{/js/faStatistics/internationalCrimeArrest.js}"></script>
<script type="text/javascript" th:src="@{/js/menuMgt/deadline.js}"></script>
</th:block>
<div layout:fragment="content">
<main>
<input type="hidden" id="menuKey" value="41">
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<div class="row justify-content-between">
<div class="col-auto mb-2">
<div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
<h5 class="d-inline align-middle"> 국제범죄 검거현황</h5>
</div>
<div class="col-auto"><p class="mb-0 mt-2">외사통계 > 국제범죄검거현황</p></div>
</div>
<div class="row mx-0">
<div class="col-12 card bg-light">
<div class="card-body">
<form method="get" th:action="@{/faStatistics/internationalCrimeArrest}" id="icaSearchForm">
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
<input type="hidden" name="dateSelector" value="wrtDt">
<div class="row justify-content-between py-1">
<div class="col-auto">
<div class="row">
<div class="col-auto">
<select class="form-select form-select-sm" 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 eq num*10}"></option>
</th:block>
</select>
</div>
</div>
<div class="row mt-4">
<div class="col-12">
<input type="button" class="btn btn-sm btn-info w-100" id="statisticsModalBtn" value="통계">
</div>
</div>
</div>
<div class="col-8">
<div class="row">
<div class="col-11">
<div class="row justify-content-end">
<!-- <div class="col-2">
<input type="text" class="form-control form-control-sm" placeholder="사건번호" name="caseNum" th:value="${searchParams.caseNum}">
</div>-->
<div class="col-2">
<select class="form-select form-select-sm" name="organ">
<option value="">지방청 선택</option>
<th:block th:each="organConfig:${organConfigList}">
<th:block th:if="${organConfig.parentOrgan eq 'OG001' or organConfig.organCd eq 'OG001'}">
<option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq searchParams.organ}"></option>
</th:block>
</th:block>
</select>
</div>
<div class="col-2" id="departmentDiv">
<select class="form-select form-select-sm" name="department">
<option value="">경찰서 선택</option>
<th:block th:each="organConfig:${organConfigList}">
<th:block th:if="${organConfig.parentOrgan ne null && organConfig.organType ne 'OGC002'}">
<option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq searchParams.department}"></option>
</th:block>
</th:block>
</select>
</div>
<div class="col-2">
<select class="form-select form-select-sm" name="crimeType" id="searchCrimeType">
<option value="">범죄테마 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('CTH')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.crimeType}"></option>
</th:block>
</select>
</div>
<div class="col-2">
<select class="form-select form-select-sm" name="violationType" id="searchViolationType">
<option value="">위반유형 선택</option>
<th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CTH')))}">
<th:block th:each="commonCode:${session.commonCode.get('CTH'+num)}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${internationalCrimeArrest.violationType eq commonCode.itemCd}"></option>
</th:block>
</th:block>
</select>
</div>
</div>
<div class="row justify-content-end">
<div class="col-2">
<input type="text" class="form-control form-control-sm" placeholder="죄명" name="crimeName" th:value="${searchParams.crimeName}">
</div>
<div class="col-2">
<input type="text" class="form-control form-control-sm" placeholder="발생원표" name="occurTable" th:value="${searchParams.occurTable}">
</div>
<div class="col-2">
<input type="text" class="form-control form-control-sm" placeholder="검거원표" name="arrestTable" th:value="${searchParams.arrestTable}">
</div>
<div class="col-2">
<input type="text" class="form-control form-control-sm" placeholder="피의자원표" name="suspectTable" th:value="${searchParams.suspectTable}">
</div>
</div>
<div class="row justify-content-end">
<div class="col-2">
<input type="text" class="form-control form-control-sm dateSelector" placeholder="범죄인지" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(searchParams.crimeAwarenessDt, 'yyyy-MM-dd')}" autocomplete="off">
</div>
<div class="col-2">
<input type="text" class="form-control form-control-sm dateSelector" placeholder="사건송치" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(searchParams.caseSentDt, 'yyyy-MM-dd')}" autocomplete="off">
</div>
<div class="col-2">
<select class="form-select form-select-sm" name="processResult" id="processResult">
<option value="">신병처리 선택</option>
<th:block th:each="code:${session.commonCode.get('PCR')}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}"
th:selected="${code.itemCd eq searchParams.processResult}"></option>
</th:block>
</select>
</div>
<div class="col-4">
<div class="input-group w-auto input-daterange" id="dateSelectorDiv">
<input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
<input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
</div>
</div>
</div>
</div>
<div class="col-1 d-grid gap-2">
<input type="submit" class="btn btn-primary" id="searchBtn" value="검색">
</div>
</div>
</div>
</div>
</form>
<div class="card">
<div class="card-body">
<div class="row">
<div class="col-12">
<table class="table table-sm table-hover table-bordered ws-nowrap" id="icaTable">
<thead class="align-middle text-center">
<tr class="table-secondary">
<th>순번</th>
<th>지방청</th>
<th>경찰서</th>
<th>담당경찰관</th>
<th>
<div>범죄테마</div>
<div>(대분류)</div>
</th>
<th>
<div>위반유형</div>
<div>(중분류)</div>
</th>
<th>
<div>죄명</div>
<div>(소분류)</div>
</th>
<th>발생원표</th>
<th>검거원표</th>
<th>피의자원표</th>
<th>피의자 인적사항</th>
<th>범죄인지</th>
<th>사건송치</th>
<th>작성자</th>
<th>작성일시</th>
</tr>
</thead>
<tbody class="table-group-divider text-center">
<th:block th:each="ica,cnt:${icaList}">
<tr class="tr" th:data-key="${ica.icaKey}">
<td th:text="${cnt.count}"></td>
<td>
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${ica.organ eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
</td>
<td>
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${ica.department eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
</td>
<td th:text="${ica.caseOfficer}"></td>
<td>
<th:block th:each="code:${session.commonCode.get('CTH')}">
<th:block th:if="${ica.crimeType eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
</td>
<td>
<th:block th:each="code:${session.commonCode.get(ica.crimeType)}">
<th:block th:if="${ica.violationType eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
</td>
<td th:text="${ica.crimeName}"></td>
<td th:text="${ica.occurTable}"></td>
<td th:text="${ica.arrestTable}"></td>
<td th:text="${ica.suspectTable}"></td>
<td>
<div th:each="suspect:${ica.suspectInfoList}">
<th:block th:each="code:${session.commonCode.get('SEX')}">
<th:block th:if="${suspect.sex eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:each="code:${session.commonCode.get('AGE')}">
<th:block th:if="${suspect.age eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:each="code:${session.commonCode.get('NNY')}">
<th:block th:if="${suspect.country eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:if="${suspect.country ne null && !#strings.contains(suspect.country, 'NNY')}">
<th:block th:text="${suspectPersonInfo.country}"></th:block>
</th:block>
<th:block th:each="code:${session.commonCode.get('PCR')}">
<th:block th:if="${suspect.processResult eq code.itemCd}" th:text="${#strings.concat('(', code.itemValue, ')')}"></th:block>
</th:block>
</div>
</td>
<td th:text="${#temporals.format(ica.crimeAwarenessDt, 'yyyy-MM-dd')}"></td>
<td th:text="${#temporals.format(ica.caseSentDt, 'yyyy-MM-dd')}"></td>
<td>
<th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${ica.wrtOrgan eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:each="code:${session.commonCode.get(ica.wrtOrgan)}">
<th:block th:if="${ica.wrtPart eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:each="code:${session.commonCode.get('GRD')}">
<th:block th:if="${ica.wrtUserGrd eq code.itemCd}" th:text="${code.itemValue}"></th:block>
</th:block>
<th:block th:text="${ica.wrtUserNm}"></th:block>
</td>
<td th:text="${#temporals.format(ica.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
</tr>
</th:block>
</tbody>
</table>
</div>
</div>
<!-- 페이징 -->
<div class="row justify-content-between">
<div class="col-auto">
<th:block th:if="${userOrgan eq 'OG001' and accessAuth eq 'ACC003'}">
<button class="btn btn-warning" id="deadlineBtn" data-menukey="41"
th:data-deadlinechk="${deadlineState}" th:text="${deadlineState eq 'F'?'마감':'등록허용'}"></button>
</th:block>
<button class="btn btn-success" id="icaExcelDownBtn">엑셀 다운로드</button>
</div>
<div class="col-auto">
<nav aria-label="Page navigation">
<ul class="pagination mb-0">
<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">&laquo;</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 eq 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">&raquo;</span>
</a>
</li>
</th:block>
</ul>
</nav>
</div>
<div class="col-auto">
<th:block th:if="${accessAuth ne 'ACC001'}">
<button class="btn btn-primary" id="icaAddBtn" th:disabled="${deadlineState eq 'T'}">등록</button>
</th:block>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal fade" id="icaEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="icaEditModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl modal-dialog-scrollable">
<div class="modal-content" id="icaEditModalContent">
</div>
</div>
</div>
<div class="modal fade" id="icaViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="icaViewModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl modal-dialog-scrollable">
<div class="modal-content" id="icaViewBody">
</div>
</div>
</div>
<div class="modal fade" id="icaStatisticsModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="icaStatisticsModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl modal-dialog-scrollable">
<div class="modal-content" id="icaStatisticsBody">
</div>
</div>
</div>
</main>
</div>
</html>