From 5a1a727d6b3df560d941eab3f508fc1b3fa0bcdb Mon Sep 17 00:00:00 2001
From: jiHyung <njh4803@gmail.com>
Date: Thu, 20 Oct 2022 09:42:29 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84=EA=B2=80?=
 =?UTF-8?q?=EA=B1=B0=ED=98=84=ED=99=A9=20=EA=B2=80=EC=83=89=20=EB=B0=8F=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InternationalCrimeArrestController.java   |  1 +
 .../InternationalCrimeArrestMapper.xml        | 23 +++++--
 .../faStatistics/internationalCrimeArrest.js  |  8 +++
 .../internationalCrimeArrest.html             | 66 +++++++++++++++++++
 .../internationalCrimeArrestEditModal.html    |  6 ++
 .../internationalCrimeArrestViewModal.html    |  6 ++
 6 files changed, 106 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
index 80a8f023..27594668 100644
--- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
+++ b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
@@ -48,6 +48,7 @@ public class InternationalCrimeArrestController {
         mav.addObject("internationalCrimeArrestList", internationalCrimeArrestList);
         internationalCrimeArrest.setContentCnt(internationalCrimeArrestService.selectInternationalCrimeArrestListCnt(internationalCrimeArrest));
         internationalCrimeArrest.setPaginationInfo();
+        mav.addObject("organConfigList", selectOrganList());
         mav.addObject("searchParams", internationalCrimeArrest);
         return mav;
     }
diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
index 269abab7..51a0ffec 100644
--- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
+++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
@@ -6,15 +6,30 @@
 <mapper namespace="com.dbnt.faisp.faStatistics.internationalCrimeArrest.mapper.InternationalCrimeArrestMapper">
     <sql id="selectInternationalCrimeArrestListWhere">
         <where>
-            <if test='wrtOrgan != null and wrtOrgan != ""'>
-                AND a.wrt_organ = #{wrtOrgan}
+            <if test='organ != null and organ != ""'>
+                AND organ = #{organ}
+            </if>
+            <if test='department != null and department != ""'>
+                AND department = #{department}
+            </if>
+            <if test='crimeType != null and crimeType != ""'>
+                AND crime_type = #{crimeType}
+            </if>
+            <if test='violationType != null and violationType != ""'>
+                AND violation_type = #{violationType}
+            </if>
+            <if test='caseNum != null and caseNum != ""'>
+                AND case_num = #{caseNum}
+            </if>
+            <if test='crimeName != null and crimeName != ""'>
+                AND crime_name LIKE CONCAT('%', #{crimeName}, '%')
             </if>
             <if test='dateSelector == "wrtDt"'>
                 <if test='startDate != null and startDate != ""'>
-                    And a.wrt_dt >= #{startDate}::DATE
+                    And wrt_dt >= #{startDate}::DATE
                 </if>
                 <if test='endDate != null and endDate != ""'>
-                    AND a.wrt_dt &lt;= #{endDate}::DATE+1
+                    AND wrt_dt &lt;= #{endDate}::DATE+1
                 </if>
             </if>
         </where>
diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
index 3faf1a32..1514afbe 100644
--- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
+++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
@@ -1,3 +1,11 @@
+$(function(){
+    $("#dateSelectorDiv").datepicker({
+        format: "yyyy-mm-dd",
+        language: "ko"
+    });
+});
+
+
 $(document).on('click', '#icaAddBtn', function () {
     getIcaEditModal(null);
 });
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
index b885c97d..f6f8b2a5 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
@@ -18,6 +18,72 @@
         <div class="row mx-0">
             <div class="col-12 card">
                 <div class="card-body">
+                    <form method="get" th:action="@{/faStatistics/internationalCrimeArrest}">
+                        <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
+                        <input type="hidden" name="dateSelector" value="wrtDt">
+                        <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 eq num*10}"></option>
+                                    </th:block>
+                                </select>
+                            </div>
+                            <div class="col-auto">
+                                <div class="row justify-content-end">
+                                    <div class="col-auto">
+                                        <input type="text" class="form-control form-control-sm" placeholder="사건번호" name="caseNum" th:value="${searchParams.caseNum}">
+                                    </div>
+                                    <div class="col-auto" sec:authorize="hasRole('ROLE_SUB_ADMIN')">
+                                        <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' && organConfig.organType ne 'OGC001'}">
+                                                    <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-auto">
+                                        <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-auto">
+                                        <select class="form-select form-select-sm" name="crimeType">
+                                            <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-auto">
+                                        <select class="form-select form-select-sm" name="violationType">
+                                            <option value="">위반유형</option>
+                                            <th:block th:each="commonCode:${session.commonCode.get('VLT')}">
+                                                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.violationType}"></option>
+                                            </th:block>
+                                        </select>
+                                    </div>
+                                    <div class="col-auto">
+                                        <input type="text" class="form-control form-control-sm" placeholder="죄명" name="crimeName" th:value="${searchParams.crimeName}">
+                                    </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>
+                                    <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
+                                </div>
+                            </div>
+                        </div>
+                    </form>
                     <div class="tab-pane fade show active" id="ica" role="tabpanel"
                          aria-labelledby="arrest-tab">
                         <table class="table table-striped">
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html
index b0cfa871..3c40c5d9 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html
@@ -14,6 +14,12 @@
     <input type="hidden" name="wrtNm" th:value="${internationalCrimeArrest.wrtNm}">
     <input type="hidden" name="wrtDt" th:value="${#temporals.format(internationalCrimeArrest.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <input type="hidden" id="contentStatus" name="contentStatus">
+    <div class="mb-3 row">
+      <label class="col-sm-2 col-form-label text-center">사건번호</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control" name="caseNum" th:value="${internationalCrimeArrest.caseNum}">
+      </div>
+    </div>
     <div class="mb-3 row">
       <label class="col-sm-2 col-form-label text-center">지방청</label>
       <div class="col-sm-2">
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
index 0fae71ae..259a6a56 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
@@ -13,6 +13,12 @@
     <input type="hidden" name="wrtNm" th:value="${internationalCrimeArrest.wrtNm}">
     <input type="hidden" name="wrtDt" th:value="${#temporals.format(internationalCrimeArrest.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <input type="hidden" id="contentStatus" name="contentStatus">
+    <div class="mb-3 row">
+      <label class="col-sm-2 col-form-label text-center">사건번호</label>
+      <div class="col-sm-2">
+        <input type="text" name="caseNum" class="form-control border-0" th:value="${internationalCrimeArrest.caseNum}" readonly>
+      </div>
+    </div>
     <div class="mb-3 row">
       <label class="col-sm-2 col-form-label text-center">지방청</label>
       <div class="col-sm-2">