From 61fe872019dd9d9f6f225c9d76db2e66e686666e 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: Thu, 5 Oct 2023 13:39:34 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EA=B0=80=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InternationalCrimeArrestMapper.xml        |  2 +-
 .../faStatistics/internationalCrimeArrest.js  | 31 +++++++++----------
 .../internationalCrimeArrest/icaList.html     |  2 +-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
index e5eb7437..cbebb0af 100644
--- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
+++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
@@ -91,7 +91,7 @@
           a.wrt_dt
     FROM international_crime_arrest a
     <include refid="selectInternationalCrimeArrestListWhere"></include>
-    ORDER BY a.crime_awareness_dt DESC nulls last, wrt_dt desc
+    ORDER BY a.case_sent_dt DESC nulls last, wrt_dt desc
     LIMIT #{rowCnt} OFFSET #{firstIndex}
   </select>
 
diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
index 92199835..a4d5b28a 100644
--- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
+++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
@@ -240,43 +240,42 @@ function saveInternationalCrimeArrest(status){
 }
 
 function contentCheck(status){
-  let flag = true;
   if(status !== "DST001"){
     if(!$("#organSelector").val()){
       alert("지방청을 선택해주세요.")
-      flag = false;
+      return false;
     }
     if(!$("#departmentSelector").val()){
       alert("관할서를 선택해주세요.")
-      flag = false;
+      return false;
     }
     if(!$("#caseOfficer").val()){
       alert("담당경찰관을 입력해주세요.")
-      flag = false;
+      return false;
     }
     if(!$("#crimeType").val()){
       alert("범죄테마를 선택해주세요.")
-      flag = false;
+      return false;
     }
     if(!$("#violationType").val()){
       alert("위반유형을 선택해주세요.")
-      flag = false;
+      return false;
     }
     if(!$("#crimeName").val()){
       alert("죄명을 입력해주세요.")
-      flag = false;
+      return false;
     }
     if(!$("#occurTable").val()){
       alert("발생원표를 입력해주세요.")
-      flag = false;
+      return false;
     }
     if(!$("#arrestTable").val()){
       alert("검거원표를 입력해주세요.")
-      flag = false;
+      return false;
     }
     if(!$("#suspectTable").val()){
       alert("피의자원표를 입력해주세요.")
-      flag = false;
+      return false;
     }
     const suspectNames = $("#spiDiv").find(".suspectName");
     let suspectFlag = false;
@@ -287,28 +286,28 @@ function contentCheck(status){
     })
     if(suspectFlag){
       alert("피의자 이름을 입력해주세요")
-      flag = false;
+      return false;
     }
     if(!$("#caseSentDt").val()){
       alert("사건송치를 입력해주세요.")
-      flag = false;
+      return false;
     }
     if(!CrossEditor.IsDirty()){
       alert("범죄사실을 입력해주세요.")
-      flag = false;
+      return false;
     }
   }
   if($("#crimeAwarenessDt").val()){
     if(!$("#crimeAwarenessDate").val()){
       alert("검거일자를 입력해주세요.")
-      flag = false;
+      return false;
     }
     if(!$("#crimeAwarenessTime").val()){
       alert("검거시간을 입력해주세요.")
-      flag = false;
+      return false;
     }
   }
-  return flag;
+  return true;
 }
 
 $(document).on('click', '#icaExcelDownBtn', function (){
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
index f57a25e7..0152bc3c 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
@@ -103,8 +103,8 @@
                         <div class="col-4">
                           <div class="input-group w-auto input-daterange" id="dateSelectorDiv">
                             <select class="form-select form-select-sm w-30" name="dateSelector">
-                              <option value="awarenessDt" th:selected="${searchParams.dateSelector eq 'awarenessDt'}">검거일시</option>
                               <option value="caseSentDt" th:selected="${searchParams.dateSelector eq 'caseSentDt'}">사건송치</option>
+                              <option value="awarenessDt" th:selected="${searchParams.dateSelector eq 'awarenessDt'}">검거일시</option>
                               <option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">작성일</option>
                             </select>
                             <input type="text" class="form-control form-control-sm w-35" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">