국제범죄 검거현황 작업중.

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java

@@ -18,6 +18,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -28,7 +29,6 @@ public class InternationalCrimeArrestController {
   private final AuthMgtService authMgtService;
   private final InternationalCrimeArrestService internationalCrimeArrestService;
   private final OrganConfigService organConfigService;
-  private final IcaSuspectInfoRepository suspectPersonInfoRepository;
   private final MenuMgtService menuMgtService;
 
   @GetMapping("/internationalCrimeArrest")
@@ -43,14 +43,15 @@ public class InternationalCrimeArrestController {
     mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
 
     internationalCrimeArrest.setQueryInfo();
+/*
     List<InternationalCrimeArrest> internationalCrimeArrestList = internationalCrimeArrestService.selectInternationalCrimeArrestList(internationalCrimeArrest);
 
     for (InternationalCrimeArrest ica:internationalCrimeArrestList) {
       ica.setSuspectInfoList(suspectPersonInfoRepository.findByIcaKey(ica.getIcaKey()));
     }
-
-    mav.addObject("internationalCrimeArrestList", internationalCrimeArrestList);
-    internationalCrimeArrest.setContentCnt(internationalCrimeArrestService.selectInternationalCrimeArrestListCnt(internationalCrimeArrest));
+*/
+    mav.addObject("internationalCrimeArrestList", new ArrayList<InternationalCrimeArrest>());
+    internationalCrimeArrest.setContentCnt(0);
     internationalCrimeArrest.setPaginationInfo();
     mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/internationalCrimeArrest"));
     mav.addObject("organConfigList", organConfigService.selectOrganList());
@@ -70,10 +71,9 @@ public class InternationalCrimeArrestController {
       internationalCrimeArrest.setWrtUserGrd(loginUser.getTitleCd());
       internationalCrimeArrest.setWrtUserNm(loginUser.getUserNm());
       internationalCrimeArrest.setWrtDt(LocalDateTime.now());
-      internationalCrimeArrest.setSuspectInfoList(suspectPersonInfoRepository.findByIcaKey(internationalCrimeArrest.getIcaKey()));
     }
     mav.addObject("organConfigList", organConfigService.selectOrganList());
-    mav.addObject("internationalCrimeArrest", internationalCrimeArrest);
+    mav.addObject("ica", internationalCrimeArrest);
     return mav;
   }
 

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java

@@ -11,6 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 @Getter
@@ -47,12 +48,12 @@ public class InternationalCrimeArrest extends BaseModel {
   @Column(name = "case_sent_dt")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private LocalDate caseSentDt;
+  @Column(name = "crime_form")
+  private String crimeForm;
   @Column(name = "case_num")
   private String caseNum;
   @Column(name = "case_overview")
   private String caseOverview;
-  @Column(name = "crime_form")
-  private String crimeForm;
   @Column(name = "status")
   private String status;
   @Column(name = "wrt_organ")
@@ -70,7 +71,7 @@ public class InternationalCrimeArrest extends BaseModel {
   private LocalDateTime wrtDt;
 
   @Transient
-  private List<IcaSuspectInfo> suspectInfoList;
+  private List<IcaSuspectInfo> suspectInfoList = new ArrayList<>();
   @Transient
-  private IcaSubInfo icaSubInfo;
+  private IcaSubInfo icaSubInfo = new IcaSubInfo();
 }

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java

@@ -3,6 +3,7 @@ package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.service;
 
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.mapper.InternationalCrimeArrestMapper;
+import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.IcaSubInfo;
 import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
 import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.IcaSuspectInfo;
 import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository.IcaSubInfoRepository;
@@ -18,8 +19,8 @@ import java.util.List;
 @Service
 @RequiredArgsConstructor
 public class InternationalCrimeArrestService extends BaseService {
-  private final InternationalCrimeArrestRepository internationalCrimeArrestRepository;
   private final InternationalCrimeArrestMapper internationalCrimeArrestMapper;
+  private final InternationalCrimeArrestRepository internationalCrimeArrestRepository;
   private final IcaSuspectInfoRepository icaSuspectInfoRepository;
   private final IcaSubInfoRepository icaSubInfoRepository;
 
@@ -42,6 +43,7 @@ public class InternationalCrimeArrestService extends BaseService {
   public InternationalCrimeArrest selectInternationalCrimeArrest(Integer icaKey) {
     InternationalCrimeArrest savedICA = internationalCrimeArrestRepository.findById(icaKey).orElse(null);
     if (savedICA != null) {
+      savedICA.setIcaSubInfo(icaSubInfoRepository.findById(icaKey).orElse(new IcaSubInfo()));
       savedICA.setSuspectInfoList(icaSuspectInfoRepository.findByIcaKey(icaKey));
     }
     return savedICA;

src/main/resources/static/js/faStatistics/internationalCrimeArrest.js

@@ -62,10 +62,62 @@ $(document).on('change', '#crimeType', function (){
   dynamicOption('#violationType', $(this).val());
 });
 
+$(document).on('change', '#violationType', function (){
+  inputControl(this.value);
+})
+
 $(document).on('change', '#searchCrimeType', function (){
   dynamicOption('#searchViolationType', $(this).val(), '위반유형');
 });
 
+$(document).on('change', '#crimeForm', function (){
+  if(this.value === "CMF001"){
+    $("#spiAddBtn").hide();
+  }else{
+    $("#spiAddBtn").show();
+  }
+})
+
+$(document).on('click', '#spiAddBtn', function (){
+  $("#spiDiv").append($("#spiInputDiv").children().clone());
+  spiRemoveBtnControl()
+})
+$(document).on('click', '.spiRemoveBtn', function (){
+  $(this).parents('.spi-list').remove();
+  spiRemoveBtnControl()
+})
+
+function spiRemoveBtnControl(){
+  if($(".spi-list").length>2){
+    $(".spiRemoveBtn").show();
+  }else{
+    $(".spiRemoveBtn").hide();
+  }
+}
+
+function inputControl(violationType){
+  $(".extInputDiv").hide();
+  switch (violationType) {
+    case "CTH101":
+    case "CTH102":
+    case "CTH103":
+      $("#extCommonInputDiv").show();
+    case "CTH104":
+    case "CTH105":
+      $("#"+violationType+"Div").show();
+      break;
+    case "CTH201":
+    case "CTH202":
+    case "CTH203":
+    case "CTH204":
+      $(".smugglingInputDiv").show();
+      break;
+    case "CTH401":
+      $("#"+violationType+"Div").show();
+      break;
+  }
+}
+
 function getIcaViewModal(icaKey){
   $.ajax({
     url: '/faStatistics/internationalCrimeArrestViewModal',

src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html

@@ -108,10 +108,10 @@
                       <div class="col-2">
                         <select class="form-select form-select-sm" name="processResult" id="processResult">
                           <option value="">신병처리 선택</option>
-                          <th:block th:each="commonCode:${session.commonCode.get('PCR')}">
+                          <!--<th:block th:each="commonCode:${session.commonCode.get('PCR')}">
                             <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
                                     th:selected="${commonCode.itemCd eq searchParams.processResult}"></option>
-                          </th:block>
+                          </th:block>-->
                         </select>
                       </div>
                       <div class="col-4">

src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html

@@ -1,17 +1,20 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="icaEditModalLabel" th:text="${internationalCrimeArrest.icaKey eq null ? '국제범죄검거 현황 수정' : '국제범죄검거 현황 등록'}">></h5>
+  <h5 class="modal-title text-white" id="icaEditModalLabel" th:text="${ica.icaKey eq null ? '국제범죄검거 현황 수정' : '국제범죄검거 현황 등록'}">></h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body" id="icaEditBody">
   <form action="#" method="post" id="icaEditForm">
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-    <input type="hidden" name="icaKey" th:value="${internationalCrimeArrest.icaKey}">
-    <input type="hidden" name="wrtOrgan" th:value="${internationalCrimeArrest.wrtOrgan}">
-    <input type="hidden" name="wrtNm" th:value="${internationalCrimeArrest.wrtNm}">
-    <input type="hidden" name="wrtDt" th:value="${#temporals.format(internationalCrimeArrest.wrtDt, 'yyyy-MM-dd HH:mm')}">
+    <input type="hidden" name="icaKey" th:value="${ica.icaKey}">
+    <input type="hidden" name="wrtOrgan" th:value="${ica.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${ica.wrtPart}">
+    <input type="hidden" name="wrtUserSeq" th:value="${ica.wrtUserSeq}">
+    <input type="hidden" name="wrtUserGrd" th:value="${ica.wrtUserGrd}">
+    <input type="hidden" name="wrtUserNm" th:value="${ica.wrtUserNm}">
+    <input type="hidden" name="wrtDt" th:value="${#temporals.format(ica.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <input type="hidden" id="contentStatus" name="contentStatus">
     <div class="row mb-1">
       <label class="col-sm-1 col-form-label col-form-label-sm text-center">지방청</label>
@@ -20,7 +23,7 @@
           <option value="">선택</option>
           <th:block th:each="organConfig:${organConfigList}">
             <th:block th:if="${organConfig.parentOrgan eq 'OG001' or organConfig.organCd eq 'OG001'}">
-              <option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq internationalCrimeArrest.organ}"></option>
+              <option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq ica.organ}"></option>
             </th:block>
           </th:block>
         </select>
@@ -30,8 +33,8 @@
        <select class="form-select form-select-sm" name="department">
          <option value="">선택</option>
          <th:block th:each="organConfig:${organConfigList}">
-           <th:block th:if="${organConfig.parentOrgan ne null && organConfig.organType ne 'OGC002' && organConfig.parentOrgan eq internationalCrimeArrest.organ}">
-             <option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq internationalCrimeArrest.department}"></option>
+           <th:block th:if="${organConfig.parentOrgan ne null && organConfig.organType ne 'OGC002' && organConfig.parentOrgan eq ica.organ}">
+             <option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq ica.department}"></option>
            </th:block>
          </th:block>
         </select>
@@ -44,7 +47,7 @@
           <option value="">선택</option>
           <th:block th:each="code:${session.commonCode.get('CTH')}">
             <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}"
-                    th:selected="${code.itemCd eq internationalCrimeArrest.crimeType}"></option>
+                    th:selected="${code.itemCd eq ica.crimeType}"></option>
           </th:block>
         </select>
       </div>
@@ -52,272 +55,160 @@
       <div class="col-sm-2">
         <select class="form-select form-select-sm" name="violationType" id="violationType">
           <option value="">선택</option>
-          <th:block th:each="code:${session.commonCode.get(internationalCrimeArrest.crimeType)}">
+          <th:block th:each="code:${session.commonCode.get(ica.crimeType)}">
             <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}"
-                    th:selected="${code.itemCd eq internationalCrimeArrest.violationType}"></option>
+                    th:selected="${code.itemCd eq ica.violationType}"></option>
           </th:block>
         </select>
       </div>
       <label class="col-sm-1 col-form-label col-form-label-sm text-center crimeName">죄명</label>
       <div class="col-sm-2 crimeName">
-        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </div>
     </div>
     <!--위반유형별 양식 시작-->
     <!--직접밀입국, 제주무사증 도외이탈, 밀출국 공통양식 시작-->
-    <div class="row mb-1">
+    <div class="row mb-1 extInputDiv" id="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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="icaSubInfo.stayQualification" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </div>
       <label class="col-sm-1 col-form-label col-form-label-sm text-center fs-10">밀입국 시도 해역</label>
       <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </div>
     </div>
     <!--직접밀입국, 제주무사증 도외이탈, 밀출국 공통양식 끝-->
     <!--직접밀입국 시작-->
-    <div class="row mb-1">
+    <div class="row mb-1 extInputDiv" id="CTH101Div" 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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </div>
     </div>
     <!--직접밀입국 끝-->
     <!--제주무사증 도외이탈 시작-->
-    <div class="row mb-1">
+    <div class="row mb-1 extInputDiv" id="CTH102Div" 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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </div>
     </div>
     <!--제주무사증 도외이탈 끝-->
     <!--밀출국 시작-->
-    <div class="row mb-1">
+    <div class="row mb-1 extInputDiv" id="CTH103Div" 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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </div>
     </div>
     <!--밀출국 끝-->
     <!--밀항 시작-->
-    <div class="row mb-1">
+    <div class="row mb-1 extInputDiv" id="CTH104Div" 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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </div>
-    </div>
-    <div class="row mb-1">
+      <div class="col-sm-3"></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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </div>
     </div>
     <!--밀항 끝-->
     <!--불법체류 및 취업 시작-->
-    <div class="row mb-1">
+    <div class="row mb-1 extInputDiv" id="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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </div>
     </div>
     <!--불법체류 및 취업 끝-->
     <!--밀수입출 시작-->
-    <div class="row mb-1">
+    <div class="row mb-1 extInputDiv" id="smugglingInputDiv" 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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </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="crimeName" th:value="${internationalCrimeArrest.crimeName}">
+        <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
       </div>
     </div>
-    <!--불법체류 및 취업 끝-->
+    <!--밀수입출 끝-->
+    <!--원산지 표시위반 시작-->
+    <div class="row mb-1 extInputDiv" id="CTH401Div" 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="crimeName" th:value="${ica.crimeName}">
+      </div>
+    </div>
+    <!--원산지 표시위반 끝-->
     <!--위반유형별 양식 끝-->
-    <!--<div class="row mb-1" id="spiInfoDiv">
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center" th:text="${internationalCrimeArrest.violationType eq 'VLT005' ? '불법체류 및 취업' : '피의자 정보'}">피의자 정보</label>
-      <div class="col-sm-10">
-        <div class="row" id="spiWrapper">
-          <th:block th:if="${internationalCrimeArrest.violationType eq 'VLT005'}">
-            <label class="col-sm-1 col-form-label col-form-label-sm text-center entryVisa">입국비자</label>
-            <div class="col-sm-2 entryVisa">
-              <input type="text" class="form-control form-control-sm" name="entryVisa" th:value="${internationalCrimeArrest.suspectPersonInfoList[0].entryVisa}">
-            </div>
-          </th:block>
-          <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="stayQualification" th:value="${internationalCrimeArrest.suspectPersonInfoList[0].stayQualification}">
-          </div>
-          <label class="col-sm-1 col-form-label col-form-label-sm text-center">체류기간 만료일</label>
-          <div class="col-sm-2 input-daterange" id="stayQualificationDiv">
-            <input type="text" class="form-control form-control-sm" name="stayPeriodExpiredDt" id="stayPeriodExpiredDt" th:value="${#temporals.format(internationalCrimeArrest.suspectPersonInfoList[0].stayPeriodExpiredDt, 'yyyy-MM-dd HH:mm')}">
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="row mb-1" id="meansDiv">
-      <th:block th:if="${internationalCrimeArrest.violationType eq 'VLT001' || internationalCrimeArrest.violationType eq 'VLT003'|| internationalCrimeArrest.violationType eq 'VLT004'}">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center" th:text="${internationalCrimeArrest.violationType eq 'VLT001' ? '밀입국 출발지(국가)' : (internationalCrimeArrest.violationType eq 'VLT003' ? '밀출국 행선지(도착예정지)' : '밀항 행선지(도착예정지)')}"></label>
-        <div class="col-sm-2">
-          <input type="text" class="form-control form-control-sm" name="destination">
-        </div>
-      </th:block>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center" th:text="${internationalCrimeArrest.violationType eq 'VLT001' ? '밀입국 수단(방법)' : (internationalCrimeArrest.violationType eq 'VLT002' ? '도외이탈 수단(방법)' : (internationalCrimeArrest.violationType eq 'VLT003' ? '밀출국 수단(방법)' : '밀항 수단(방법)'))}"></label>
-      <div class="col-sm-2">
-        <select class="form-select form-select-sm" name="means" id="means">
-          <option value="">선택</option>
-          <th:block th:if="${internationalCrimeArrest.violationType eq 'VLT001'}" th:each="commonCode:${session.commonCode.get('MS1')}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                    th:selected="${commonCode.itemCd eq internationalCrimeArrest.means}"></option>
-          </th:block>
-          <th:block th:if="${internationalCrimeArrest.violationType ne 'VLT001'}" th:each="commonCode:${session.commonCode.get('MS2')}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                    th:selected="${commonCode.itemCd eq internationalCrimeArrest.means}"></option>
-          </th:block>
-          <option value="etc" th:selected="${internationalCrimeArrest.means ne null && internationalCrimeArrest.means ne '' && !#strings.contains(internationalCrimeArrest.means, 'MS1') && !#strings.contains(internationalCrimeArrest.means, 'MS2')}">기타</option>
-        </select>
-        <th:block th:if="${internationalCrimeArrest.means ne null && internationalCrimeArrest.means ne '' && !#strings.contains(internationalCrimeArrest.means, 'MS1') && !#strings.contains(internationalCrimeArrest.means, 'MS2')}">
-          <div class="col-auto">
-            <input type="text" class="form-control form-control-sm" name="meansEtc" th:value="${internationalCrimeArrest.means}">
-          </div>
-        </th:block>
-      </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center" th:text="${internationalCrimeArrest.violationType eq 'VLT001' ? '밀입국 목적(사유)' : (internationalCrimeArrest.violationType eq 'VLT002' ? '도외이탈 목적(시유)' : (internationalCrimeArrest.violationType eq 'VLT003' ? '밀출국 목적(사유)' : '밀항 목적(사유)'))}"></label>
-      <div class="col-sm-2">
-        <select class="form-select form-select-sm" name="purpose" id="purpose">
-          <option value="">선택</option>
-          <th:block th:each="commonCode:${session.commonCode.get('PPS')}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                    th:selected="${commonCode.itemCd eq internationalCrimeArrest.purpose}"></option>
-          </th:block>
-          <option value="etc" th:selected="${internationalCrimeArrest.purpose ne null && internationalCrimeArrest.purpose ne '' && !#strings.contains(internationalCrimeArrest.purpose, 'PPS')}">기타</option>
-        </select>
-        <th:block th:if="${internationalCrimeArrest.purpose ne null && internationalCrimeArrest.purpose ne '' && !#strings.contains(internationalCrimeArrest.purpose, 'PPS')}">
-          <div class="col-auto">
-            <input type="text" class="form-control form-control-sm" name="purposeEtc" th:value="${internationalCrimeArrest.purpose}">
-          </div>
-        </th:block>
-      </div>
-    </div>
-    <div class="row mb-1" id="arrestAreaDiv">
-      <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="arrestArea" th:value="${internationalCrimeArrest.arrestArea}">
-      </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center" th:text="${internationalCrimeArrest.violationType eq 'VLT001' ? '밀입국 시도 해역(해안)' : (internationalCrimeArrest.violationType eq 'VLT002' ? '도외이탈 시도 해역(해안)' : (internationalCrimeArrest.violationType eq 'VLT003' ? '밀출국 시도 해역(해안)' : '밀항 시도 해역(해안)'))}"></label>
-      <div class="col-sm-3">
-        <select class="form-select form-select-sm" name="seaArea">
-          <option value="">선택</option>
-          <th:block th:each="commonCode:${session.commonCode.get('SAA')}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                    th:selected="${commonCode.itemCd eq internationalCrimeArrest.seaArea}"></option>
-          </th:block>
-        </select>
-      </div>
-    </div>
-    <th:block th:if="${internationalCrimeArrest.violationType eq 'VLT001' || internationalCrimeArrest.violationType eq 'VLT002' || internationalCrimeArrest.violationType eq 'VLT003'|| internationalCrimeArrest.violationType eq 'VLT004'}">
-
-    </th:block>
-    <th:block th:if="${internationalCrimeArrest.violationAmount ne null}">
-      <div class="row mb-1" id="violationAmountDiv">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center">표시위반 금액(만원)</label>
-        <div class="col-sm-2">
-          <input type="number" min="0" class="form-control form-control-sm" name="violationAmount" th:value="${internationalCrimeArrest.violationAmount}">
-        </div>
-      </div>
-    </th:block>
-    <div class="row mb-1" id="smugglingAmountDiv">
-      <th:block th:if="${internationalCrimeArrest.crimeType eq 'CTH2'}">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center">밀수입출 품목</label>
-        <div class="col-sm-2">
-          <select class="form-select form-select-sm" name="smuggledGoods" id="smugglingAmount">
-            <option value="">선택</option>
-            <th:block th:each="commonCode:${session.commonCode.get('SG')}">
-              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
-            </th:block>
-            <option value="etc" th:selected="${internationalCrimeArrest.smuggledGoods ne null && internationalCrimeArrest.smuggledGoods ne '' && !#strings.contains(internationalCrimeArrest.smuggledGoods, 'SG')}">기타</option>
-          </select>
-          <th:block th:if="${internationalCrimeArrest.smuggledGoods ne null && internationalCrimeArrest.smuggledGoods ne '' && !#strings.contains(internationalCrimeArrest.smuggledGoods, 'SG')}">
-            <div class="col-auto">
-              <input type="text" class="form-control form-control-sm" name="smuggledGoodsEtc" th:value="${internationalCrimeArrest.smuggledGoods}">
-            </div>
-          </th:block>
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center">밀수가액(만원)</label>
-        <div class="col-sm-2">
-          <input type="number" min="0" class="form-control form-control-sm" name="smugglingAmount" th:value="${internationalCrimeArrest.smugglingAmount}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center">단속 인원(경찰관)</label>
-        <div class="col-sm-2">
-          <input type="number" min="0" class="form-control form-control-sm" name="caseNum" th:value="${internationalCrimeArrest.caseNum}">
-        </div>
-      </th:block>
-    </div>-->
     <div class="row mb-1">
       <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="occurTable" th:value="${internationalCrimeArrest.occurTable}">
+        <input type="text" class="form-control form-control-sm" name="occurTable" th:value="${ica.occurTable}">
       </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="arrestTable" th:value="${internationalCrimeArrest.arrestTable}">
+        <input type="text" class="form-control form-control-sm" name="arrestTable" th:value="${ica.arrestTable}">
       </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="suspectTable" th:value="${internationalCrimeArrest.suspectTable}">
+        <input type="text" class="form-control form-control-sm" name="suspectTable" th:value="${ica.suspectTable}">
       </div>
     </div>
     <div class="row mb-1">
@@ -325,9 +216,9 @@
       <div class="col-sm-2" id="crimeFormDiv">
         <div class="input-group">
           <select class="form-select form-select-sm w-75" name="crimeForm" id="crimeForm">
-            <th:block th:each="commonCode:${session.commonCode.get('CMF')}">
-              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                      th:selected="${commonCode.itemCd eq internationalCrimeArrest.crimeForm}"></option>
+            <th:block th:each="code:${session.commonCode.get('CMF')}">
+              <option th:value="${code.itemCd}" th:text="${code.itemValue}"
+                      th:selected="${code.itemCd eq ica.crimeForm}"></option>
             </th:block>
           </select>
           <button type="button" class="btn btn-sm btn-primary w-25" id="spiAddBtn" style="display: none">
@@ -340,91 +231,87 @@
       <label class="col-sm-1 col-form-label col-form-label-sm text-center">피의자<br>인적사항</label>
       <div class="col-sm-11">
         <div class="border p-1" id="spiDiv">
-          <th:block th:if="${#lists.isEmpty(internationalCrimeArrest.suspectPersonInfoList)}">
+          <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-2" id="sexFormDiv">
+              <div class="col-sm-auto" id="sexFormDiv">
                 <select class="form-select form-select-sm" name="sex">
-                  <th:block th:each="commonCode:${session.commonCode.get('SEX')}">
-                    <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
+                  <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-2" id="ageFormDiv">
+              <div class="col-sm-auto" id="ageFormDiv">
                 <select class="form-select form-select-sm" name="age">
-                  <th:block th:each="commonCode:${session.commonCode.get('AGE')}">
-                    <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
+                  <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-2" id="countryFormDiv">
+              <div class="col-sm-auto" id="countryFormDiv">
                 <select class="form-select form-select-sm country" name="country">
-                  <th:block th:each="commonCode:${session.commonCode.get('NNY')}">
-                    <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
+                  <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>
-              <div class="col-sm-2">
+              <div class="col-sm-auto">
                 <select class="form-select form-select-sm" name="processResult" id="processResult">
                   <option value="">선택</option>
-                  <th:block th:each="commonCode:${session.commonCode.get('PCR')}">
-                    <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                            th:selected="${commonCode.itemCd eq internationalCrimeArrest.processResult}"></option>
+                  <th:block th:each="code:${session.commonCode.get('PCR')}">
+                    <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
                   </th:block>
-                  <option value="etc" th:selected="${internationalCrimeArrest.processResult ne null && internationalCrimeArrest.processResult ne '' && !#strings.contains(internationalCrimeArrest.processResult, 'PCR')}">기타(신병인계)</option>
+                  <option value="etc">기타(신병인계)</option>
                 </select>
               </div>
-              <!--<div class="row justify-content-end mb-1" id="processResultEtcDiv" 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="number" class="form-control form-control-sm" name="processResultEtc" th:value="${internationalCrimeArrest.processResult}">
-                </div>
-              </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(internationalCrimeArrest.suspectPersonInfoList)}">
-            <th:block th:each="suspectPersonInfo, i : ${internationalCrimeArrest.suspectPersonInfoList}">
+          <th:block th:unless="${#lists.isEmpty(ica.suspectInfoList)}">
+            <th:block th:each="suspectInfo, i : ${ica.suspectInfoList}">
               <div class="row spi-list m-0" th:classappend="${i.index > 0 ? 'dynamic' : ''}">
-                <input type="hidden" name="spiKey" th:value="${suspectPersonInfo.spiKey}">
+                <input type="hidden" name="spiKey" th:value="${suspectInfo.spiKey}">
                 <label class="col-sm-1 col-form-label col-form-label-sm text-center">성별</label>
                 <div class="col-sm-2" id="sexFormDiv">
                   <select class="form-select form-select-sm" name="sex">
-                    <th:block th:each="commonCode:${session.commonCode.get('SEX')}">
-                      <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                              th:selected="${suspectPersonInfo.sex ne null && commonCode.itemCd eq suspectPersonInfo.sex}"></option>
+                    <th:block th:each="code:${session.commonCode.get('SEX')}">
+                      <option th:value="${code.itemCd}" th:text="${code.itemValue}"
+                              th:selected="${suspectInfo.sex ne null && 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-2" id="ageFormDiv">
                   <select class="form-select form-select-sm" name="age">
-                    <th:block th:each="commonCode:${session.commonCode.get('AGE')}">
-                      <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                              th:selected="${suspectPersonInfo.age ne null && commonCode.itemCd eq suspectPersonInfo.age}"></option>
+                    <th:block th:each="code:${session.commonCode.get('AGE')}">
+                      <option th:value="${code.itemCd}" th:text="${code.itemValue}"
+                              th:selected="${suspectInfo.age ne null && 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-2" id="countryFormDiv">
                   <select class="form-select form-select-sm country" name="country" id="country">
-                    <th:block th:each="commonCode:${session.commonCode.get('NNY')}">
-                      <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                              th:selected="${suspectPersonInfo.country ne null && commonCode.itemCd eq suspectPersonInfo.country}"></option>
+                    <th:block th:each="code:${session.commonCode.get('NNY')}">
+                      <option th:value="${code.itemCd}" th:text="${code.itemValue}"
+                              th:selected="${suspectInfo.country ne null && code.itemCd eq suspectInfo.country}"></option>
                     </th:block>
-                    <option value="etc" th:selected="${suspectPersonInfo.country ne null && suspectPersonInfo.country ne '' && !#strings.contains(suspectPersonInfo.country, 'NNY')}">기타</option>
+                    <option value="etc" th:selected="${suspectInfo.country ne null && suspectInfo.country ne '' && !#strings.contains(suspectInfo.country, 'NNY')}">기타</option>
                   </select>
                 </div>
-                <th:block th:if="${suspectPersonInfo.country ne null && suspectPersonInfo.country ne '' && !#strings.contains(suspectPersonInfo.country, 'NNY')}">
+                <th:block th:if="${suspectInfo.country ne null && suspectInfo.country ne '' && !#strings.contains(suspectInfo.country, 'NNY')}">
                   <div class="col-sm-2">
-                    <input type="text" class="form-control form-control-sm" name="countryEtc" th:value="${suspectPersonInfo.country}">
+                    <input type="text" class="form-control form-control-sm" name="countryEtc" th:value="${suspectInfo.country}">
                   </div>
                 </th:block>
                 <th:block th:if="${i.index > 0}">
-                  <button type="button" class="col-sm-auto btn btn-sm btn-primary spiCancelBtn">
+                  <button type="button" class="col-sm-auto btn btn-sm btn-primary spiRemoveBtn" style="display: none">
                     <i class="bi bi-dash"></i>
                   </button>
                 </th:block>
@@ -437,21 +324,63 @@
     <div class="row mb-1">
       <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" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(internationalCrimeArrest.crimeAwarenessDt, 'yyyy-MM-dd')}">
+        <input type="text" class="form-control form-control-sm" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(ica.crimeAwarenessDt, 'yyyy-MM-dd')}">
       </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">
-        <input type="text" class="form-control form-control-sm" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(internationalCrimeArrest.caseSentDt, 'yyyy-MM-dd')}">
+        <input type="text" class="form-control form-control-sm" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(ica.caseSentDt, 'yyyy-MM-dd')}">
       </div>
     </div>
     <div class="row mb-1 justify-content-center">
       <label for="caseOverviewDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">범죄사실<br>(사건개요)</label>
       <div class="col-sm-11" id="caseOverviewDiv">
         <div id="editor"></div>
-        <textarea type='text' class="d-none" id="content" th:utext="${internationalCrimeArrest.caseOverview}"></textarea>
+        <textarea type='text' class="d-none" id="content" th:utext="${ica.caseOverview}"></textarea>
       </div>
     </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-auto">
+        <select class="form-select form-select-sm" name="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" name="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" name="country">
+          <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>
+      <div class="col-sm-auto">
+        <select class="form-select form-select-sm" name="processResult">
+          <option value="">선택</option>
+          <th:block th:each="code:${session.commonCode.get('PCR')}">
+            <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
+          </th:block>
+          <option value="etc">기타(신병인계)</option>
+        </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>
+  </div>
 </div>
 <div class="modal-footer bg-light">
 <!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->