From 3e20e71b20e934a0be5916ba0b56fd3d2e24232a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= <cks0504_p@daum.net>
Date: Wed, 2 Aug 2023 16:11:28 +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=EC=9A=94=EC=B2=AD=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD=20=EB=B0=98=EC=98=81.=20=20-=20=EB=B2=94=EC=A3=84?=
 =?UTF-8?q?=EC=9D=B8=EC=A7=80=20>=20=EA=B2=80=EA=B1=B0=EC=9D=BC=EC=8B=9C?=
 =?UTF-8?q?=20=EB=AA=85=EC=B9=AD=20=EB=B3=80=EA=B2=BD.=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=20=EC=9E=85=EB=A0=A5=20=EA=B0=80=EB=8A=A5=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD.=20=20-=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=20=EC=A1=B0=EA=B1=B4=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          |  4 ++--
 .../js/faStatistics/internationalCrimeArrest.js  |  7 +++++++
 .../internationalCrimeArrest/icaEditModal.html   | 13 +++++++------
 .../internationalCrimeArrest/icaList.html        | 16 ++++++++++++++--
 .../internationalCrimeArrest/icaViewModal.html   |  2 +-
 5 files changed, 31 insertions(+), 11 deletions(-)

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 f07d0086..487c9fc5 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
@@ -45,8 +45,8 @@ public class InternationalCrimeArrest extends BaseModel {
   @Column(name = "suspect_table")
   private String suspectTable;
   @Column(name = "crime_awareness_dt")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate crimeAwarenessDt;
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime crimeAwarenessDt;
   @Column(name = "case_sent_dt")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private LocalDate caseSentDt;
diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
index e00427cb..88f8ce60 100644
--- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
+++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
@@ -90,6 +90,12 @@ $(document).on('click', '.spiRemoveBtn', function (){
   spiRemoveBtnControl()
 })
 
+$(document).on('change', '.crimeAwarenessDt', function (){
+  $("#crimeAwarenessDt").val(
+      $("#crimeAwarenessDate").val()+
+      " "+$("#crimeAwarenessTime").val()
+  )
+})
 $(document).on('change', '.etcSelfInput', function (){
   const selfInput = $("#"+this.id+"_self")
   if(this.value === "etc"){
@@ -196,6 +202,7 @@ function saveInternationalCrimeArrest(status){
         formData.append("suspectInfoList["+idx+"].processResult", spi.find('.processResult').val());
       });
       formData.append("caseOverview", CrossEditor.GetBodyValue());
+      debugger
       $.ajax({
         type : 'POST',
         data : formData,
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html
index 1498333d..27249ea3 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html
@@ -41,7 +41,7 @@
       </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">
+        <input type="text" class="form-control form-control-sm" name="caseOfficer" th:value="${ica.caseOfficer}">
       </div>
     </div>
     <div class="row mb-1" id="spiParentDiv">
@@ -415,7 +415,6 @@
                   <th:block th:each="code:${session.commonCode.get('NNY')}">
                     <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
                   </th:block>
-                  <option value="etc">기타</option>
                 </select>
               </div>
               <label class="col-sm-1 col-form-label col-form-label-sm text-center">신병처리</label>
@@ -460,7 +459,6 @@
                     <th:block th:each="code:${session.commonCode.get('NNY')}">
                       <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq suspectInfo.country}"></option>
                     </th:block>
-                    <option value="etc">기타</option>
                   </select>
                 </div>
                 <label class="col-sm-1 col-form-label col-form-label-sm text-center">신병처리</label>
@@ -481,9 +479,13 @@
       </div>
     </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-1 col-form-label col-form-label-sm text-center">검거일시</label>
       <div class="col-sm-2 input-daterange" id="crimeAwarenessDtDiv">
-        <input type="text" class="form-control form-control-sm dateSelector" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(ica.crimeAwarenessDt, 'yyyy-MM-dd')}" autocomplete="off">
+        <div class="input-group">
+          <input type="hidden" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(ica.crimeAwarenessDt, 'yyyy-MM-dd HH:mm')}">
+          <input type="text" class="form-control form-control-sm w-70 crimeAwarenessDt dateSelector" id="crimeAwarenessDate" th:value="${#temporals.format(ica.crimeAwarenessDt, 'yyyy-MM-dd')}" autocomplete="off">
+          <input type="text" class="form-control form-control-sm w-30 crimeAwarenessDt timeInputer" id="crimeAwarenessTime" th:value="${#temporals.format(ica.crimeAwarenessDt, 'HH:mm')}" placeholder="hh:mm" autocomplete="off">
+        </div>
       </div>
       <label class="col-sm-1 col-form-label col-form-label-sm text-center">사건송치</label>
       <div class="col-sm-2 input-daterange" id="caseSentDtDiv">
@@ -526,7 +528,6 @@
           <th:block th:each="code:${session.commonCode.get('NNY')}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
           </th:block>
-          <option value="etc">기타</option>
         </select>
       </div>
       <label class="col-sm-1 col-form-label col-form-label-sm text-center">신병처리</label>
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
index c3148425..99be1c9d 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
@@ -98,6 +98,18 @@
                         </div>
                       </div>
                       <div class="row justify-content-end">
+                        <div class="col-2">
+                          <input type="text" class="form-control form-control-sm" placeholder="죄명" name="crimeName" th:value="${searchParams.crimeName}">
+                        </div>
+                        <div class="col-2"></div>
+                        <div class="col-4">
+                          <div class="input-group w-auto input-daterange" id="dateSelectorDiv">
+                            <input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
+                            <input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
+                          </div>
+                        </div>
+                      </div>
+                      <!--<div class="row justify-content-end">
                         <div class="col-2">
                           <input type="text" class="form-control form-control-sm" placeholder="죄명" name="crimeName" th:value="${searchParams.crimeName}">
                         </div>
@@ -133,7 +145,7 @@
                             <input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
                           </div>
                         </div>
-                      </div>
+                      </div>-->
                     </div>
                     <div class="col-1 d-grid gap-2">
                       <input type="submit" class="btn btn-primary" id="searchBtn" value="검색">
@@ -169,7 +181,7 @@
                         <th>검거원표</th>
                         <th>피의자원표</th>
                         <th>피의자 인적사항</th>
-                        <th>범죄인지</th>
+                        <th>검거일시</th>
                         <th>사건송치</th>
                         <th>작성자</th>
                         <th>작성일시</th>
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html
index 3f466d19..07dfd268 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html
@@ -285,7 +285,7 @@
   </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" th:text="${ica.crimeAwarenessDt}"></label>
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ica.crimeAwarenessDt, 'yyyy-MM-dd HH:mm')}"></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.caseSentDt}"></label>
   </div>