From f107e7691e08e2f22924dd6a90e15435dd8af5fb Mon Sep 17 00:00:00 2001
From: jiHyung <njh4803@gmail.com>
Date: Fri, 11 Nov 2022 17:28:00 +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=20=ED=98=84=ED=99=A9=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InternationalCrimeArrestMapper.xml        | 18 +++++++++++
 src/main/resources/static/js/common.js        |  2 +-
 .../faStatistics/internationalCrimeArrest.js  | 16 ++++++++--
 .../internationalCrimeArrest.html             | 32 +++++++++++++++++--
 4 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
index 2997c182..05e7f856 100644
--- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
+++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
@@ -24,6 +24,24 @@
             <if test='crimeName != null and crimeName != ""'>
                 AND crime_name LIKE CONCAT('%', #{crimeName}, '%')
             </if>
+            <if test='occurTable != null and occurTable != ""'>
+                AND occur_table LIKE CONCAT('%', #{occurTable}, '%')
+            </if>
+            <if test='arrestTable != null and arrestTable != ""'>
+                AND arrest_table LIKE CONCAT('%', #{arrestTable}, '%')
+            </if>
+            <if test='suspectTable != null and suspectTable != ""'>
+                AND suspect_table LIKE CONCAT('%', #{suspectTable}, '%')
+            </if>
+            <if test='crimeAwarenessDt != null'>
+                And crime_awareness_dt = #{crimeAwarenessDt}::DATE
+            </if>
+            <if test='caseSentDt != null'>
+                AND case_sent_dt = #{caseSentDt}::DATE
+            </if>
+            <if test='processResult != null and processResult != ""'>
+                AND process_result = #{processResult}
+            </if>
             <if test='dateSelector == "wrtDt"'>
                 <if test='startDate != null and startDate != ""'>
                     And wrt_dt >= #{startDate}::DATE
diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js
index 664e76b4..742e1c5c 100644
--- a/src/main/resources/static/js/common.js
+++ b/src/main/resources/static/js/common.js
@@ -209,7 +209,7 @@ function departmentDynamicOption(targetTagName, code, defaultOptionName='') {
       option += '<option value="' + organConfig.organCd + '">' + organConfig.organNm + '</option>';
     }
   });
-  $(targetTagName).append('<option value="">' + defaultOptionName + '선택</option>' + option);
+  $(targetTagName).append('<option value="">' + defaultOptionName + ' 선택</option>' + option);
 }
 
 function dateTimeCalc(startDateTime, endDateTime) {
diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
index 4c73f46c..6b3ae794 100644
--- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
+++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
@@ -3,6 +3,14 @@ $(function(){
         format: "yyyy-mm-dd",
         language: "ko"
     });
+    $("#searchCrimeAwarenessDtDiv").datepicker({
+        format: "yyyy-mm-dd",
+        language: "ko"
+    });
+    $("#searchCaseSentDtDiv").datepicker({
+        format: "yyyy-mm-dd",
+        language: "ko"
+    });
 });
 
 
@@ -32,8 +40,12 @@ $(document).on('change', 'select[name="organ"]', function (){
     departmentDynamicOption('select[name="department"]', $(this).val());
 });
 
-$(document).on('change', 'select[name="crimeType"]', function (){
-    dynamicOption('select[name="violationType"]', $(this).val());
+$(document).on('change', '#crimeType', function (){
+    dynamicOption('#violationType', $(this).val());
+});
+
+$(document).on('change', '#searchCrimeType', function (){
+    dynamicOption('#searchViolationType', $(this).val(), '위반유형');
 });
 
 
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
index c7ca60f6..655771c3 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
@@ -56,7 +56,7 @@
                                         </select>
                                     </div>
                                     <div class="col-auto">
-                                        <select class="form-select form-select-sm" name="crimeType">
+                                        <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>
@@ -64,7 +64,7 @@
                                         </select>
                                     </div>
                                     <div class="col-auto">
-                                        <select class="form-select form-select-sm" name="violationType" id="violationType">
+                                        <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)}">
@@ -76,6 +76,34 @@
                                     <div class="col-auto">
                                         <input type="text" class="form-control form-control-sm" placeholder="죄명" name="crimeName" th:value="${searchParams.crimeName}">
                                     </div>
+                                    <div class="col-auto">
+                                        <input type="text" class="form-control form-control-sm" placeholder="발생원표" name="occurTable" th:value="${searchParams.occurTable}">
+                                    </div>
+                                    <div class="col-auto">
+                                        <input type="text" class="form-control form-control-sm" placeholder="검거원표" name="arrestTable" th:value="${searchParams.arrestTable}">
+                                    </div>
+                                    <div class="col-auto">
+                                        <input type="text" class="form-control form-control-sm" placeholder="피의자원표" name="suspectTable" th:value="${searchParams.suspectTable}">
+                                    </div>
+                                    <div class="col-auto">
+                                        <div class="col-auto input-daterange" id="searchCrimeAwarenessDtDiv">
+                                            <input type="text" class="form-control form-control-sm" placeholder="범죄인지" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(searchParams.crimeAwarenessDt, 'yyyy-MM-dd')}">
+                                        </div>
+                                    </div>
+                                    <div class="col-auto">
+                                        <div class="col-auto input-daterange" id="searchCaseSentDtDiv">
+                                            <input type="text" class="form-control form-control-sm" placeholder="사건송치" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(searchParams.caseSentDt, 'yyyy-MM-dd')}">
+                                        </div>
+                                    </div>
+                                    <div class="col-auto">
+                                        <select class="form-select form-select-sm" name="processResult" id="processResult">
+                                            <option value="">신병처리 선택</option>
+                                            <th:block th:each="commonCode:${session.commonCode.get('PCR')}">
+                                                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                                                        th:selected="${commonCode.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}">