국제범죄검거 현황 수정

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

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) {

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 (){
+$(document).on('change', '#crimeType', function (){
-    dynamicOption('select[name="violationType"]', $(this).val());
+    dynamicOption('#violationType', $(this).val());
+});
+
+$(document).on('change', '#searchCrimeType', function (){
+    dynamicOption('#searchViolationType', $(this).val(), '위반유형');
 });
 
 

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}">