From b2fa46df9b860464c792fbcfdaa19b8fa89bc98b Mon Sep 17 00:00:00 2001
From: jiHyung <njh4803@gmail.com>
Date: Wed, 9 Nov 2022 17:48:55 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=ED=95=84=ED=84=B0=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/crackdownStatus/CrackdownStatus.java         |  2 ++
 .../resources/mybatisMapper/CrackdownStatustMapper.xml |  5 ++++-
 .../faStatistics/crackdownStatus/crackdownStatus.html  | 10 +++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java
index d464526f..f314a4df 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java
+++ b/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
diff --git a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml
index 79e2fd35..7e32d1c1 100644
--- a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml
+++ b/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}
diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html
index e93dbce3..91660ab6 100644
--- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html
+++ b/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>