국제범죄검거현황 요청사항 반영.

- 범죄인지 > 검거일시 명칭 변경. 시간 입력 가능하도록 변경.
 - 검색 조건 수정.

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")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-  private LocalDate crimeAwarenessDt;
+  private LocalDateTime crimeAwarenessDt;
   @Column(name = "case_sent_dt")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private LocalDate caseSentDt;

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,

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>

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>

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>