작업중_불법조업 > 불법조업 외국어선 정보 기능 추가.

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java

@@ -5,6 +5,7 @@ import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.UnlawfulFishingParam;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.*;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.IllegalShipInfo;
+import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.IllegalShipInfoHistory;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ShipProcessInfo;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.IllegalShipSailor;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.UnlawfulFishingService;
@@ -125,6 +126,7 @@ public class UnlawfulFishingController {
     ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal");
     if(illegalShipInfo.getFbKey()!=null){
       illegalShipInfo = unlawfulFishingService.selectIllegalShipInfo(illegalShipInfo.getFbKey());
+      illegalShipInfo.setCaseNum(unlawfulFishingService.selectCrackdownInfo(illegalShipInfo.getCdsKey()).getCaseNum());
     }else{
       illegalShipInfo.setWrtOrgan(loginUser.getOgCd());
       illegalShipInfo.setWrtPart(loginUser.getOfcCd());
@@ -132,7 +134,22 @@ public class UnlawfulFishingController {
       illegalShipInfo.setWrtUserGrd(loginUser.getTitleCd());
       illegalShipInfo.setWrtUserNm(loginUser.getUserNm());
     }
-    mav.addObject("illegalShipInfo", illegalShipInfo);
+    mav.addObject("shipInfo", illegalShipInfo);
+    return mav;
+  }
+
+  @GetMapping("/isiViewModal")
+  public ModelAndView illegalShipInfoViewModal(@AuthenticationPrincipal UserInfo loginUser, IllegalShipInfo isi){
+    ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal");
+    isi = unlawfulFishingService.selectIllegalShipInfo(isi.getFbKey());
+    isi.setHistoryList(unlawfulFishingService.selectIllegalShipInfoHistoryList(isi.getFbKey()));
+    mav.addObject("shipInfo", isi);
+    mav.addObject("crackdownInfo", unlawfulFishingService.selectCrackdownInfo(isi.getCdsKey()));
+
+    AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/illegalShipInfo").get(0);
+    mav.addObject("accessAuth", accessConfig.getAccessAuth());
+    mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
+    mav.addObject("userSeq", loginUser.getUserSeq());
     return mav;
   }
 
@@ -142,6 +159,18 @@ public class UnlawfulFishingController {
     return unlawfulFishingService.saveIllegalShipInfo(illegalShipInfo);
   }
 
+  @PostMapping("/deleteIllegalShipInfo")
+  public void deleteIllegalShipInfo(IllegalShipInfo illegalShipInfo){
+    unlawfulFishingService.deleteIllegalShipInfo(illegalShipInfo.getFbKey());
+  }
+
+  @GetMapping("/isiHistoryDiv")
+  public ModelAndView isiHistoryDiv(IllegalShipInfoHistory isih){
+    ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv");
+    mav.addObject("shipInfo", unlawfulFishingService.selectIllegalShipInfoHistory(isih.getFbKey(), isih.getVersionNo()));
+    return mav;
+  }
+
   @GetMapping("/isiSelectModal")
   public ModelAndView illegalShipInfoSelectModal(@AuthenticationPrincipal UserInfo loginUser, IllegalShipInfo params){
     ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal");

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java

@@ -13,6 +13,14 @@ import java.util.List;
 @NoArgsConstructor
 public class UnlawfulFishingParam  extends BaseModel {
 
+  private String caseNum;
+  private String permitNum;
+  private String boatNny;
+  private String boatName;
+  private String boatMaterial;
+  private String fisheryType;
+
+
   private Integer year;
   private Integer month;
   private String caseAgency;
@@ -20,31 +28,10 @@ public class UnlawfulFishingParam  extends BaseModel {
   private String crackdownPolice;
   private String crackdownBoat;
   private String napoPoint;
-  private String boatNameKr;
-  private String boatNnySung;
-  private String boatNnySi;
   private Double tonMin;
   private Double tonMax;
-  private String boatMaterial;
-  private String fisheryType;
   private List<String> violationList;
   private String processStatus;
-
-  /*
-  private List<String> violationList;
-  private String caseAgency;
-  private String crackdownPolice;
-  private String crackdownBoat;
-  private String boatNameKr;
-  private String boatNnySung;
-  private String boatNnySi;
-  private Double tonMin;
-  private Double tonMax;
-  private String boatMaterial;
-  private String fisheryType;
-  private String processStatus;
-  */
-  private String caseNum;
   private String napoSeaPointDetail;
   private String nll;
   private String mmsi;

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/IllegalShipInfo.java

@@ -7,6 +7,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 @Getter
 @Setter
@@ -27,4 +28,7 @@ public class IllegalShipInfo extends FishingBoatBaseEntity {
 
   @Transient
   private String caseNum;
+
+  @Transient
+  private List<IllegalShipInfoHistory> historyList;
 }

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/IllegalShipInfoHistory.java

@@ -25,9 +25,6 @@ public class IllegalShipInfoHistory extends FishingBoatBaseEntity {
   @Column(name = "version_no")
   private Integer versionNo;
 
-  @Transient
-  private List<ViolationVersion> violationList;
-
   @Embeddable
   @Data
   @NoArgsConstructor

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/IllegalShipInfoHistoryRepository.java

@@ -3,8 +3,11 @@ package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.IllegalShipInfoHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface IllegalShipInfoHistoryRepository extends JpaRepository<IllegalShipInfoHistory, IllegalShipInfoHistory.IllegalShipInfoHistoryId> {
   Optional<IllegalShipInfoHistory> findTop1ByFbKeyOrderByVersionNoDesc(Integer fbKey);
+
+  List<IllegalShipInfoHistory> findByFbKeyOrderByVersionNoDesc(Integer fbKey);
 }

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java

@@ -159,6 +159,10 @@ public class UnlawfulFishingService {
     return isiRepository.findByFbKey(fbKey).orElse(new IllegalShipInfo());
   }
 
+  public List<IllegalShipInfoHistory> selectIllegalShipInfoHistoryList(Integer fbKey) {
+    return isihRepository.findByFbKeyOrderByVersionNoDesc(fbKey);
+  }
+
   public ShipProcessInfo selectShipProcessInfo(Integer prKey) {
     return spiRepository.findByPrKey(prKey).orElse(new ShipProcessInfo());
   }
@@ -187,6 +191,15 @@ public class UnlawfulFishingService {
     return fbKey;
   }
 
+  public IllegalShipInfoHistory selectIllegalShipInfoHistory(Integer fbKey, Integer versionNo) {
+    return isihRepository.findById(new IllegalShipInfoHistory.IllegalShipInfoHistoryId(fbKey, versionNo)).orElse(null);
+  }
+
+  @Transactional
+  public void deleteIllegalShipInfo(Integer fbKey) {
+    isiRepository.bulkModifyingByFbKeyToStatus(fbKey, "DST008");
+  }
+
   public List<IllegalShipInfo> selectIllegalShipInfoList(UnlawfulFishingParam params) {
     return unlawfulFishingMapper.selectIllegalShipInfoList(params);
   }

src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml

@@ -134,5 +134,39 @@
   </select>
   <sql id="selectIllegalShipInfoListWhere">
     where a.status &lt;> 'DST008'
+      <if test='caseNum != null and caseNum != ""'>
+        and b.case_num like '%'||#{caseNum}||'%'
+      </if>
+      <if test='permitNum != null and permitNum != ""'>
+        and a.permit_num like '%'||#{permitNum}||'%'
+      </if>
+      <if test='boatNny != null and boatNny != ""'>
+        and (a.boat_nny_sung like '%'||#{boatNny}||'%' or a.boat_nny_si like '%'||#{boatNny}||'%')
+      </if>
+      <if test='boatName != null and boatName != ""'>
+        and (a.boat_name_kr like '%'||#{boatName}||'%' or a.boat_name_cn like '%'||#{boatName}||'%')
+      </if>
+      <if test='boatMaterial != null and boatMaterial != ""'>
+        and a.boat_material = #{boatMaterial}
+      </if>
+      <if test='fisheryType != null and fisheryType != ""'>
+        and a.fishery_type = #{fisheryType}
+      </if>
+      <if test='dateSelector == "paymentDt"'>
+        <if test='startDate != null and startDate != ""'>
+          and a.payment_payment_dt >= #{startDate}::date
+        </if>
+        <if test='endDate != null and endDate != ""'>
+          and a.payment_payment_dt &lt;= #{endDate}::date+1
+        </if>
+      </if>
+      <if test='dateSelector == "wrtDt"'>
+        <if test='startDate != null and startDate != ""'>
+          and a.wrt_dt >= #{startDate}::date
+        </if>
+        <if test='endDate != null and endDate != ""'>
+          and a.wrt_dt &lt;= #{endDate}::date+1
+        </if>
+      </if>
   </sql>
 </mapper>

src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipInfo.js

@@ -29,11 +29,28 @@ $(document).on('change', '#confiscationSelector', function (){
     confiscationInput.removeAttr('disabled')
   }
 })
-
+$(document).on('change', '#paymentDate,#paymentTime', function (){
+  $("#paymentPaymentDt").val($("#paymentDate").val()+" "+$("#paymentTime").val())
+})
 $(document).on('click', '.saveEditInfoBtn', function (){
   saveIllegalShipInfo($(this).attr("data-status"))
 })
 
+$(document).on('click', '.shipInfoTr', function (){
+  getIsiViewModal($(this).attr('data-fbkey'))
+})
+
+$(document).on('click', '#editShipInfoBtn', function (){
+  $("#isiViewModal").modal('hide');
+  getIsiEditModal($("#fishingBoatViewTabPanel").find(".fbKey").val());
+})
+$(document).on('click', '#deleteShipInfoBtn', function (){
+  deleteShipInfo($("#fishingBoatViewTabPanel").find(".fbKey").val());
+})
+$(document).on('click', '.versionInfoTr', function (){
+  getIsiHistory($(this).find(".fbKey").val(), $(this).find(".versionNo").val());
+})
+
 function getIsiEditModal(fbKey){
   $.ajax({
     url: '/unlawfulFishing/isiEditModal',
@@ -56,6 +73,23 @@ function getIsiEditModal(fbKey){
   });
 }
 
+function getIsiViewModal(fbKey){
+  $.ajax({
+    url: '/unlawfulFishing/isiViewModal',
+    data: {fbKey: fbKey},
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      const contentDiv = $("#isiViewModalContent");
+      contentDiv.empty().append(html)
+      $("#isiViewModal").modal('show');
+    },
+    error:function(e){
+      ajaxErrorAction(e);
+    }
+  });
+}
+
 function saveIllegalShipInfo(status){
   if (confirm("저장하시겠습니까?")) {
     if (valueCheck(status)) {
@@ -95,3 +129,41 @@ function valueCheck(status){
   }
   return true;
 }
+
+function deleteShipInfo(fbKey){
+  if(confirm("삭제하시겠습니까?\n되돌릴 수 없습니다.")){
+    contentFade("in");
+    $.ajax({
+      type : 'POST',
+      data : JSON.stringify({fbKey: fbKey}),
+      url : "/unlawfulFishing/deleteIllegalShipInfo",
+      contentType: 'application/json',
+      beforeSend: function (xhr){
+        xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
+      },
+      success : function(result) {
+        alert("삭제되었습니다.");
+        location.reload();
+      },
+      error : function(xhr, status) {
+        alert("삭제를 실패하였습니다.")
+        contentFade("out");
+      }
+    })
+  }
+}
+
+function getIsiHistory(fbKey, versionNo){
+  $.ajax({
+    url: '/unlawfulFishing/isiHistoryDiv',
+    data: {fbKey: fbKey, versionNo: versionNo},
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#versionInfoDiv").empty().append(html)
+    },
+    error:function(e){
+      ajaxErrorAction(e);
+    }
+  });
+}

src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiViewModal.html

@@ -36,11 +36,11 @@
         </div>
       </div>
       <div class="row border border-secondary">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">사건번호</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">사건번호</label>
         <div class="col-sm-2 border-end border-secondary">
           <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownInfo.caseNum}">
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">위반사항</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">위반사항</label>
         <div class="col-sm-8">
           <div class="row">
             <th:block th:each="violation:${crackdownInfo.violationList}">
@@ -54,23 +54,23 @@
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center fs-11">사건담당경찰서</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">사건담당경찰서</label>
         <div class="col-sm-2 border-end border-secondary">
           <th:block th:each="code:${session.commonCode.get('OG')}">
             <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownInfo.caseAgency}" th:value="${code.itemValue}">
           </th:block>
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center fs-11">사건담당경찰관</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">사건담당경찰관</label>
         <div class="col-sm-2 border-end border-secondary">
           <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownInfo.casePoliceOfficer}">
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">단속경찰서</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">단속경찰서</label>
         <div class="col-sm-2 border-end border-secondary">
           <th:block th:each="code:${session.commonCode.get('CPO')}">
             <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownInfo.crackdownPolice}" th:value="${code.itemValue}">
           </th:block>
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">단속함정</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">단속함정</label>
         <div class="col-sm-2">
           <th:block th:each="code:${session.commonCode.get(crackdownInfo.crackdownPolice)}">
             <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownInfo.crackdownBoat}" th:value="${code.itemValue}">
@@ -78,31 +78,31 @@
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">MMSI.NO</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">MMSI.NO</label>
         <div class="col-sm-2 border-end border-secondary">
           <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownInfo.mmsi}">
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">침범유형</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">침범유형</label>
         <div class="col-sm-2 border-end border-secondary">
           <th:block th:each="code:${session.commonCode.get('IST')}">
             <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownInfo.invasionType}" th:value="${code.itemValue}">
           </th:block>
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">NLL</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">NLL</label>
         <div class="col-sm-2 border-end border-secondary">
           <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownInfo.nll eq 'Y'?'O':(crackdownInfo.nll eq 'N'?'X':crackdownInfo.nll)}">
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center fs-11">압송/현장조사</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">압송/현장조사</label>
         <div class="col-sm-2">
           <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownInfo.fieldIvsgt eq 'C'?'압송':(crackdownInfo.fieldIvsgt eq 'F'?'현장조사':crackdownInfo.fieldIvsgt)}">
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">나포일시</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">나포일시</label>
         <div class="col-sm-2 border-end border-secondary">
           <input type="text" class="form-control form-control-sm border-0" readonly th:value="${#temporals.format(crackdownInfo.napoDt, 'yyyy-MM-dd hh:mm')}">
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">나포장소</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">나포장소</label>
         <div class="col-sm-8">
           <input type="text" class="form-control form-control-sm border-0" readonly th:value="|${crackdownInfo.napoSeaPointLon} ${crackdownInfo.napoSeaPointLat} ${crackdownInfo.napoSeaPointDetail}|">
         </div>
@@ -116,47 +116,47 @@
                                      !#strings.isEmpty(crackdownInfo.materialDamageDetail)}">
         <th:block th:if="${damageFlag}">
           <div class="row border border-secondary border-top-0">
-            <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB2">특수공무집행방해</label>
+            <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB2">특수공무집행방해</label>
             <div class="col-sm-11">
               <div class="row border-bottom border-secondary">
-                <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">인적피해</label>
+                <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">인적피해</label>
                 <div class="col-sm-11">
                   <div class="row border-bottom border-secondary">
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">발생건수</label>
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">발생건수</label>
-                    <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+                    <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
                       <th:block th:if="${crackdownInfo.obstrExspdCnt>0}" th:text="|${crackdownInfo.obstrExspdCnt}건|"></th:block>
                     </label>
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">피해인원</label>
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">피해인원</label>
-                    <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+                    <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
                       <th:block th:if="${crackdownInfo.personDamageCnt>0}" th:text="|${crackdownInfo.personDamageCnt}인|"></th:block>
                     </label>
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">피해액</label>
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">피해액</label>
-                    <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+                    <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
                       <th:block th:if="${crackdownInfo.personDamageAmount>0}" th:text="|${crackdownInfo.personDamageAmount}만원|"></th:block>
                     </label>
                   </div>
                   <div class="row">
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">상세내용</label>
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">상세내용</label>
                     <div class="col-sm-11" th:utext="${crackdownInfo.personDamageDetail}">
                     </div>
                   </div>
                 </div>
               </div>
               <div class="row">
-                <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">물적피해</label>
+                <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">물적피해</label>
                 <div class="col-sm-11">
                   <div class="row border-bottom border-secondary">
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">발생건수</label>
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">발생건수</label>
-                    <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+                    <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
                       <th:block th:if="${crackdownInfo.materialDamageCnt>0}" th:text="|${crackdownInfo.materialDamageCnt}건|"></th:block>
                     </label>
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">피해액</label>
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">피해액</label>
-                    <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+                    <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
                       <th:block th:if="${crackdownInfo.materialDamageAmount>0}" th:text="|${crackdownInfo.materialDamageAmount}만원|"></th:block>
                     </label>
                   </div>
                   <div class="row">
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">상세내용</label>
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">상세내용</label>
                     <div class="col-sm-11" th:utext="${crackdownInfo.materialDamageDetail}">
                     </div>
                   </div>
@@ -170,14 +170,14 @@
                                      crackdownInfo.catchCnt ne 0}">
         <th:block th:if="${catchFlag}">
           <div class="row border border-secondary border-top-0">
-            <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">어획물축소기재</label>
+            <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">어획물축소기재</label>
             <div class="col-sm-11">
               <div class="row">
-                <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">어종</label>
+                <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">어종</label>
-                <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start"
+                <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start"
                        th:text="${crackdownInfo.catchFishSpecies}"></label>
-                <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">수량</label>
+                <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">수량</label>
-                <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+                <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
                   <th:block th:if="${crackdownInfo.catchCnt>0}" th:text="|${crackdownInfo.catchCnt}kg|"></th:block>
                 </label>
               </div>

src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html

@@ -7,7 +7,9 @@
 </th:block>
 <th:block layout:fragment="css">
   <style>
-
+    .col-form-label.text-center {
+      background-color: #aabfe178;
+    }
   </style>
 </th:block>
 <div layout:fragment="content">

src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html

@@ -8,7 +8,9 @@
 </th:block>
 <th:block layout:fragment="css">
   <style>
-
+    .col-form-label.text-center {
+      background-color: #aabfe178;
+    }
   </style>
 </th:block>
 <div layout:fragment="content">
@@ -26,7 +28,7 @@
     <div class="row mx-0">
       <div class="col-12 card bg-light text-center">
         <div class="card-body">
-          <form method="get" th:action="@{/faStatistics/illegalShipInfo}" id="cdsSearchForm">
+          <form method="get" th:action="@{/unlawfulFishing/illegalShipInfo}" id="isiSearchForm">
             <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
             <div class="row justify-content-end py-1">
               <div class="col-8">
@@ -34,52 +36,42 @@
                   <div class="col-11">
                     <div class="row justify-content-end pb-1">
                       <div class="col-2">
-                        <select class="form-select form-select-sm " id="caseAgency" name="caseAgency">
+                        <input type="text" class="form-control form-control-sm" name="caseNum" placeholder="사건번호" th:value="${searchParams.caseNum}">
-                          <option value="">사건담당경찰서</option>
-                          <th:block th:each="code:${session.commonCode.get('OG')}">
-                            <option th:value="${code.itemCd}" th:text="${code.itemValue}"
-                                    th:selected="${code.itemCd eq searchParams.caseAgency}"></option>
-                          </th:block>
-                        </select>
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="사건담당경찰관">
+                        <input type="text" class="form-control form-control-sm" name="permitNum" placeholder="허가번호" th:value="${searchParams.permitNum}">
                       </div>
                       <div class="col-2">
-                        <select class="form-select form-select-sm" name="crackdownPolice" id="searchFormPolice">
+                        <input type="text" class="form-control form-control-sm" name="boatName" placeholder="선명" th:value="${searchParams.boatName}">
-                          <option value="">단속경찰서</option>
-                          <th:block th:each="code:${session.commonCode.get('CPO')}">
-                            <option th:value="${code.itemCd}" th:text="${code.itemValue}"
-                                    th:selected="${code.itemCd eq searchParams.crackdownPolice}"></option>
-                          </th:block>
-                        </select>
                       </div>
                       <div class="col-2">
-                        <select class="form-select form-select-sm" name="crackdownBoat" id="searchFormBoat" disabled>
+                        <input type="text" class="form-control form-control-sm" name="boatNny" placeholder="선적지" th:value="${searchParams.boatNny}">
-                          <option value="">단속함정</option>
-                          <th:block th:each="cpoNum:${#numbers.sequence(1, #lists.size(session.commonCode.get('CPO')))}">
-                            <th:block th:each="code:${session.commonCode.get('CPO'+cpoNum)}">
-                              <option th:class="${code.categoryCd}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.crackdownBoat}" style="display: none;"></option>
-                            </th:block>
-                          </th:block>
-                        </select>
                       </div>
                     </div>
                     <div class="row justify-content-end pb-1">
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="사건번호">
+                        <select class="form-select form-select-sm " name="fisheryType" id="searchFisheryType">
+                          <option value="">선종</option>
+                          <th:block th:each="code:${session.commonCode.get('FT')}">
+                            <option th:value="${code.itemCd}" th:text="${code.itemValue}"
+                                    th:selected="${code.itemCd eq searchParams.fisheryType}"></option>
+                          </th:block>
+                        </select>
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="MMSI.NO">
+                        <select class="form-select form-select-sm" name="boatMaterial" id="searchBoatMaterial">
-                      </div>
+                          <option value="">선질</option>
-                      <div class="col-2">
+                          <th:block th:each="code:${session.commonCode.get('BM')}">
-                        <input type="text" class="form-control form-control-sm" placeholder="나포장소">
+                            <option th:value="${code.itemCd}" th:text="${code.itemValue}"
+                                    th:selected="${code.itemCd eq searchParams.boatMaterial}"></option>
+                          </th:block>
+                        </select>
                       </div>
                       <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="">조건선택</option>
-                            <option value="napoDt" th:selected="${searchParams.dateSelector eq 'napoDt'}">나포일시</option>
+                            <option value="napoDt" th:selected="${searchParams.dateSelector eq 'paymentDt'}">담보금 납부일시</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}">

src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html

@@ -1,25 +1,25 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="isiEditModalLabel" th:text="|불법조업 외국어선 정보 ${illegalShipInfo.fbKey eq null?'작성':'수정'}|"></h5>
+  <h5 class="modal-title text-white" id="isiEditModalLabel" th:text="|불법조업 외국어선 정보 ${shipInfo.fbKey eq null?'작성':'수정'}|"></h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body">
   <form action="#" method="post" id="isiEditForm">
-    <input type="hidden" name="fbKey" id="fbKey" th:value="${illegalShipInfo.fbKey}">
+    <input type="hidden" name="fbKey" id="fbKey" th:value="${shipInfo.fbKey}">
-    <input type="hidden" class="status" name="status" id="infoStatus" th:value="${illegalShipInfo.status}">
+    <input type="hidden" class="status" name="status" id="infoStatus" th:value="${shipInfo.status}">
-    <input type="hidden" name="wrtOrgan" th:value="${illegalShipInfo.wrtOrgan}">
+    <input type="hidden" name="wrtOrgan" th:value="${shipInfo.wrtOrgan}">
-    <input type="hidden" name="wrtPart" th:value="${illegalShipInfo.wrtPart}">
+    <input type="hidden" name="wrtPart" th:value="${shipInfo.wrtPart}">
-    <input type="hidden" name="wrtUserSeq" th:value="${illegalShipInfo.wrtUserSeq}">
+    <input type="hidden" name="wrtUserSeq" th:value="${shipInfo.wrtUserSeq}">
-    <input type="hidden" name="wrtUserGrd" th:value="${illegalShipInfo.wrtUserGrd}">
+    <input type="hidden" name="wrtUserGrd" th:value="${shipInfo.wrtUserGrd}">
-    <input type="hidden" name="wrtUserNm" th:value="${illegalShipInfo.wrtUserNm}">
+    <input type="hidden" name="wrtUserNm" th:value="${shipInfo.wrtUserNm}">
-    <input type="hidden" name="wrtDt" th:value="${#temporals.format(illegalShipInfo.wrtDt, 'yyyy-MM-dd HH:mm:ss')}">
+    <input type="hidden" name="wrtDt" th:value="${#temporals.format(shipInfo.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <div class="row mb-1">
       <label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
       <div class="col-sm-2">
         <div class="input-group">
-          <input type="hidden" id="cdsKey" name="cdsKey" th:value="${illegalShipInfo.cdsKey}">
+          <input type="hidden" id="cdsKey" name="cdsKey" th:value="${shipInfo.cdsKey}">
-          <input type="text" class="form-control form-control-sm " id="caseNum" name="caseNum" th:value="${illegalShipInfo.caseNum}">
+          <input type="text" class="form-control form-control-sm " id="caseNum" name="caseNum" th:value="${shipInfo.caseNum}">
           <input type="button" class="btn btn-sm btn-outline-primary  w-auto" id="selectCrackdownInfoBtn" value="불러오기">
         </div>
       </div>
@@ -28,8 +28,8 @@
       <label for="boatNameCn" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
       <div class="col-sm-4">
         <div class="input-group w-auto">
-          <input type="text" class="form-control form-control-sm  boatNameKr" name="boatNameKr" placeholder="한글" th:value="${illegalShipInfo.boatNameKr}">
+          <input type="text" class="form-control form-control-sm  boatNameKr" name="boatNameKr" placeholder="한글" th:value="${shipInfo.boatNameKr}">
-          <input type="text" class="form-control form-control-sm " id="boatNameCn" name="boatNameCn" placeholder="중문" th:value="${illegalShipInfo.boatNameCn}">
+          <input type="text" class="form-control form-control-sm " id="boatNameCn" name="boatNameCn" placeholder="중문" th:value="${shipInfo.boatNameCn}">
         </div>
       </div>
       <div class="col-sm-1"></div>
@@ -37,19 +37,19 @@
     <div class="row mb-1">
       <label for="permitNum" 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 " id="permitNum" name="permitNum" th:value="${illegalShipInfo.permitNum}">
+        <input type="text" class="form-control form-control-sm " id="permitNum" name="permitNum" th:value="${shipInfo.permitNum}">
       </div>
       <label for="nationality" 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 " id="nationality" name="nationality" th:value="${illegalShipInfo.nationality}">
+        <input type="text" class="form-control form-control-sm " id="nationality" name="nationality" th:value="${shipInfo.nationality}">
       </div>
       <label for="sailorCnt" 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 " id="sailorCnt" name="sailorCnt" placeholder="0인" th:value="${illegalShipInfo.sailorCnt>0?illegalShipInfo.sailorCnt:''}">
+        <input type="text" class="form-control form-control-sm " id="sailorCnt" name="sailorCnt" placeholder="0인" th:value="${shipInfo.sailorCnt>0?shipInfo.sailorCnt:''}">
       </div>
       <label for="tonCnt" 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 " id="tonCnt" name="tonCnt" placeholder="000.00t" th:value="${illegalShipInfo.tonCnt>0?illegalShipInfo.tonCnt:''}">
+        <input type="text" class="form-control form-control-sm " id="tonCnt" name="tonCnt" placeholder="000.00t" th:value="${shipInfo.tonCnt>0?shipInfo.tonCnt:''}">
       </div>
     </div>
     <div class="row mb-1">
@@ -58,7 +58,7 @@
         <select class="form-select form-select-sm " id="fisheryType" name="fisheryType">
           <option value="">선택</option>
           <th:block th:each="code:${session.commonCode.get('FT')}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq illegalShipInfo.fisheryType}"></option>
+            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq shipInfo.fisheryType}"></option>
           </th:block>
         </select>
       </div>
@@ -67,15 +67,15 @@
         <select class="form-select form-select-sm " id="boatMaterial" name="boatMaterial">
           <option value="">선택</option>
           <th:block th:each="code:${session.commonCode.get('BM')}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq illegalShipInfo.boatMaterial}"></option>
+            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq shipInfo.boatMaterial}"></option>
           </th:block>
         </select>
       </div>
       <label for="boatNnySung" class="col-sm-1 col-form-label col-form-label-sm text-center">선적지</label>
       <div class="col-sm-2">
         <div class="input-group w-auto">
-          <input type="text" class="form-control form-control-sm " id="boatNnySung" name="boatNnySung" placeholder="성" th:value="${illegalShipInfo.boatNnySung}">
+          <input type="text" class="form-control form-control-sm " id="boatNnySung" name="boatNnySung" placeholder="성" th:value="${shipInfo.boatNnySung}">
-          <input type="text" class="form-control form-control-sm " id="boatNnySi" name="boatNnySi" placeholder="시" th:value="${illegalShipInfo.boatNnySi}">
+          <input type="text" class="form-control form-control-sm " id="boatNnySi" name="boatNnySi" placeholder="시" th:value="${shipInfo.boatNnySi}">
         </div>
       </div>
     </div>
@@ -85,41 +85,41 @@
       <div class="col-sm-2">
         <div class="input-group w-auto">
           <select class="form-select w-30 form-select-sm" id="offenseSelector">
-            <option value="1" th:selected="${illegalShipInfo.offenseType eq null}">없음</option>
+            <option value="1" th:selected="${shipInfo.offenseType eq null}">없음</option>
-            <option value="2" th:selected="${illegalShipInfo.offenseType ne null}">직접입력</option>
+            <option value="2" th:selected="${shipInfo.offenseType ne null}">직접입력</option>
           </select>
-          <input type="text" class="form-control w-40 form-control-sm offenseInput" id="offenseType" name="offenseType" placeholder="범칙물" th:value="${illegalShipInfo.offenseType}" th:disabled="${illegalShipInfo.offenseType eq null}">
+          <input type="text" class="form-control w-40 form-control-sm offenseInput" id="offenseType" name="offenseType" placeholder="범칙물" th:value="${shipInfo.offenseType}" th:disabled="${shipInfo.offenseType eq null}">
-          <input type="text" class="form-control w-30 form-control-sm offenseInput" id="offenseWeight" name="offenseWeight" placeholder="000kg" th:value="${illegalShipInfo.offenseWeight>0?illegalShipInfo.offenseWeight:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
+          <input type="text" class="form-control w-30 form-control-sm offenseInput" id="offenseWeight" name="offenseWeight" placeholder="000kg" th:value="${shipInfo.offenseWeight>0?shipInfo.offenseWeight:''}" th:disabled="${shipInfo.offenseType eq null}">
         </div>
       </div>
       <label for="offenseIllegalWasteQuantity" 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 offenseInput" id="offenseIllegalWasteQuantity" name="offenseIllegalWasteQuantity" placeholder="000kg" th:value="${illegalShipInfo.offenseIllegalWasteQuantity>0?illegalShipInfo.offenseIllegalWasteQuantity:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
+        <input type="text" class="form-control form-control-sm offenseInput" id="offenseIllegalWasteQuantity" name="offenseIllegalWasteQuantity" placeholder="000kg" th:value="${shipInfo.offenseIllegalWasteQuantity>0?shipInfo.offenseIllegalWasteQuantity:''}" th:disabled="${shipInfo.offenseType eq null}">
       </div>
       <label for="offenseQuantity" 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 offenseInput" id="offenseQuantity" name="offenseQuantity" placeholder="000kg" th:value="${illegalShipInfo.offenseQuantity>0?illegalShipInfo.offenseQuantity:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
+        <input type="text" class="form-control form-control-sm offenseInput" id="offenseQuantity" name="offenseQuantity" placeholder="000kg" th:value="${shipInfo.offenseQuantity>0?shipInfo.offenseQuantity:''}" th:disabled="${shipInfo.offenseType eq null}">
       </div>
       <label for="offenseAmount" 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 offenseInput" id="offenseAmount" name="offenseAmount" placeholder="단위: 만원" th:value="${illegalShipInfo.offenseAmount>0?illegalShipInfo.offenseAmount:''}" th:disabled="${illegalShipInfo.offenseType eq null}">
+        <input type="text" class="form-control form-control-sm offenseInput" id="offenseAmount" name="offenseAmount" placeholder="단위: 만원" th:value="${shipInfo.offenseAmount>0?shipInfo.offenseAmount:''}" th:disabled="${shipInfo.offenseType eq null}">
       </div>
     </div>
     <div class="row mb-1">
       <label for="damboUnpaidAmount" 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 " id="damboUnpaidAmount" name="damboUnpaidAmount" placeholder="단위: 만원" th:value="${illegalShipInfo.damboUnpaidAmount>0?illegalShipInfo.damboUnpaidAmount:''}">
+        <input type="text" class="form-control form-control-sm " id="damboUnpaidAmount" name="damboUnpaidAmount" placeholder="단위: 만원" th:value="${shipInfo.damboUnpaidAmount>0?shipInfo.damboUnpaidAmount:''}">
       </div>
       <label for="damboPayment" 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 " id="damboPayment" name="damboPayment" placeholder="단위: 만원" th:value="${illegalShipInfo.damboPayment>0?illegalShipInfo.damboPayment:''}">
+        <input type="text" class="form-control form-control-sm " id="damboPayment" name="damboPayment" placeholder="단위: 만원" th:value="${shipInfo.damboPayment>0?shipInfo.damboPayment:''}">
       </div>
-      <label for="paymentPaymentDate" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">담보금 납부일시</label>
+      <label for="paymentDate" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">담보금 납부일시</label>
       <div class="col-sm-2">
-        <input type="hidden" id="paymentPaymentDt" name="paymentPaymentDt" th:value="${#temporals.format(illegalShipInfo.paymentPaymentDt, 'yyyy-MM-dd hh:mm')}">
+        <input type="hidden" id="paymentPaymentDt" name="paymentPaymentDt" th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd hh:mm')}">
         <div class="input-group">
-          <input type="text" class="form-control form-control-sm  dateSelector" id="paymentPaymentDate" placeholder="yyyy-mm-dd" th:value="${#temporals.format(illegalShipInfo.paymentPaymentDt, 'yyyy-MM-dd')}" autocomplete="off">
+          <input type="text" class="form-control form-control-sm  dateSelector" id="paymentDate" placeholder="yyyy-mm-dd" th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}" autocomplete="off">
-          <input type="text" class="form-control form-control-sm  timeInputer" id="paymentPaymentTime"  placeholder="hh:mm" th:value="${#temporals.format(illegalShipInfo.paymentPaymentDt, 'HH:mm')}" autocomplete="off">
+          <input type="text" class="form-control form-control-sm  timeInputer" id="paymentTime"  placeholder="hh:mm" th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'HH:mm')}" autocomplete="off">
         </div>
       </div>
     </div>
@@ -127,20 +127,20 @@
       <label for="confiscationFrame" class="col-sm-1 col-form-label col-form-label-sm text-center">압수어구</label>
       <div class="col-sm-5">
         <div class="input-group w-auto"
-             th:with="confiscationFlag=${illegalShipInfo.confiscationFrame ne null ||
+             th:with="confiscationFlag=${shipInfo.confiscationFrame ne null ||
-                                           illegalShipInfo.confiscationWidth ne null ||
+                                           shipInfo.confiscationWidth ne null ||
-                                           illegalShipInfo.confiscationJo ne null ||
+                                           shipInfo.confiscationJo ne null ||
-                                           illegalShipInfo.confiscationGae ne null ||
+                                           shipInfo.confiscationGae ne null ||
-                                           illegalShipInfo.confiscationEtc ne null}">
+                                           shipInfo.confiscationEtc ne null}">
           <select class="form-select form-select-sm" id="confiscationSelector">
             <option value="1" th:selected="${!confiscationFlag}">없음</option>
             <option value="2" th:selected="${confiscationFlag}">수량기입</option>
           </select>
-          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationFrame" name="confiscationFrame" placeholder="틀" th:value="${illegalShipInfo.confiscationFrame}" th:disabled="${!confiscationFlag}">
+          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationFrame" name="confiscationFrame" placeholder="틀" th:value="${shipInfo.confiscationFrame}" th:disabled="${!confiscationFlag}">
-          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationWidth" name="confiscationWidth" placeholder="폭" th:value="${illegalShipInfo.confiscationWidth}" th:disabled="${!confiscationFlag}">
+          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationWidth" name="confiscationWidth" placeholder="폭" th:value="${shipInfo.confiscationWidth}" th:disabled="${!confiscationFlag}">
-          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationJo" name="confiscationJo" placeholder="조" th:value="${illegalShipInfo.confiscationJo}" th:disabled="${!confiscationFlag}">
+          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationJo" name="confiscationJo" placeholder="조" th:value="${shipInfo.confiscationJo}" th:disabled="${!confiscationFlag}">
-          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationGae" name="confiscationGae" placeholder="개" th:value="${illegalShipInfo.confiscationGae}" th:disabled="${!confiscationFlag}">
+          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationGae" name="confiscationGae" placeholder="개" th:value="${shipInfo.confiscationGae}" th:disabled="${!confiscationFlag}">
-          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationEtc" name="confiscationEtc" placeholder="기타" th:value="${illegalShipInfo.confiscationEtc}" th:disabled="${!confiscationFlag}">
+          <input type="text" class="form-control form-control-sm confiscationInput" id="confiscationEtc" name="confiscationEtc" placeholder="기타" th:value="${shipInfo.confiscationEtc}" th:disabled="${!confiscationFlag}">
         </div>
       </div>
     </div>

src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html

@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+
+<div class="row justify-content-start">
+  <div class="col-auto">■ 어선정보</div>
+</div>
+<div class="row border border-secondary">
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">선명</label>
+  <div class="col-sm-5 border-end border-secondary">
+    <div class="input-group w-auto">
+      <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.boatNameKr}">
+      <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.boatNameCn}">
+    </div>
+  </div>
+</div>
+<div class="row border border-secondary border-top-0">
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">허가번호</label>
+  <div class="col-sm-2 border-end border-secondary">
+    <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.permitNum}">
+  </div>
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">국적</label>
+  <div class="col-sm-2 border-end border-secondary">
+    <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.nationality}">
+  </div>
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">승선원</label>
+  <div class="col-sm-2 border-end border-secondary" th:if="${shipInfo.sailorCnt>0}">
+    <input type="text" class="form-control form-control border-0" readonly th:value="|${shipInfo.sailorCnt}인|">
+  </div>
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">톤수</label>
+  <div class="col-sm-2" th:if="${shipInfo.tonCnt>0}">
+    <input type="text" class="form-control form-control border-0" readonly th:value="|${shipInfo.tonCnt}t|">
+  </div>
+</div>
+<div class="row border border-secondary border-top-0">
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">선종</label>
+  <div class="col-sm-2 border-end border-secondary">
+    <th:block th:each="code:${session.commonCode.get('FT')}">
+      <input type="text" class="form-control form-control border-0" readonly th:if="${code.itemCd eq shipInfo.fisheryType}" th:value="${code.itemValue}">
+    </th:block>
+  </div>
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">선질</label>
+  <div class="col-sm-2 border-end border-secondary">
+    <th:block th:each="code:${session.commonCode.get('BM')}">
+      <input type="text" class="form-control form-control border-0" readonly th:if="${code.itemCd eq shipInfo.boatMaterial}" th:value="${code.itemValue}">
+    </th:block>
+  </div>
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">선적지</label>
+  <div class="col-sm-2 border-end border-secondary">
+    <div class="input-group w-auto">
+      <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.boatNnySung}">
+      <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.boatNnySi}">
+    </div>
+  </div>
+</div>
+<div class="row border border-secondary border-top-0">
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">범칙물</label>
+  <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+    <th:block th:if="${shipInfo.offenseType ne null}" th:text="${shipInfo.offenseType}"></th:block>
+    <th:block th:if="${shipInfo.offenseWeight>0}" th:text="|${shipInfo.offenseWeight}kg|"></th:block>
+  </label>
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">범칙물 폐기량</label>
+  <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+    <th:block th:if="${shipInfo.offenseIllegalWasteQuantity>0}" th:text="|${shipInfo.offenseIllegalWasteQuantity}kg|"></th:block>
+  </label>
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">범칙물 위판량</label>
+  <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+    <th:block th:if="${shipInfo.offenseQuantity>0}" th:text="|${shipInfo.offenseQuantity}kg|"></th:block>
+  </label>
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">범칙물 위판금액</label>
+  <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+    <th:block th:if="${shipInfo.offenseAmount>0}" th:text="|${shipInfo.offenseAmount}만원|"></th:block>
+  </label>
+</div>
+<div class="row border border-secondary border-top-0">
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 미납액</label>
+  <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+    <th:block th:if="${shipInfo.damboUnpaidAmount>0}" th:text="|${shipInfo.damboUnpaidAmount}만원|"></th:block>
+  </label>
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 납부액</label>
+  <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+    <th:block th:if="${shipInfo.damboPayment>0}" th:text="|${shipInfo.damboPayment}만원|"></th:block>
+  </label>
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일시</label>
+  <div class="col-sm-2">
+    <input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd HH:mm')}">
+  </div>
+</div>
+<div class="row border border-secondary border-top-0">
+  <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">압수어구</label>
+  <label class="col-sm-11 col-form-label col-form-label py-2 text-start">
+    <th:block th:if="${!#strings.isEmpty(shipInfo.confiscationFrame)}" th:text="|틀: ${shipInfo.confiscationFrame}|"></th:block>
+    <th:block th:if="${!#strings.isEmpty(shipInfo.confiscationWidth)}" th:text="|폭: ${shipInfo.confiscationWidth}|"></th:block>
+    <th:block th:if="${!#strings.isEmpty(shipInfo.confiscationJo)}" th:text="|조: ${shipInfo.confiscationJo}|"></th:block>
+    <th:block th:if="${!#strings.isEmpty(shipInfo.confiscationGae)}" th:text="|개: ${shipInfo.confiscationGae}|"></th:block>
+    <th:block th:if="${!#strings.isEmpty(shipInfo.confiscationEtc)}" th:text="|기타: ${shipInfo.confiscationEtc}|"></th:block>
+  </label>
+</div>

src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html

@@ -9,549 +9,277 @@
     <li class="nav-item" role="presentation">
       <button class="nav-link active" id="fishingBoatViewTab" data-bs-toggle="tab" data-bs-target="#fishingBoatViewTabPanel" type="button" role="tab" aria-controls="fishingBoatViewTabPanel" aria-selected="true">최신버전</button>
     </li>
-    <li class="nav-item" role="presentation" th:unless="${#lists.size(crackdownStatus.crackdownStatusVersionList) <= 1}">
+    <li class="nav-item" role="presentation" th:unless="${#lists.size(shipInfo.historyList) <= 1}">
       <button class="nav-link" id="fishingBoatVersionTab" data-bs-toggle="tab" data-bs-target="#fishingBoatVersionTabPanel" type="button" role="tab" aria-controls="fishingBoatHistoryTabPanel" aria-selected="false">수정이력</button>
     </li>
   </ul>
   <div class="tab-content bg-white border border-top-0">
     <div class="tab-pane fade p-2 mx-2 show active" id="fishingBoatViewTabPanel" role="tabpanel" aria-labelledby="fishingBoatViewTab" tabindex="0">
-      <input type="hidden" class="cdsKey" th:value="${crackdownStatus.cdsKey}">
+      <input type="hidden" class="fbKey" th:value="${shipInfo.fbKey}">
-      <input type="hidden" class="fbKey" th:value="${crackdownStatus.fishingBoat.fbKey}">
-      <div class="row py-2">
-        <div class="col-12">
       <div class="row justify-content-end">
         <div class="col-auto">
-              <th:block th:text="|최종수정일: ${#temporals.format(crackdownStatus.fishingBoat.wrtDt, 'yyyy-MM-dd HH:mm')}|"></th:block>
+          <th:block th:text="|최종수정일: ${#temporals.format(shipInfo.wrtDt, 'yyyy-MM-dd HH:mm')}|"></th:block>
         </div>
       </div>
       <div class="row justify-content-between">
-            <div class="col-auto">■ 단속정보</div>
+        <div class="col-auto">■ 어선정보</div>
         <div class="col-auto">
           <th:block th:each="code:${session.commonCode.get('DST')}">
-                <th:block th:if="${crackdownStatus.status eq code.itemCd}" th:text="|상태: ${code.itemValue}|"></th:block>
+            <th:block th:if="${shipInfo.status eq code.itemCd}" th:text="|상태: ${code.itemValue}|"></th:block>
           </th:block>
-              <th:block th:if="${#lists.size(crackdownStatus.crackdownStatusVersionList) <= 1}">
+          <th:block th:if="${#lists.size(shipInfo.historyList) <= 1}">
             (수정 이력 없음)
           </th:block>
-              <th:block th:unless="${#lists.size(crackdownStatus.crackdownStatusVersionList) <= 1}">
+          <th:block th:unless="${#lists.size(shipInfo.historyList) <= 1}">
-                <th:block th:text="${#strings.concat('(', #lists.size(crackdownStatus.crackdownStatusVersionList), '차 수정본)') }"></th:block>
+            <th:block th:text="${#strings.concat('(', #lists.size(shipInfo.historyList), '차 수정본)') }"></th:block>
           </th:block>
         </div>
       </div>
-        </div>
-      </div>
       <div class="row border border-secondary">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">사건번호</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">선명</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.caseNum}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">선명</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.fishingBoat.boatNameKr}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">위반사항</label>
-        <div class="col-sm-5">
-          <div class="row">
-            <th:block th:each="code:${vtList}">
-              <th:block th:each="violation:${crackdownStatus.violationList}">
-                <div class="col-6" th:if="${code.itemCd eq violation.violation}">
-                  <input type="text" class="form-control form-control-sm border-0" readonly th:value="${code.itemValue}"/>
-                </div>
-              </th:block>
-            </th:block>
-          </div>
-        </div>
-      </div>
-      <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">사건담당경찰서</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <th:block th:each="code:${session.commonCode.get('OG')}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownStatus.caseAgency}" th:value="${code.itemValue}">
-          </th:block>
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center fs-11">사건담당경찰관</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.casePoliceOfficer}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">단속경찰서</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <th:block th:each="code:${cpoList}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownStatus.crackdownPolice}" th:value="${code.itemValue}">
-          </th:block>
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">단속함정</label>
-        <div class="col-sm-2">
-          <th:block th:each="code:${boatList}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownStatus.crackdownBoat}" th:value="${code.itemValue}">
-          </th:block>
-        </div>
-      </div>
-      <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">MMSI.NO</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.mmsi}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">침범유형</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <th:block th:each="code:${session.commonCode.get('IST')}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownStatus.invasionType}" th:value="${code.itemValue}">
-          </th:block>
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">NLL</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.nll eq 'Y'?'O':(crackdownStatus.nll eq 'N'?'X':crackdownStatus.nll)}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">압송/현장조사</label>
-        <div class="col-sm-2">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.fieldIvsgt eq 'C'?'압송':(crackdownStatus.fieldIvsgt eq 'F'?'현장조사':crackdownStatus.fieldIvsgt)}">
-        </div>
-      </div>
-      <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">나포일시</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd hh:mm')}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">나포장소</label>
-        <div class="col-sm-8">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="|${crackdownStatus.napoSeaPointLon} ${crackdownStatus.napoSeaPointLat} ${crackdownStatus.napoSeaPointDetail}|">
-        </div>
-      </div>
-      <th:block th:with="damageFlag=${crackdownStatus.obstrExspdCnt ne 0 ||
-                                     crackdownStatus.personDamageCnt ne 0 ||
-                                     crackdownStatus.personDamageAmount ne 0 ||
-                                     crackdownStatus.personDamageDetail ne null ||
-                                     crackdownStatus.materialDamageCnt ne 0 ||
-                                     crackdownStatus.materialDamageAmount ne 0 ||
-                                     crackdownStatus.materialDamageDetail ne null}">
-        <th:block th:if="${damageFlag}">
-          <div class="row border border-secondary border-top-0">
-            <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB2">특수공무집행방해</label>
-            <div class="col-sm-11">
-              <div class="row border-bottom border-secondary">
-                <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">인적피해</label>
-                <div class="col-sm-11">
-                  <div class="row border-bottom border-secondary">
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">발생건수</label>
-                    <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
-                      <th:block th:if="${crackdownStatus.obstrExspdCnt>0}" th:text="|${crackdownStatus.obstrExspdCnt}건|"></th:block>
-                    </label>
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">피해인원</label>
-                    <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
-                      <th:block th:if="${crackdownStatus.personDamageCnt>0}" th:text="|${crackdownStatus.personDamageCnt}인|"></th:block>
-                    </label>
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">피해액</label>
-                    <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
-                      <th:block th:if="${crackdownStatus.personDamageAmount>0}" th:text="|${crackdownStatus.personDamageAmount}만원|"></th:block>
-                    </label>
-                  </div>
-                  <div class="row">
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">상세내용</label>
-                    <div class="col-sm-11" th:utext="${crackdownStatus.personDamageDetail}">
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="row">
-                <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">물적피해</label>
-                <div class="col-sm-11">
-                  <div class="row border-bottom border-secondary">
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">발생건수</label>
-                    <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
-                      <th:block th:if="${crackdownStatus.materialDamageCnt>0}" th:text="|${crackdownStatus.materialDamageCnt}건|"></th:block>
-                    </label>
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">피해액</label>
-                    <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
-                      <th:block th:if="${crackdownStatus.materialDamageAmount>0}" th:text="|${crackdownStatus.materialDamageAmount}만원|"></th:block>
-                    </label>
-                  </div>
-                  <div class="row">
-                    <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">상세내용</label>
-                    <div class="col-sm-11" th:utext="${crackdownStatus.materialDamageDetail}">
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </th:block>
-      </th:block>
-      <th:block th:with="catchFlag=${crackdownStatus.fishingBoat.catchFishSpecies ne null ||
-                                     crackdownStatus.fishingBoat.catchCnt ne 0}">
-        <th:block th:if="${catchFlag}">
-          <div class="row border border-secondary border-top-0">
-            <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">어획물축소기재</label>
-            <div class="col-sm-11">
-              <div class="row">
-                <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">어종</label>
-                <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start"
-                       th:text="${crackdownStatus.fishingBoat.catchFishSpecies}"></label>
-                <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">수량</label>
-                <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
-                  <th:block th:if="${crackdownStatus.fishingBoat.catchCnt>0}" th:text="|${crackdownStatus.fishingBoat.catchCnt}kg|"></th:block>
-                </label>
-              </div>
-            </div>
-          </div>
-        </th:block>
-      </th:block>
-      <th:block th:if="${!#lists.isEmpty(crackdownStatus.sailorList)}">
-        <div class="row py-2">
-          <div class="col-auto">■ 선장·선주 정보</div>
-        </div>
-        <div class="row">
-          <th:block th:each="sailor:${crackdownStatus.sailorList}">
-            <th:block th:if="${sailor.position eq 'POS001'}">
-              <div class="col-6" id="captainDiv">
-                <div class="row border border-secondary">
-                  <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">선장명</label>
-                  <div class="col-sm-8">
-                    <div class="input-group w-auto">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.sailorNameKr}">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.sailorNameCn}">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.sailorNamePinyin}">
-                    </div>
-                    <th:block th:unless="${#lists.isEmpty(sailor.fileList)}">
-                      <div id="fileDownloadDiv" class="d-none">
-                        <div class="row justify-content-end">
-                          <div class="col-auto">
-                            <th:block th:each="file:${sailor.fileList}">
-                              <a href="#" class="fileDownLink" data-board="sailor"
-                                 th:data-parentkey="${file.sailorKey}" th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn}|"></a>
-                              <br>
-                            </th:block>
-                          </div>
-                        </div>
-                      </div>
-                    </th:block>
-                  </div>
-                  <div class="col-sm-2">
-                    <th:block th:if="${#lists.isEmpty(sailor.fileList)}">
-                      <div>사진 없음</div>
-                    </th:block>
-                    <th:block th:unless="${#lists.isEmpty(sailor.fileList)}">
-                      <img id="captainPhoto" class="w-100" alt="선장 사진" th:src="|/file/fileDisplay?board=sailor&parentKey=${sailor.sailorKey}&fileSeq=1|">
-                    </th:block>
-                  </div>
-                </div>
-                <div class="row border border-secondary border-top-0">
-                  <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">생년월일</label>
-                    <div class="col-sm-4 border-end border-secondary">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.birthdate}">
-                    </div>
-                    <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">연락처</label>
-                    <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.sailorContact}">
-                    </div>
-                  </div>
-                  <div class="row border border-secondary border-top-0">
-                    <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">주소</label>
-                    <div class="col-sm-4 border-end border-secondary">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.residence}">
-                    </div>
-                    <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">재범횟수</label>
-                    <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.arrestHistory}">
-                    </div>
-                  </div>
-                  <div class="row border border-secondary border-top-0">
-                    <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">비고</label>
-                    <div class="col-sm-10">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.note}">
-                    </div>
-                  </div>
-                </div>
-            </th:block>
-          </th:block>
-          <th:block th:each="sailor:${crackdownStatus.sailorList}">
-            <th:block th:if="${sailor.position eq 'POS004'}">
-              <div class="col-6" id="shipOwnerDiv">
-                <div class="row border border-secondary border-start-0">
-                  <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">선주명</label>
-                  <div class="col-sm-10">
-                    <div class="input-group w-auto">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.sailorNameKr}">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.sailorNameCn}">
-                      <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.sailorNamePinyin}">
-                    </div>
-                  </div>
-                </div>
-                <div class="row border border-secondary border-start-0 border-top-0">
-                  <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">생년월일</label>
-                  <div class="col-sm-4 border-end border-secondary">
-                    <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.birthdate}">
-                  </div>
-                  <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">연락처</label>
-                  <div class="col-sm-4">
-                    <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.sailorContact}">
-                  </div>
-                </div>
-                <div class="row border border-secondary border-start-0 border-top-0">
-                  <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">주소</label>
-                  <div class="col-sm-4">
-                    <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.residence}">
-                  </div>
-                </div>
-                <div class="row border border-secondary border-start-0 border-top-0">
-                  <label class="col-sm-2 fw-bold bg-label border-end border-secondary col-form-label col-form-label-sm py-2 border-end border-secondary text-center">비고</label>
-                  <div class="col-sm-10">
-                    <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.note}">
-                  </div>
-                </div>
-              </div>
-            </th:block>
-          </th:block>
-        </div>
-      </th:block>
-      <div class="row py-2">
-        <div class="col-auto">■ 어선 정보</div>
-      </div>
-      <div class="row border border-secondary">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">선명</label>
         <div class="col-sm-5 border-end border-secondary">
           <div class="input-group w-auto">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.fishingBoat.boatNameKr}">
+            <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.boatNameKr}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.fishingBoat.boatNameCn}">
+            <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.boatNameCn}">
           </div>
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">허가번호</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">허가번호</label>
         <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.fishingBoat.permitNum}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.permitNum}">
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">국적</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">국적</label>
         <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.fishingBoat.nationality}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.nationality}">
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">승선원</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">승선원</label>
-        <div class="col-sm-2 border-end border-secondary" th:if="${crackdownStatus.fishingBoat.sailorCnt>0}">
+        <div class="col-sm-2 border-end border-secondary" th:if="${shipInfo.sailorCnt>0}">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="|${crackdownStatus.fishingBoat.sailorCnt}인|">
+          <input type="text" class="form-control form-control border-0" readonly th:value="|${shipInfo.sailorCnt}인|">
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">톤수</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">톤수</label>
-        <div class="col-sm-2" th:if="${crackdownStatus.fishingBoat.tonCnt>0}">
+        <div class="col-sm-2" th:if="${shipInfo.tonCnt>0}">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="|${crackdownStatus.fishingBoat.tonCnt}t|">
+          <input type="text" class="form-control form-control border-0" readonly th:value="|${shipInfo.tonCnt}t|">
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">선종</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">선종</label>
         <div class="col-sm-2 border-end border-secondary">
-          <th:block th:each="code:${ftList}">
+          <th:block th:each="code:${session.commonCode.get('FT')}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownStatus.fishingBoat.fisheryType}" th:value="${code.itemValue}">
+            <input type="text" class="form-control form-control border-0" readonly th:if="${code.itemCd eq shipInfo.fisheryType}" th:value="${code.itemValue}">
           </th:block>
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">선질</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">선질</label>
         <div class="col-sm-2 border-end border-secondary">
-          <th:block th:each="code:${bmList}">
+          <th:block th:each="code:${session.commonCode.get('BM')}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownStatus.fishingBoat.boatMaterial}" th:value="${code.itemValue}">
+            <input type="text" class="form-control form-control border-0" readonly th:if="${code.itemCd eq shipInfo.boatMaterial}" th:value="${code.itemValue}">
           </th:block>
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">선적지</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">선적지</label>
         <div class="col-sm-2 border-end border-secondary">
           <div class="input-group w-auto">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.fishingBoat.boatNnySung}">
+            <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.boatNnySung}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.fishingBoat.boatNnySi}">
+            <input type="text" class="form-control form-control border-0" readonly th:value="${shipInfo.boatNnySi}">
           </div>
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">범칙물</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">범칙물</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+        <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${crackdownStatus.fishingBoat.offenseType ne null}" th:text="${crackdownStatus.fishingBoat.offenseType}"></th:block>
+          <th:block th:if="${shipInfo.offenseType ne null}" th:text="${shipInfo.offenseType}"></th:block>
-          <th:block th:if="${crackdownStatus.fishingBoat.offenseWeight>0}" th:text="|${crackdownStatus.fishingBoat.offenseWeight}kg|"></th:block>
+          <th:block th:if="${shipInfo.offenseWeight>0}" th:text="|${shipInfo.offenseWeight}kg|"></th:block>
         </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">범칙물 폐기량</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">범칙물 폐기량</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+        <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${crackdownStatus.fishingBoat.offenseIllegalWasteQuantity>0}" th:text="|${crackdownStatus.fishingBoat.offenseIllegalWasteQuantity}kg|"></th:block>
+          <th:block th:if="${shipInfo.offenseIllegalWasteQuantity>0}" th:text="|${shipInfo.offenseIllegalWasteQuantity}kg|"></th:block>
         </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">범칙물 위판량</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">범칙물 위판량</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+        <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${crackdownStatus.fishingBoat.offenseQuantity>0}" th:text="|${crackdownStatus.fishingBoat.offenseQuantity}kg|"></th:block>
+          <th:block th:if="${shipInfo.offenseQuantity>0}" th:text="|${shipInfo.offenseQuantity}kg|"></th:block>
         </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center fs-11">범칙물 위판금액</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">범칙물 위판금액</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+        <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${crackdownStatus.fishingBoat.offenseAmount>0}" th:text="|${crackdownStatus.fishingBoat.offenseAmount}만원|"></th:block>
+          <th:block th:if="${shipInfo.offenseAmount>0}" th:text="|${shipInfo.offenseAmount}만원|"></th:block>
         </label>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">담보금 미납액</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 미납액</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+        <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${crackdownStatus.fishingBoat.damboUnpaidAmount>0}" th:text="|${crackdownStatus.fishingBoat.damboUnpaidAmount}만원|"></th:block>
+          <th:block th:if="${shipInfo.damboUnpaidAmount>0}" th:text="|${shipInfo.damboUnpaidAmount}만원|"></th:block>
         </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">담보금 납부액</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 납부액</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
+        <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-          <th:block th:if="${crackdownStatus.fishingBoat.damboPayment>0}" th:text="|${crackdownStatus.fishingBoat.damboPayment}만원|"></th:block>
+          <th:block th:if="${shipInfo.damboPayment>0}" th:text="|${shipInfo.damboPayment}만원|"></th:block>
         </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일시</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일시</label>
         <div class="col-sm-2">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.fishingBoat.paymentPaymentDt}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd HH:mm')}">
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">압수어구</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">압수어구</label>
-        <label class="col-sm-11 col-form-label col-form-label-sm py-2 text-start">
+        <label class="col-sm-11 col-form-label col-form-label py-2 text-start">
-          <th:block th:if="${!#strings.isEmpty(crackdownStatus.fishingBoat.confiscationFrame)}" th:text="|틀: ${crackdownStatus.fishingBoat.confiscationFrame}|"></th:block>
+          <th:block th:if="${!#strings.isEmpty(shipInfo.confiscationFrame)}" th:text="|틀: ${shipInfo.confiscationFrame}|"></th:block>
-          <th:block th:if="${!#strings.isEmpty(crackdownStatus.fishingBoat.confiscationWidth)}" th:text="|폭: ${crackdownStatus.fishingBoat.confiscationWidth}|"></th:block>
+          <th:block th:if="${!#strings.isEmpty(shipInfo.confiscationWidth)}" th:text="|폭: ${shipInfo.confiscationWidth}|"></th:block>
-          <th:block th:if="${!#strings.isEmpty(crackdownStatus.fishingBoat.confiscationJo)}" th:text="|조: ${crackdownStatus.fishingBoat.confiscationJo}|"></th:block>
+          <th:block th:if="${!#strings.isEmpty(shipInfo.confiscationJo)}" th:text="|조: ${shipInfo.confiscationJo}|"></th:block>
-          <th:block th:if="${!#strings.isEmpty(crackdownStatus.fishingBoat.confiscationGae)}" th:text="|개: ${crackdownStatus.fishingBoat.confiscationGae}|"></th:block>
+          <th:block th:if="${!#strings.isEmpty(shipInfo.confiscationGae)}" th:text="|개: ${shipInfo.confiscationGae}|"></th:block>
-          <th:block th:if="${!#strings.isEmpty(crackdownStatus.fishingBoat.confiscationEtc)}" th:text="|기타: ${crackdownStatus.fishingBoat.confiscationEtc}|"></th:block>
+          <th:block th:if="${!#strings.isEmpty(shipInfo.confiscationEtc)}" th:text="|기타: ${shipInfo.confiscationEtc}|"></th:block>
         </label>
       </div>
-      <div class="row py-2">
+      <div class="row justify-content-between pt-3">
-        <div class="col-auto">■ 처리 결과</div>
+        <div class="col-auto">■ 단속정보</div>
       </div>
       <div class="row border border-secondary">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">처리현황</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">사건번호</label>
         <div class="col-sm-2 border-end border-secondary">
-          <th:block th:each="code:${prList}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${crackdownInfo.caseNum}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownStatus.processResult.processStatus}" th:value="${code.itemValue}">
+        </div>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">위반사항</label>
+        <div class="col-sm-8">
+          <div class="row">
+            <th:block th:each="violation:${crackdownInfo.violationList}">
+              <th:block th:each="code:${session.commonCode.get('VT')}">
+                <div class="col-4" th:if="${code.itemCd eq violation.violation}">
+                  <input type="text" class="form-control form-control border-0" readonly th:value="${code.itemValue}"/>
+                </div>
+              </th:block>
             </th:block>
           </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">수사중지 여부</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.isIvsgtStop eq 'Y'?'중지':(crackdownStatus.processResult.isIvsgtStop eq 'N'?'수사중':crackdownStatus.processResult.isIvsgtStop)}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">선고법원</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start" th:text="${crackdownStatus.processResult.sentencingCourt}"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">선고내용</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm py-2 text-start" th:text="${crackdownStatus.processResult.sentencingDetail}"></label>
-      </div>
-      <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">압송소요시간</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.pressurizedTimeTaken}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">압송거리</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
-          <th:block th:if="${!#strings.isEmpty(crackdownStatus.distance)}" th:text="|${crackdownStatus.distance}해리|"></th:block>
-        </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center fs-10">영장청구 소요시간</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.warrantReqTakeTime}">
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">나포일시</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">사건담당경찰서</label>
         <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" id="napoDt" readonly th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd hh:mm')}">
+          <th:block th:each="code:${session.commonCode.get('OG')}">
+            <input type="text" class="form-control form-control border-0" readonly th:if="${code.itemCd eq crackdownInfo.caseAgency}" th:value="${code.itemValue}">
+          </th:block>
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">석방일시</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">사건담당경찰관</label>
         <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" id="releaseDt" readonly th:value="${#temporals.format(crackdownStatus.processResult.releaseDt, 'yyyy-MM-dd hh:mm')}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${crackdownInfo.casePoliceOfficer}">
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">소요시간</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">단속경찰서</label>
         <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" id="releaseToNapo" readonly>
+          <th:block th:each="code:${session.commonCode.get('CPO')}">
+            <input type="text" class="form-control form-control border-0" readonly th:if="${code.itemCd eq crackdownInfo.crackdownPolice}" th:value="${code.itemValue}">
+          </th:block>
         </div>
-      </div>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">단속함정</label>
-      <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">위탁시작일</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.consignmentStartDt}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">위탁종료일</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.consignmentEndDt}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">퇴거일</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.evictionDt}">
-        </div>
-      </div>
-      <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">직접인계일</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.directHandoverDt}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">인계 해점</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <div class="input-group w-auto">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.handoverSeaPointLon}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.handoverSeaPointLat}">
-          </div>
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">인계 함정</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.handoverBoat}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">중측 인수함정</label>
         <div class="col-sm-2">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.middleTakeoverBoat}">
+          <th:block th:each="code:${session.commonCode.get(crackdownInfo.crackdownPolice)}">
-        </div>
+            <input type="text" class="form-control form-control border-0" readonly th:if="${code.itemCd eq crackdownInfo.crackdownBoat}" th:value="${code.itemValue}">
-      </div>
-      <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">몰수확정일</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.confiscationDt}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">폐선일</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.boatDisposalDt}">
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">폐선종류</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <th:block th:each="code:${bdtList}">
-            <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownStatus.processResult.boatDisposalType}" th:value="${code.itemValue}">
           </th:block>
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">침몰일</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">MMSI.NO</label>
         <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.exileDt}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${crackdownInfo.mmsi}">
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">환부일</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">침범유형</label>
         <div class="col-sm-2 border-end border-secondary">
-          <input type="text" class="form-control form-control-sm border-0" readonly th:value="${crackdownStatus.processResult.returnDt}">
+          <th:block th:each="code:${session.commonCode.get('IST')}">
+            <input type="text" class="form-control form-control border-0" readonly th:if="${code.itemCd eq crackdownInfo.invasionType}" th:value="${code.itemValue}">
+          </th:block>
+        </div>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">NLL</label>
+        <div class="col-sm-2 border-end border-secondary">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${crackdownInfo.nll eq 'Y'?'O':(crackdownInfo.nll eq 'N'?'X':crackdownInfo.nll)}">
+        </div>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">압송/현장조사</label>
+        <div class="col-sm-2">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${crackdownInfo.fieldIvsgt eq 'C'?'압송':(crackdownInfo.fieldIvsgt eq 'F'?'현장조사':crackdownInfo.fieldIvsgt)}">
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">선장구속</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">나포일시</label>
         <div class="col-sm-2 border-end border-secondary">
-          <th:block th:each="sailor:${crackdownStatus.sailorList}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(crackdownInfo.napoDt, 'yyyy-MM-dd hh:mm')}">
-            <th:block th:if="${sailor.position eq 'POS001'}">
-              <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.isRestriction eq 'Y'?'구속':'불구속'}">
-            </th:block>
-          </th:block>
         </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">항해장구속</label>
+        <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">나포장소</label>
-        <div class="col-sm-2 border-end border-secondary">
+        <div class="col-sm-8">
-          <th:block th:each="sailor:${crackdownStatus.sailorList}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="|${crackdownInfo.napoSeaPointLon} ${crackdownInfo.napoSeaPointLat} ${crackdownInfo.napoSeaPointDetail}|">
-            <th:block th:if="${sailor.position eq 'POS002'}">
-              <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.isRestriction eq 'Y'?'구속':'불구속'}">
-            </th:block>
-          </th:block>
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">기관장구속</label>
-        <div class="col-sm-2 border-end border-secondary">
-          <th:block th:each="sailor:${crackdownStatus.sailorList}">
-            <th:block th:if="${sailor.position eq 'POS003'}">
-              <input type="text" class="form-control form-control-sm border-0" readonly th:value="${sailor.isRestriction eq 'Y'?'구속':'불구속'}">
-            </th:block>
-          </th:block>
         </div>
       </div>
+      <th:block th:with="damageFlag=${(crackdownInfo.obstrExspdCnt ne null and crackdownInfo.obstrExspdCnt ne 0) ||
+                                     (crackdownInfo.personDamageCnt ne null and crackdownInfo.personDamageCnt ne 0 )||
+                                     (crackdownInfo.personDamageAmount ne null and crackdownInfo.personDamageAmount ne 0) ||
+                                     !#strings.isEmpty(crackdownInfo.personDamageDetail) ||
+                                     (crackdownInfo.materialDamageCnt ne null and crackdownInfo.materialDamageCnt ne 0) ||
+                                     (crackdownInfo.materialDamageAmount ne null and crackdownInfo.materialDamageAmount ne 0) ||
+                                     !#strings.isEmpty(crackdownInfo.materialDamageDetail)}">
+        <th:block th:if="${damageFlag}">
           <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center">선원구속</label>
+            <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB2">특수공무집행방해</label>
+            <div class="col-sm-11">
+              <div class="row border-bottom border-secondary">
+                <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">인적피해</label>
+                <div class="col-sm-11">
+                  <div class="row border-bottom border-secondary">
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">발생건수</label>
+                    <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+                      <th:block th:if="${crackdownInfo.obstrExspdCnt>0}" th:text="|${crackdownInfo.obstrExspdCnt}건|"></th:block>
+                    </label>
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">피해인원</label>
+                    <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+                      <th:block th:if="${crackdownInfo.personDamageCnt>0}" th:text="|${crackdownInfo.personDamageCnt}인|"></th:block>
+                    </label>
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">피해액</label>
+                    <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+                      <th:block th:if="${crackdownInfo.personDamageAmount>0}" th:text="|${crackdownInfo.personDamageAmount}만원|"></th:block>
+                    </label>
+                  </div>
+                  <div class="row">
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">상세내용</label>
+                    <div class="col-sm-11" th:utext="${crackdownInfo.personDamageDetail}">
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="row">
+                <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">물적피해</label>
+                <div class="col-sm-11">
+                  <div class="row border-bottom border-secondary">
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">발생건수</label>
+                    <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+                      <th:block th:if="${crackdownInfo.materialDamageCnt>0}" th:text="|${crackdownInfo.materialDamageCnt}건|"></th:block>
+                    </label>
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">피해액</label>
+                    <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
+                      <th:block th:if="${crackdownInfo.materialDamageAmount>0}" th:text="|${crackdownInfo.materialDamageAmount}만원|"></th:block>
+                    </label>
+                  </div>
+                  <div class="row">
+                    <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">상세내용</label>
+                    <div class="col-sm-11" th:utext="${crackdownInfo.materialDamageDetail}">
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </th:block>
+      </th:block>
+      <th:block th:with="catchFlag=${crackdownInfo.catchFishSpecies ne null ||
+                                     crackdownInfo.catchCnt ne 0}">
+        <th:block th:if="${catchFlag}">
+          <div class="row border border-secondary border-top-0">
+            <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center bg-lightB1">어획물축소기재</label>
             <div class="col-sm-11">
               <div class="row">
-            <th:block th:each="sailor:${crackdownStatus.sailorList}">
+                <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">어종</label>
-              <th:block th:if="${sailor.position eq 'POS005' or sailor.position eq 'POS006'}">
+                <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start"
-                <div class="col-4">
+                       th:text="${crackdownInfo.catchFishSpecies}"></label>
-                  <div class="row mt-2">
+                <label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">수량</label>
-                    <label class="col-sm-auto col-form-label col-form-label-sm fw-bold text-end">직책: </label>
+                <label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
-                    <label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${sailor.position eq 'POS005'?'기타 간부선원':'일반선원 또는 확인불가'}"></label>
+                  <th:block th:if="${crackdownInfo.catchCnt>0}" th:text="|${crackdownInfo.catchCnt}kg|"></th:block>
-                    <label class="col-sm-auto col-form-label col-form-label-sm fw-bold text-end">구속여부: </label>
+                </label>
-                    <label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${sailor.isRestriction eq 'Y'?'구속':'불구속'}"></label>
+              </div>
-                    <label class="col-sm-auto col-form-label col-form-label-sm fw-bold text-end">이름: </label>
-                    <label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${sailor.sailorNameKr}"></label>
             </div>
           </div>
         </th:block>
       </th:block>
     </div>
-        </div>
-      </div>
-    </div>
     <div class="tab-pane fade p-2 mx-2" id="fishingBoatVersionTabPanel" role="tabpanel" aria-labelledby="fishingBoatVersionTab" tabindex="0">
       <div class="row">
         <div class="col-4">
@@ -564,17 +292,17 @@
             </tr>
             </thead>
             <tbody>
-            <tr class="versionInfoTr" th:each="versionInfo:${crackdownStatus.crackdownStatusVersionList}">
+            <tr class="versionInfoTr" th:each="versionInfo:${shipInfo.historyList}">
-              <input type="hidden" class="cdsKey" th:value="${versionInfo.cdsKey}">
+              <input type="hidden" class="fbKey" th:value="${versionInfo.fbKey}">
               <input type="hidden" class="versionNo" th:value="${versionInfo.versionNo}">
               <td><input type="checkbox" class="versionInfoChkbox"></td>
               <td>
-                <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                <th:block th:each="code:${session.commonCode.get('OG')}">
-                  <th:block th:if="${versionInfo.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                  <th:block th:if="${versionInfo.wrtOrgan eq code.itemCd}" th:text="${code.itemValue}"></th:block>
                 </th:block>
                 <br>
-                <th:block th:each="commonCode:${session.commonCode.get('JT')}">
+                <th:block th:each="code:${session.commonCode.get('JT')}">
-                  <th:block th:if="${versionInfo.wrtUserGrd eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                  <th:block th:if="${versionInfo.wrtUserGrd eq code.itemCd}" th:text="${code.itemValue}"></th:block>
                 </th:block>
                 <th:block th:text="${versionInfo.wrtUserNm}"></th:block>
               </td>
@@ -590,17 +318,15 @@
     </div>
   </div>
 </div>
-<th:block th:if="${modalType ne 'viewOnly'}">
+<th:block th:if="${userSeq eq shipInfo.wrtUserSeq
-  <th:block th:if="${userSeq eq crackdownStatus.fishingBoat.wrtUserSeq
+                      or (accessAuth eq 'ACC003' and #lists.contains(mgtOrganList, shipInfo.wrtOrgan))}">
-                      or (accessAuth eq 'ACC003' and #lists.contains(mgtOrganList, crackdownStatus.fishingBoat.wrtOrgan))}">
   <!--작성자, 관리자일 경우 수정, 삭제 허용-->
   <div class="modal-footer justify-content-between bg-light">
     <div class="col-auto">
-      <button type="button" class="btn btn-danger" id="deleteFishingBoatBtn">삭제</button>
+      <button type="button" class="btn btn-danger" id="deleteShipInfoBtn">삭제</button>
     </div>
     <div class="col-auto">
-      <button type="button" class="btn btn-warning" id="editFishingBoatBtn">수정</button>
+      <button type="button" class="btn btn-warning" id="editShipInfoBtn">수정</button>
     </div>
   </div>
-  </th:block>
 </th:block>