From 2bf4b346ad4b22eb8a4d6b44f23c676b6c594aa1 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: Thu, 3 Aug 2023 17:49:59 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84=20?=
 =?UTF-8?q?=EA=B2=80=EA=B1=B0=ED=98=84=ED=99=A9=20=20-=20=EC=9E=85?=
 =?UTF-8?q?=EA=B5=AD=EB=B9=84=EC=9E=90,=20=EC=B2=B4=EB=A5=98=EC=9E=90?=
 =?UTF-8?q?=EA=B2=A9,=20=EC=B2=B4=EB=A5=98=EA=B8=B0=EA=B0=84=20=EC=9E=85?=
 =?UTF-8?q?=EB=A0=A5=20=ED=95=AD=EB=AA=A9=20=EC=9C=84=EC=B9=98=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD.=20=20-=20=EA=B2=80=EC=83=89=20=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dbnt/faisp/config/BaseModel.java |   2 +
 .../model/IcaSubInfo.java                     |   8 +-
 .../model/IcaSuspectInfo.java                 |   9 +
 .../InternationalCrimeArrestMapper.xml        |  74 +++---
 .../faStatistics/internationalCrimeArrest.js  |  16 +-
 .../icaEditModal.html                         | 251 ++++++++++--------
 .../internationalCrimeArrest/icaList.html     |  52 +---
 .../icaViewModal.html                         |  23 +-
 8 files changed, 224 insertions(+), 211 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/config/BaseModel.java b/src/main/java/com/dbnt/faisp/config/BaseModel.java
index 53fa10ed..7d666b79 100644
--- a/src/main/java/com/dbnt/faisp/config/BaseModel.java
+++ b/src/main/java/com/dbnt/faisp/config/BaseModel.java
@@ -34,6 +34,8 @@ public class BaseModel {
   @Transient
   private Integer contentCnt=0;
   @Transient
+  private String searchKeyword;
+  @Transient
   private String dateSelector;
   @Transient
   private String startDate;
diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSubInfo.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSubInfo.java
index 5b350110..39963dfc 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSubInfo.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSubInfo.java
@@ -23,13 +23,6 @@ public class IcaSubInfo extends BaseModel {
   @Id
   @Column(name = "ica_key")
   private Integer icaKey;
-  @Column(name = "stay_qualification")
-  private String stayQualification;
-  @Column(name = "stay_period_expired_dt")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate stayPeriodExpiredDt;
-  @Column(name = "entry_visa")
-  private String entryVisa;
   @Column(name = "sea_area")
   private String seaArea;
   @Column(name = "arrest_area")
@@ -49,4 +42,5 @@ public class IcaSubInfo extends BaseModel {
   @Column(name = "violation_amount")
   private String violationAmount;
 
+
 }
diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java
index 8b45b222..1b558f31 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java
@@ -4,9 +4,11 @@ import com.dbnt.faisp.config.BaseModel;
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.List;
 
 @Getter
@@ -34,6 +36,13 @@ public class IcaSuspectInfo extends BaseModel {
   private String processResult;
   @Column(name = "suspect_name")
   private String suspectName;
+  @Column(name = "entry_visa")
+  private String entryVisa;
+  @Column(name = "stay_qualification")
+  private String stayQualification;
+  @Column(name = "stay_period_expired_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate stayPeriodExpiredDt;
 
   @Embeddable
   @Data
diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
index a1452ab4..34c75d3b 100644
--- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
+++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
@@ -19,42 +19,54 @@
       <if test='violationType != null and violationType != ""'>
         AND violation_type = #{violationType}
       </if>
-      <if test='caseNum != null and caseNum != ""'>
-        AND case_num = #{caseNum}
-      </if>
       <if test='crimeName != null and crimeName != ""'>
         AND crime_name LIKE CONCAT('%', #{crimeName}, '%')
       </if>
-      <if test='occurTable != null and occurTable != ""'>
-        AND occur_table LIKE CONCAT('%', #{occurTable}, '%')
-      </if>
-      <if test='arrestTable != null and arrestTable != ""'>
-        AND arrest_table LIKE CONCAT('%', #{arrestTable}, '%')
-      </if>
-      <if test='suspectTable != null and suspectTable != ""'>
-        AND suspect_table LIKE CONCAT('%', #{suspectTable}, '%')
-      </if>
-      <if test='crimeAwarenessDt != null'>
-        And crime_awareness_dt = #{crimeAwarenessDt}::DATE
-      </if>
-      <if test='caseSentDt != null'>
-        AND case_sent_dt = #{caseSentDt}::DATE
-      </if>
-      <if test='processResult != null and processResult != ""'>
-        AND ica_key in (
-          select ica_key
-          from ica_suspect_info
-          where process_result = #{processResult}
+      <if test='searchKeyword != null and searchKeyword != ""'>
+        and (suspect_table LIKE CONCAT('%', #{searchKeyword}, '%')
+          or arrest_table LIKE CONCAT('%', #{searchKeyword}, '%')
+          or occur_table LIKE CONCAT('%', #{searchKeyword}, '%')
+          or case_officer LIKE CONCAT('%', #{searchKeyword}, '%')
+          or case_overview LIKE CONCAT('%', #{searchKeyword}, '%')
+          or ica_key in (select ica_key
+              from ica_sub_info
+              where arrest_area LIKE CONCAT('%', #{searchKeyword}, '%')
+                or destination LIKE CONCAT('%', #{searchKeyword}, '%')
+                or crackdown_area LIKE CONCAT('%', #{searchKeyword}, '%')
+             )
+          or ica_key in (select ica_key
+              from ica_suspect_info
+              where stay_qualification LIKE CONCAT('%', #{searchKeyword}, '%')
+                or entry_visa LIKE CONCAT('%', #{searchKeyword}, '%')
+             )
         )
       </if>
-      <if test='dateSelector == "wrtDt"'>
-        <if test='startDate != null and startDate != ""'>
-          And wrt_dt >= #{startDate}::DATE
-        </if>
-        <if test='endDate != null and endDate != ""'>
-          AND wrt_dt &lt;= #{endDate}::DATE+1
-        </if>
-      </if>
+      <choose>
+        <when test='dateSelector == "wrtDt"'>
+          <if test='startDate != null and startDate != ""'>
+            And wrt_dt >= #{startDate}::DATE
+          </if>
+          <if test='endDate != null and endDate != ""'>
+            AND wrt_dt &lt;= #{endDate}::DATE+1
+          </if>
+        </when>
+        <when test='dateSelector == "awarenessDt"'>
+          <if test='startDate != null and startDate != ""'>
+            And crime_awareness_dt >= #{startDate}::DATE
+          </if>
+          <if test='endDate != null and endDate != ""'>
+            AND crime_awareness_dt &lt;= #{endDate}::DATE+1
+          </if>
+        </when>
+        <when test='dateSelector == "caseSentDt"'>
+          <if test='startDate != null and startDate != ""'>
+            And case_sent_dt >= #{startDate}::DATE
+          </if>
+          <if test='endDate != null and endDate != ""'>
+            AND case_sent_dt &lt;= #{endDate}::DATE+1
+          </if>
+        </when>
+      </choose>
     </where>
   </sql>
 
diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
index 88f8ce60..11f14af8 100644
--- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
+++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
@@ -109,8 +109,16 @@ $(document).on('change', '.etcSelfInput', function (){
     this.name = temp;
     selfInput.hide();
   }
-
 })
+$(document).on('change', '.country', function (){
+  const visaInfoDiv = $(this).parents(".spi-list").find(".visaInfoDiv")
+  if(this.value === "NNY001"){
+    visaInfoDiv.hide();
+  }else{
+    visaInfoDiv.show();
+  }
+})
+
 function spiRemoveBtnControl(){
   if($(".spi-list").length>2){
     $(".spiRemoveBtn").show();
@@ -177,7 +185,6 @@ function getIcaEditModal(icaKey){
         autoclose: true
       });
       setEditor('editor', '400');
-      spiRemoveBtnControl();
       inputControl($("#violationType").val());
     },
     error:function(e){
@@ -200,9 +207,12 @@ function saveInternationalCrimeArrest(status){
         formData.append("suspectInfoList["+idx+"].age", spi.find('.age').val());
         formData.append("suspectInfoList["+idx+"].country", spi.find('.country').val());
         formData.append("suspectInfoList["+idx+"].processResult", spi.find('.processResult').val());
+        formData.append("suspectInfoList["+idx+"].entryVisa", spi.find('.entryVisa').val());
+        formData.append("suspectInfoList["+idx+"].stayQualification", spi.find('.stayQualification').val());
+        formData.append("suspectInfoList["+idx+"].stayPeriodExpiredDt", spi.find('.stayPeriodExpiredDt').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 27249ea3..4139133c 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html
@@ -73,14 +73,6 @@
     <!--위반유형별 양식 시작-->
     <!--직접밀입국, 제주무사증 도외이탈, 밀출국 공통양식 시작-->
     <div class="row mb-1 extInputDiv extCommonInputDiv" style="display: none">
-      <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="subInfo.stayQualification" th:value="${ica.subInfo.stayQualification}">
-      </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">체류기간 만료일</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm dateSelector" name="subInfo.stayPeriodExpiredDt" th:value="${ica.subInfo.stayPeriodExpiredDt}" autocomplete="off">
-      </div>
       <label class="col-sm-1 col-form-label col-form-label-sm text-center fs-10">밀입국 시도 해역</label>
       <div class="col-sm-2">
         <select class="form-select form-select-sm" name="subInfo.seaArea">
@@ -296,22 +288,6 @@
       </div>
     </div>
     <!--밀항 끝-->
-    <!--불법체류 및 취업 시작-->
-    <div class="row mb-1 extInputDiv CTH105Div" style="display: none">
-      <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="subInfo.entryVisa" th:value="${ica.subInfo.entryVisa}">
-      </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="subInfo.stayQualification" th:value="${ica.subInfo.stayQualification}">
-      </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">체류기간 만료일</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" name="subInfo.stayPeriodExpiredDt" th:value="${ica.subInfo.stayPeriodExpiredDt}">
-      </div>
-    </div>
-    <!--불법체류 및 취업 끝-->
     <!--밀수입출 시작-->
     <div class="row mb-1 extInputDiv smugglingInputDiv" style="display: none">
       <label class="col-sm-1 col-form-label col-form-label-sm text-center">밀수입출 품목</label>
@@ -388,60 +364,17 @@
       <div class="col-sm-11">
         <div class="border p-1" id="spiDiv">
           <th:block th:if="${#lists.isEmpty(ica.suspectInfoList)}">
-            <div class="row spi-list m-0">
-              <label class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label>
-              <div class="col-sm-1">
-                <input type="text" class="form-control form-control-sm suspectName">
-              </div>
-              <label class="col-sm-1 col-form-label col-form-label-sm text-center">성별</label>
-              <div class="col-sm-auto">
-                <select class="form-select form-select-sm sex">
-                  <th:block th:each="code:${session.commonCode.get('SEX')}">
-                    <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
-                  </th:block>
-                </select>
-              </div>
-              <label class="col-sm-1 col-form-label col-form-label-sm text-center">나이</label>
-              <div class="col-sm-auto">
-                <select class="form-select form-select-sm age">
-                  <th:block th:each="code:${session.commonCode.get('AGE')}">
-                    <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
-                  </th:block>
-                </select>
-              </div>
-              <label class="col-sm-1 col-form-label col-form-label-sm text-center">국적</label>
-              <div class="col-sm-auto">
-                <select class="form-select form-select-sm country">
-                  <th:block th:each="code:${session.commonCode.get('NNY')}">
-                    <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
-                  </th:block>
-                </select>
-              </div>
-              <label class="col-sm-1 col-form-label col-form-label-sm text-center">신병처리</label>
-              <div class="col-sm-auto">
-                <select class="form-select form-select-sm processResult">
-                  <th:block th:each="code:${session.commonCode.get('PCR')}">
-                    <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
-                  </th:block>
-                </select>
-              </div>
-              <button type="button" class="btn btn-sm col-sm-auto btn-danger mb-1 spiRemoveBtn" style="display: none">
-                <i class="bi bi-dash"></i>
-              </button>
-            </div>
-          </th:block>
-          <th:block th:unless="${#lists.isEmpty(ica.suspectInfoList)}">
-            <th:block th:each="suspectInfo:${ica.suspectInfoList}">
-              <div class="row spi-list m-0">
+            <div class="spi-list">
+              <div class="row m-0">
                 <label class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label>
                 <div class="col-sm-1">
-                  <input type="text" class="form-control form-control-sm suspectName" th:value="${suspectInfo.suspectName}">
+                  <input type="text" class="form-control form-control-sm suspectName">
                 </div>
                 <label class="col-sm-1 col-form-label col-form-label-sm text-center">성별</label>
                 <div class="col-sm-auto">
                   <select class="form-select form-select-sm sex">
                     <th:block th:each="code:${session.commonCode.get('SEX')}">
-                      <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq suspectInfo.sex}"></option>
+                      <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
                     </th:block>
                   </select>
                 </div>
@@ -449,7 +382,7 @@
                 <div class="col-sm-auto">
                   <select class="form-select form-select-sm age">
                     <th:block th:each="code:${session.commonCode.get('AGE')}">
-                      <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq suspectInfo.age}"></option>
+                      <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
                     </th:block>
                   </select>
                 </div>
@@ -457,7 +390,7 @@
                 <div class="col-sm-auto">
                   <select class="form-select form-select-sm country">
                     <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>
+                      <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
                     </th:block>
                   </select>
                 </div>
@@ -465,7 +398,7 @@
                 <div class="col-sm-auto">
                   <select class="form-select form-select-sm processResult">
                     <th:block th:each="code:${session.commonCode.get('PCR')}">
-                      <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq suspectInfo.processResult}"></option>
+                      <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
                     </th:block>
                   </select>
                 </div>
@@ -473,6 +406,83 @@
                   <i class="bi bi-dash"></i>
                 </button>
               </div>
+              <div class="row m-0 visaInfoDiv" style="display: none;">
+                <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 entryVisa">
+                </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 stayQualification">
+                </div>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-center fs-11">체류기간 만료일</label>
+                <div class="col-sm-2">
+                  <input type="text" class="form-control form-control-sm dateSelector stayPeriodExpiredDt" readonly>
+                </div>
+              </div>
+              <hr class="my-1">
+            </div>
+          </th:block>
+          <th:block th:unless="${#lists.isEmpty(ica.suspectInfoList)}">
+            <th:block th:each="suspectInfo:${ica.suspectInfoList}">
+              <div class="spi-list">
+                <div class="row m-0">
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label>
+                  <div class="col-sm-1">
+                    <input type="text" class="form-control form-control-sm suspectName" th:value="${suspectInfo.suspectName}">
+                  </div>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center">성별</label>
+                  <div class="col-sm-auto">
+                    <select class="form-select form-select-sm sex">
+                      <th:block th:each="code:${session.commonCode.get('SEX')}">
+                        <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq suspectInfo.sex}"></option>
+                      </th:block>
+                    </select>
+                  </div>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center">나이</label>
+                  <div class="col-sm-auto">
+                    <select class="form-select form-select-sm age">
+                      <th:block th:each="code:${session.commonCode.get('AGE')}">
+                        <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq suspectInfo.age}"></option>
+                      </th:block>
+                    </select>
+                  </div>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center">국적</label>
+                  <div class="col-sm-auto">
+                    <select class="form-select form-select-sm country">
+                      <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>
+                    </select>
+                  </div>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center">신병처리</label>
+                  <div class="col-sm-auto">
+                    <select class="form-select form-select-sm processResult">
+                      <th:block th:each="code:${session.commonCode.get('PCR')}">
+                        <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq suspectInfo.processResult}"></option>
+                      </th:block>
+                    </select>
+                  </div>
+                  <button type="button" class="btn btn-sm col-sm-auto btn-danger mb-1 spiRemoveBtn" th:style="${#lists.size(ica.suspectInfoList)>1?'display: none':''}">
+                    <i class="bi bi-dash"></i>
+                  </button>
+                </div>
+                <div class="row m-0 visaInfoDiv" th:style="${suspectInfo.country eq 'NNY001'?'display: none':''}">
+                  <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 entryVisa" th:value="${suspectInfo.entryVisa}">
+                  </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 stayQualification" th:value="${suspectInfo.stayQualification}">
+                  </div>
+                  <label class="col-sm-auto col-form-label col-form-label-sm text-center fs-11">체류기간 만료일</label>
+                  <div class="col-sm-2">
+                    <input type="text" class="form-control form-control-sm stayPeriodExpiredDt" th:value="${suspectInfo.stayPeriodExpiredDt}">
+                  </div>
+                </div>
+                <hr class="my-1">
+              </div>
             </th:block>
           </th:block>
         </div>
@@ -501,46 +511,63 @@
     </div>
   </form>
   <div class="d-none" id="spiInputDiv">
-    <div class="row spi-list m-0">
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label>
-      <div class="col-sm-1">
-        <input type="text" class="form-control form-control-sm suspectName">
+    <div class="spi-list">
+      <div class="row m-0">
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label>
+        <div class="col-sm-1">
+          <input type="text" class="form-control form-control-sm suspectName">
+        </div>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">성별</label>
+        <div class="col-sm-auto">
+          <select class="form-select form-select-sm sex">
+            <th:block th:each="code:${session.commonCode.get('SEX')}">
+              <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
+            </th:block>
+          </select>
+        </div>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">나이</label>
+        <div class="col-sm-auto">
+          <select class="form-select form-select-sm age">
+            <th:block th:each="code:${session.commonCode.get('AGE')}">
+              <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
+            </th:block>
+          </select>
+        </div>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">국적</label>
+        <div class="col-sm-auto">
+          <select class="form-select form-select-sm country">
+            <th:block th:each="code:${session.commonCode.get('NNY')}">
+              <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
+            </th:block>
+          </select>
+        </div>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">신병처리</label>
+        <div class="col-sm-auto">
+          <select class="form-select form-select-sm processResult">
+            <th:block th:each="code:${session.commonCode.get('PCR')}">
+              <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
+            </th:block>
+          </select>
+        </div>
+        <button type="button" class="btn btn-sm col-sm-auto btn-danger mb-1 spiRemoveBtn">
+          <i class="bi bi-dash"></i>
+        </button>
       </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center">성별</label>
-      <div class="col-sm-auto">
-        <select class="form-select form-select-sm sex">
-          <th:block th:each="code:${session.commonCode.get('SEX')}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
-          </th:block>
-        </select>
+      <div class="row m-0 visaInfoDiv" style="display: none;">
+        <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 entryVisa">
+        </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 stayQualification">
+        </div>
+        <label class="col-sm-auto col-form-label col-form-label-sm text-center fs-11">체류기간 만료일</label>
+        <div class="col-sm-2">
+          <input type="text" class="form-control form-control-sm stayPeriodExpiredDt">
+        </div>
       </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center">나이</label>
-      <div class="col-sm-auto">
-        <select class="form-select form-select-sm age">
-          <th:block th:each="code:${session.commonCode.get('AGE')}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
-          </th:block>
-        </select>
-      </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center">국적</label>
-      <div class="col-sm-auto">
-        <select class="form-select form-select-sm country country">
-          <th:block th:each="code:${session.commonCode.get('NNY')}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
-          </th:block>
-        </select>
-      </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center">신병처리</label>
-      <div class="col-sm-auto">
-        <select class="form-select form-select-sm processResult">
-          <th:block th:each="code:${session.commonCode.get('PCR')}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
-          </th:block>
-        </select>
-      </div>
-      <button type="button" class="btn btn-sm col-sm-auto btn-danger mb-1 spiRemoveBtn">
-        <i class="bi bi-dash"></i>
-      </button>
+      <hr class="my-1">
     </div>
   </div>
 </div>
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
index d94b6521..e36db622 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
@@ -38,7 +38,6 @@
           <div class="tab-content bg-white border border-top-0 p-2">
             <form method="get" th:action="@{/faStatistics/icaList}" id="icaSearchForm">
               <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
-              <input type="hidden" name="dateSelector" value="wrtDt">
               <div class="row justify-content-between py-1">
                 <div class="col-auto">
                   <div class="row">
@@ -55,9 +54,6 @@
                   <div class="row">
                     <div class="col-11">
                       <div class="row justify-content-end">
-                        <!-- <div class="col-2">
-                           <input type="text" class="form-control form-control-sm" placeholder="사건번호" name="caseNum" th:value="${searchParams.caseNum}">
-                         </div>-->
                         <div class="col-2">
                           <select class="form-select form-select-sm" name="organ">
                             <option value="">지방청 선택</option>
@@ -97,54 +93,22 @@
                           </select>
                         </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">
-                          <input type="text" class="form-control form-control-sm" name="" placeholder="개발중">
-                        </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>
                         <div class="col-2">
-                          <input type="text" class="form-control form-control-sm" placeholder="발생원표" name="occurTable" th:value="${searchParams.occurTable}">
-                        </div>
-                        <div class="col-2">
-                          <input type="text" class="form-control form-control-sm" placeholder="검거원표" name="arrestTable" th:value="${searchParams.arrestTable}">
-                        </div>
-                        <div class="col-2">
-                          <input type="text" class="form-control form-control-sm" placeholder="피의자원표" name="suspectTable" th:value="${searchParams.suspectTable}">
-                        </div>
-                      </div>
-                      <div class="row justify-content-end">
-                        <div class="col-2">
-                          <input type="text" class="form-control form-control-sm dateSelector" placeholder="범죄인지" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(searchParams.crimeAwarenessDt, 'yyyy-MM-dd')}" autocomplete="off">
-                        </div>
-                        <div class="col-2">
-                          <input type="text" class="form-control form-control-sm dateSelector" placeholder="사건송치" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(searchParams.caseSentDt, 'yyyy-MM-dd')}" autocomplete="off">
-                        </div>
-                        <div class="col-2">
-                          <select class="form-select form-select-sm" name="processResult" id="processResult">
-                            <option value="">신병처리 선택</option>
-                            <th:block th:each="code:${session.commonCode.get('PCR')}">
-                              <option th:value="${code.itemCd}" th:text="${code.itemValue}"
-                                      th:selected="${code.itemCd eq searchParams.processResult}"></option>
-                            </th:block>
-                          </select>
+                          <input type="text" class="form-control form-control-sm" name="searchKeyword" placeholder="통합검색" th:value="${searchParams.searchKeyword}">
                         </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}">
+                            <select class="form-select form-select-sm w-30" name="dateSelector">
+                              <option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">작성일</option>
+                              <option value="awarenessDt" th:selected="${searchParams.dateSelector eq 'awarenessDt'}">범죄인지</option>
+                              <option value="caseSentDt" th:selected="${searchParams.dateSelector eq 'caseSentDt'}">사건송치</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}">
+                            <input type="text" class="form-control form-control-sm w-35" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
                           </div>
                         </div>
                       </div>
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html
index 07dfd268..1f831e98 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html
@@ -51,10 +51,6 @@
   <!--위반유형별 양식 시작-->
   <!--직접밀입국, 제주무사증 도외이탈, 밀출국 공통양식 시작-->
   <div class="row mb-1 extInputDiv extCommonInputDiv" style="display: none">
-    <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.subInfo.stayQualification}"></label>
-    <label class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">체류기간 만료일</label>
-    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.subInfo.stayPeriodExpiredDt}"></label>
     <label class="col-sm-1 col-form-label col-form-label-sm text-center fs-10">밀입국 시도 해역</label>
     <label class="col-sm-2 col-form-label col-form-label-sm text-start">
       <th:block th:if="${ica.subInfo.seaArea ne null}">
@@ -194,16 +190,6 @@
     </label>
   </div>
   <!--밀항 끝-->
-  <!--불법체류 및 취업 시작-->
-  <div class="row mb-1 extInputDiv CTH105Div" style="display: none">
-    <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.subInfo.entryVisa}"></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.subInfo.stayQualification}"></label>
-    <label class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">체류기간 만료일</label>
-    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.subInfo.stayPeriodExpiredDt}"></label>
-  </div>
-  <!--불법체류 및 취업 끝-->
   <!--밀수입출 시작-->
   <div class="row mb-1 extInputDiv smugglingInputDiv" style="display: none">
     <label class="col-sm-1 col-form-label col-form-label-sm text-center">밀수입출 품목</label>
@@ -279,6 +265,15 @@
               </th:block>
             </label>
           </div>
+          <div class="row m-0" th:if="${suspect.country ne 'NNY001'}">
+            <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="${suspect.entryVisa}"></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="${suspect.stayQualification}"></label>
+            <label class="col-sm-auto col-form-label col-form-label-sm text-center fs-11">체류기간 만료일</label>
+            <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${suspect.stayPeriodExpiredDt}"></label>
+          </div>
+          <hr class="my-1">
         </th:block>
       </div>
     </div>