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 @@ AND crime_name LIKE CONCAT('%', #{crimeName}, '%') + + AND occur_table LIKE CONCAT('%', #{occurTable}, '%') + + + AND arrest_table LIKE CONCAT('%', #{arrestTable}, '%') + + + AND suspect_table LIKE CONCAT('%', #{suspectTable}, '%') + + + And crime_awareness_dt = #{crimeAwarenessDt}::DATE + + + AND case_sent_dt = #{caseSentDt}::DATE + + + AND process_result = #{processResult} + 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 += ''; } }); - $(targetTagName).append('' + option); + $(targetTagName).append('' + 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 @@
- @@ -64,7 +64,7 @@
- @@ -76,6 +76,34 @@
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ +