From cf549d09178d091fb7e258ccee48e88af62eaba8 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: Fri, 19 May 2023 10:58:41 +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=EB=8B=B4=EB=8B=B9=EA=B2=BD?=
 =?UTF-8?q?=EC=B0=B0=EA=B4=80=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94=EA=B0=80.?=
 =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=96=91=EC=8B=9D?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/InternationalCrimeArrest.java         |  2 ++
 .../InternationalCrimeArrestMapper.xml          |  8 +++++++-
 .../internationalCrimeArrest.html               | 17 +++++++++++++++++
 .../internationalCrimeArrestEditModal.html      |  4 ++++
 .../internationalCrimeArrestViewModal.html      |  8 ++++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java
index c5c8151d..f07d0086 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java
@@ -30,6 +30,8 @@ public class InternationalCrimeArrest extends BaseModel {
   private String organ;
   @Column(name = "department")
   private String department;
+  @Column(name = "case_officer")
+  private String caseOfficer;
   @Column(name = "crime_type")
   private String crimeType;
   @Column(name = "violation_type")
diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
index 2fa0d282..131a1fbc 100644
--- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
+++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
@@ -62,6 +62,7 @@
     SELECT a.ica_key,
           a.organ,
           a.department,
+          a.case_officer,
           a.crime_type,
           a.violation_type,
           a.crime_name,
@@ -70,7 +71,12 @@
           a.suspect_table,
           a.crime_awareness_dt,
           a.case_sent_dt,
-          a.case_num
+          a.case_num,
+          a.wrt_organ,
+          a.wrt_part,
+          a.wrt_user_grd,
+          a.wrt_user_nm,
+          a.wrt_dt
     FROM international_crime_arrest a
     <include refid="selectInternationalCrimeArrestListWhere"></include>
     ORDER BY a.ica_key DESC
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
index 9377bb5a..a61304d2 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
@@ -139,6 +139,7 @@
                       <th>순번</th>
                       <th>지방청</th>
                       <th>경찰서</th>
+                      <th>담당경찰관</th>
                       <th>
                         <div>범죄테마</div>
                         <div>(대분류)</div>
@@ -157,6 +158,8 @@
                       <th>피의자 인적사항</th>
                       <th>범죄인지</th>
                       <th>사건송치</th>
+                      <th>작성자</th>
+                      <th>작성일시</th>
                     </tr>
                     </thead>
                     <tbody class="table-group-divider text-center">
@@ -173,6 +176,7 @@
                             <th:block th:if="${ica.department eq code.itemCd}" th:text="${code.itemValue}"></th:block>
                           </th:block>
                         </td>
+                        <td th:text="${ica.caseOfficer}"></td>
                         <td>
                           <th:block th:each="code:${session.commonCode.get('CTH')}">
                             <th:block th:if="${ica.crimeType eq code.itemCd}" th:text="${code.itemValue}"></th:block>
@@ -208,6 +212,19 @@
                         </td>
                         <td th:text="${#temporals.format(ica.crimeAwarenessDt, 'yyyy-MM-dd')}"></td>
                         <td th:text="${#temporals.format(ica.caseSentDt, 'yyyy-MM-dd')}"></td>
+                        <td>
+                          <th:block th:each="code:${session.commonCode.get('OG')}">
+                            <th:block th:if="${ica.wrtOrgan eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+                          </th:block>
+                          <th:block th:each="code:${session.commonCode.get(ica.wrtOrgan)}">
+                            <th:block th:if="${ica.wrtPart eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+                          </th:block>
+                          <th:block th:each="code:${session.commonCode.get('GRD')}">
+                            <th:block th:if="${ica.wrtUserGrd eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+                          </th:block>
+                          <th:block th:text="${ica.wrtUserNm}"></th:block>
+                        </td>
+                        <td th:text="${#temporals.format(ica.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                       </tr>
                     </th:block>
                     </tbody>
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html
index 2333bc9c..a5101b7b 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html
@@ -39,6 +39,10 @@
          </th:block>
         </select>
       </div>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">담당경찰관</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control form-control-sm" name="caseOfficer">
+      </div>
     </div>
     <div class="row mb-1" id="spiParentDiv">
       <label class="col-sm-1 col-form-label col-form-label-sm text-center">범죄테마</label>
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
index fb916778..0fe41015 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
@@ -7,6 +7,12 @@
 <div class="modal-body">
   <input type="hidden" name="icaKey" id="viewModalKey" th:value="${ica.icaKey}">
   <input type="hidden" name="icaKey" id="viewModalViolationType" th:value="${ica.violationType}">
+  <div class="row mb-1 justify-content-end">
+    <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.caseOfficer}"></label>
+    <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ica.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
+  </div>
   <div class="row mb-1">
     <label class="col-sm-1 col-form-label col-form-label-sm text-center">지방청</label>
     <label class="col-sm-2 col-form-label col-form-label-sm text-start">
@@ -20,6 +26,8 @@
         <th:block th:if="${code.itemCd eq ica.department}" th:text="${code.itemValue}"></th:block>
       </th:block>
     </label>
+    <label class="col-sm-1 col-form-label col-form-label-sm text-center">담당경찰관</label>
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.caseOfficer}"></label>
   </div>
   <div class="row mb-1">
     <label class="col-sm-1 col-form-label col-form-label-sm text-center">범죄테마</label>