From a5f3f9e1b87287fd47b2da6ae765d596ebc90f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Mon, 22 May 2023 09:53:29 +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=ED=98=84=ED=99=A9=20=ED=86=B5=EA=B3=84=EB=AA=A8?=
 =?UTF-8?q?=EB=8B=AC=20=EC=96=91=EC=8B=9D=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/IcaStatistics.java                       |  2 ++
 .../InternationalCrimeArrestMapper.xml             |  6 ++++--
 .../icaStatisticsModal.html                        | 14 ++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaStatistics.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaStatistics.java
index 1d970e46..4712b218 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaStatistics.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaStatistics.java
@@ -10,7 +10,9 @@ import lombok.Setter;
 @NoArgsConstructor
 public class IcaStatistics {
   private String crimeType;
+  private String crimeTypeCd;
   private String violationType;
+  private String violationTypeCd;
   private Integer caseCnt = 0;
   private Integer suspectCnt = 0;
   private Integer arrestCnt = 0;
diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
index 34372831..fdcb49d6 100644
--- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
+++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
@@ -106,8 +106,10 @@
   </select>
 
   <select id="selectIcaStatistics" resultType="IcaStatistics" parameterType="IcaStatistics">
-    select a.item_value as crime_type ,
-           b.item_value as violation_type,
+    select a.item_value as crimeType ,
+           a.item_cd as crimeTypeCd,
+           b.item_value as violationType,
+           b.item_cd as violationTypeCd,
            coalesce(c.caseCnt, 0) as caseCnt,
            coalesce(c.suspectCnt, 0) as suspectCnt,
            coalesce(c.arrestCnt, 0) as arrestCnt,
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaStatisticsModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaStatisticsModal.html
index 1a58fa81..98a213e0 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaStatisticsModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaStatisticsModal.html
@@ -6,7 +6,7 @@
 </div>
 <div class="modal-body">
   <div class="row justify-content-end mb-1">
-    <div class="col-2">
+    <div class="col-1">
       <select class="form-select form-select-sm" id="organ">
         <th:block th:each="code:${session.commonCode.get('OG')}">
           <th:block th:if="${code.useChk eq 'T' and #lists.contains(mgtOrganList, code.itemCd)}">
@@ -15,17 +15,17 @@
         </th:block>
       </select>
     </div>
-    <div class="col-2">
+    <div class="col-1">
       <select class="form-select form-select-sm" id="year">
         <th:block th:each="year:${yearOptionList}">
-          <option th:value="${year}" th:text="${year}" th:selected="${year eq searchParams.year}"></option>
+          <option th:value="${year}" th:text="|${year}년|" th:selected="${year eq searchParams.year}"></option>
         </th:block>
       </select>
     </div>
-    <div class="col-2">
+    <div class="col-1">
       <select class="form-select form-select-sm" id="month">
         <th:block th:each="num : ${#numbers.sequence(1,12)}">
-          <option th:value="${num}" th:text="${num}" th:selected="${num eq searchParams.month}"></option>
+          <option th:value="${num}" th:text="|${num}월|" th:selected="${num eq searchParams.month}"></option>
         </th:block>
       </select>
     </div>
@@ -78,7 +78,9 @@
         </tr>
         <th:block th:each="statistics:${icaStatisticsList}">
           <tr>
-            <td th:text="${statistics.crimeType}"></td>
+            <th:block th:if="${session.commonCode.get(statistics.crimeTypeCd).get(0).itemCd eq statistics.violationTypeCd}">
+              <td th:rowspan="${session.commonCode.get(statistics.crimeTypeCd).size()}" th:text="${statistics.crimeType}"></td>
+            </th:block>
             <td th:text="${statistics.violationType}"></td>
             <th th:text="${statistics.caseCnt}"></th>
             <th th:text="${statistics.suspectCnt}"></th>