단속현황 검색필터 추가

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java

@@ -83,6 +83,8 @@ public class CrackdownStatus extends CrackdownStatusBaseEntity {
     @Transient
     private String year;
     @Transient
+    private String month;
+    @Transient
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate napoDate;
     @Transient

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java

@@ -106,7 +106,7 @@ public class InternationalCrimeArrestController {
         String[] headers = {"ica_key", "case_num", "organ", "department", "crime_type", "violation_type", "crime_name", "occur_table", "arrest_table", "suspect_table", "sex", "age", "country", "crime_awareness_dt", "case_sent_dt", "process_result"};
         String[] headerNames = { "", "", "", "", "", "", "", "", "", "", "피의자 인적사항", "", "", "", "", ""};
         String[] headerNames2 = { "", "사건번호", "지방청", "경찰서", "범죄테마", "위반유형", "죄명", "발생원표", "검거원표", "피의자원표","성별","나이","국적","범죄인지","사건송치","신병처리"};
-        String[] columnType = { "int", "int", "String", "String", "String", "String", "String", "String", "String", "String","String","String","String","String","String","String"};
+        String[] columnType = { "int", "String", "String", "String", "String", "String", "String", "String", "String", "String","String","String","String","String","String","String"};
         excel.setHeaders(headers);
         excel.setHeaderNames(headerNames);
         excel.setHeaderNames2(headerNames2);

src/main/resources/mybatisMapper/CrackdownStatustMapper.xml

@@ -7,7 +7,10 @@
     <sql id="selectCrackdownStatusListWhere">
         <where>
             <if test='year != null and year != ""'>
-                And EXTRACT(YEAR FROM pr.wrt_dt) = EXTRACT(YEAR FROM CAST(#{year} AS DATE)::TIMESTAMP)
+                And EXTRACT(YEAR FROM pr.wrt_dt) = #{year}::NUMERIC
+            </if>
+            <if test='month != null and month != ""'>
+                And EXTRACT(MONTH FROM pr.wrt_dt) = #{month}::NUMERIC
             </if>
             <if test='caseNum != null and caseNum != ""'>
                 AND caseNum = #{caseNum}

src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html

@@ -26,7 +26,15 @@
                                     <select class="form-select form-select-sm" name="year">
                                         <option value="">연도</option>
                                         <th:block th:each="year : ${#numbers.sequence(2020, 2030)}">
-                                            <option th:value="${year + '-01-01'}" th:text="${year}" th:selected="${searchParams.year eq year}"></option>
+                                            <option th:value="${year}" th:text="${year}" th:selected="${searchParams.year eq year}"></option>
+                                        </th:block>
+                                    </select>
+                                </div>
+                                <div class="col-auto">
+                                    <select class="form-select form-select-sm" name="month">
+                                        <option value="">월</option>
+                                        <th:block th:each="month : ${#numbers.sequence(1, 12)}">
+                                            <option th:value="${month}" th:text="${month}" th:selected="${searchParams.month eq month}"></option>
                                         </th:block>
                                     </select>
                                 </div>

src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html

@@ -89,7 +89,7 @@
                     </form>
                     <div class="tab-pane fade show active" id="ica" role="tabpanel"
                          aria-labelledby="arrest-tab">
-                        <table class="table table-striped">
+                        <table class="table table-striped" id="ivsgtTable">
                             <thead>
                                 <tr>
                                     <th rowspan="2">지방청</th>