From f5e34bf16eeb901b21c6055cd771bfe7e2dd89fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Fri, 11 Nov 2022 11:31:33 +0900
Subject: [PATCH] =?UTF-8?q?=EC=96=B4=EC=84=A0=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FishingBoatController.java                | 14 +++----
 .../fishingBoat/FishingBoatBaseEntity.java    |  2 +-
 .../ViolationVersionRepository.java           |  3 ++
 .../service/FishingBoatService.java           | 32 ++++++++++++++-
 .../static/js/faStatistics/fishingBoatMgt.js  |  2 +
 .../fishingBoat/fishingBoardVersionInfo.html  | 40 +++++++++----------
 .../fishingBoat/fishingBoatEditModal.html     | 34 ++++++++--------
 .../fishingBoat/fishingBoatViewModal.html     |  6 +--
 8 files changed, 84 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java
index 05413f48..accb2861 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java
@@ -78,12 +78,11 @@ public class FishingBoatController {
     }else{
       crackdownStatus.setFishingBoat(new FishingBoat());
       crackdownStatus.setProcessResult(new ProcessResult());
-      crackdownStatus.setWrtOrgan(loginUser.getOgCd());
-      crackdownStatus.setWrtPart(loginUser.getOfcCd());
-      crackdownStatus.setWrtUserSeq(loginUser.getUserSeq());
-      crackdownStatus.setWrtUserNm(loginUser.getUserNm());
-      crackdownStatus.setWrtUserGrd(loginUser.getTitleCd());
-      crackdownStatus.setWrtDt(LocalDateTime.now());
+      crackdownStatus.getFishingBoat().setWrtOrgan(loginUser.getOgCd());
+      crackdownStatus.getFishingBoat().setWrtPart(loginUser.getOfcCd());
+      crackdownStatus.getFishingBoat().setWrtUserSeq(loginUser.getUserSeq());
+      crackdownStatus.getFishingBoat().setWrtUserNm(loginUser.getUserNm());
+      crackdownStatus.getFishingBoat().setWrtUserGrd(loginUser.getTitleCd());
     }
     mav.addObject("ataList", codeMgtService.selectCodeMgtList("ATA"));
     mav.addObject("cpoList", codeMgtService.selectCodeMgtList("CPO"));
@@ -105,9 +104,10 @@ public class FishingBoatController {
   public Integer checkCaseNum(String caseNum){
     return fishingBoatService.checkCaseNum(caseNum);
   }
+
   @GetMapping("/fishingBoatVersionInfo")
   public ModelAndView fishingBoatVersionInfo(FishingBoatVersion version){
-    ModelAndView mav = new ModelAndView("faStatistics/fishingBoat/fishingBoatVersionInfo");
+    ModelAndView mav = new ModelAndView("faStatistics/fishingBoat/fishingBoardVersionInfo");
     mav.addObject("fishingBoat", fishingBoatService.selectFishingBoatVersion(version.getFbKey(), version.getVersionNo()));
     mav.addObject("vtList", codeMgtService.selectCodeMgtList("VT"));
     mav.addObject("ftList", codeMgtService.selectCodeMgtList("FT"));
diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java
index 7f2103fe..19c5e05c 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java
@@ -28,7 +28,7 @@ public class FishingBoatBaseEntity extends BaseModel {
   @Column(name = "sailor_cnt")
   private Integer sailorCnt;
   @Column(name = "ton_cnt")
-  private Integer tonCnt;
+  private Double tonCnt;
   @Column(name = "fishery_type")
   private String fisheryType;
   @Column(name = "boat_material")
diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationVersionRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationVersionRepository.java
index 1aa4e47c..2b352c46 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationVersionRepository.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationVersionRepository.java
@@ -3,8 +3,11 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.ViolationVersion;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface ViolationVersionRepository extends JpaRepository<ViolationVersion, ViolationVersion.ViolationVersionId> {
   Optional<ViolationVersion> findTop1ByFbKeyOrderByVersionNoDesc(Integer fbKey);
+
+  List<ViolationVersion> findByFbKeyAndVersionNoOrderByViolationKeyAsc(Integer fbKey, Integer versionNo);
 }
diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java
index d7ceeb65..60bc1a39 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java
@@ -66,6 +66,7 @@ public class FishingBoatService extends BaseService {
     if (crackdownStatus.getCdsKey()==null || crackdownStatus.getCdsKey().equals(0)){
       // 최초 등록시 단속현황, 처리현황, 선원정보를 같이 등록.
       // 단속현황, 단속현황버전 저장.
+      crackdownStatus = setWriteInfo(crackdownStatus);
       cdsKey = crackdownStatusRepository.save(crackdownStatus).getCdsKey();
       CrackdownStatusVersion crackdownStatusVersion = new CrackdownStatusVersion();
       BeanUtils.copyProperties(crackdownStatus, crackdownStatusVersion);
@@ -154,6 +155,35 @@ public class FishingBoatService extends BaseService {
   }
 
   public FishingBoatVersion selectFishingBoatVersion(Integer fbKey, Integer versionNo) {
-    return fishingBoatVersionRepository.findById(new FishingBoatVersion.FishingBoatVersionId(fbKey, versionNo)).orElse(null);
+    FishingBoatVersion fishingBoat = fishingBoatVersionRepository.findById(new FishingBoatVersion.FishingBoatVersionId(fbKey, versionNo)).orElse(null);
+    fishingBoat.setViolationList(violationVersionRepository.findByFbKeyAndVersionNoOrderByViolationKeyAsc(fbKey, versionNo));
+    return fishingBoat;
+  }
+
+  private CrackdownStatus setWriteInfo(CrackdownStatus crackdownStatus){
+    FishingBoat fishingBoat = crackdownStatus.getFishingBoat();
+    crackdownStatus.setWrtOrgan(fishingBoat.getWrtOrgan());
+    crackdownStatus.setWrtPart(fishingBoat.getWrtPart());
+    crackdownStatus.setWrtUserSeq(fishingBoat.getWrtUserSeq());
+    crackdownStatus.setWrtUserNm(fishingBoat.getWrtUserNm());
+    crackdownStatus.setWrtUserGrd(fishingBoat.getWrtUserGrd());
+    crackdownStatus.setWrtDt(LocalDateTime.now());
+
+    crackdownStatus.getProcessResult().setWrtOrgan(fishingBoat.getWrtOrgan());
+    crackdownStatus.getProcessResult().setWrtPart(fishingBoat.getWrtPart());
+    crackdownStatus.getProcessResult().setWrtUserSeq(fishingBoat.getWrtUserSeq());
+    crackdownStatus.getProcessResult().setWrtUserNm(fishingBoat.getWrtUserNm());
+    crackdownStatus.getProcessResult().setWrtUserGrd(fishingBoat.getWrtUserGrd());
+    crackdownStatus.getProcessResult().setWrtDt(LocalDateTime.now());
+
+    for(Sailor sailor: crackdownStatus.getSailorList()){
+      sailor.setWrtOrgan(fishingBoat.getWrtOrgan());
+      sailor.setWrtPart(fishingBoat.getWrtPart());
+      sailor.setWrtUserSeq(fishingBoat.getWrtUserSeq());
+      sailor.setWrtUserNm(fishingBoat.getWrtUserNm());
+      sailor.setWrtUserGrd(fishingBoat.getWrtUserGrd());
+      sailor.setWrtDt(LocalDateTime.now());
+    }
+    return crackdownStatus;
   }
 }
diff --git a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js
index b01a6f94..ec1a4e62 100644
--- a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js
+++ b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js
@@ -60,6 +60,8 @@ $(document).on('change', '#violationSelector', function (){
   }
 })
 $(document).on('click', '.versionInfoTr', function (){
+  $(".versionInfoChkbox").prop("checked", false);
+  $(this).find(".versionInfoChkbox")[0].checked = true
   $.ajax({
     url: '/faStatistics/fishingBoatVersionInfo',
     data: {
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoardVersionInfo.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoardVersionInfo.html
index cd1f2c56..c7dc28c1 100644
--- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoardVersionInfo.html
+++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoardVersionInfo.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <div class="row border border-secondary">
-  <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-center">선명</label>
-  <div class="col-sm-10 border-end border-secondary">
+  <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-bottom border-secondary text-center">선명</label>
+  <div class="col-sm-10 border-bottom border-secondary">
     <div class="input-group w-auto">
       <input type="text" class="form-control form-control-sm border-0" readonly th:value="${fishingBoat.boatNameKr}">
       <input type="text" class="form-control form-control-sm border-0" readonly th:value="${fishingBoat.boatNameCn}">
@@ -22,12 +22,12 @@
   </div>
 </div>
 <div class="row border border-secondary border-top-0">
-  <label class="col-sm-2 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">
+  <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-bottom border-secondary text-center">허가번호</label>
+  <div class="col-sm-4 border-end border-bottom border-secondary">
     <input type="text" class="form-control form-control-sm border-0" readonly th:value="${fishingBoat.permitNum}">
   </div>
-  <label class="col-sm-2 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">
+  <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-bottom border-secondary text-center">국적</label>
+  <div class="col-sm-4 border-bottom border-secondary">
     <input type="text" class="form-control form-control-sm border-0" readonly th:value="${fishingBoat.nationality}">
   </div>
   <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-center">승선원</label>
@@ -40,14 +40,14 @@
   </div>
 </div>
 <div class="row border border-secondary border-top-0">
-  <label class="col-sm-2 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">
+  <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-bottom border-secondary text-center">선종</label>
+  <div class="col-sm-4 border-end border-bottom border-secondary">
     <th:block th:each="code:${ftList}">
       <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq fishingBoat.fisheryType}" th:value="${code.itemValue}">
     </th:block>
   </div>
-  <label class="col-sm-2 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">
+  <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-bottom border-secondary text-center">선질</label>
+  <div class="col-sm-4 border-bottom border-secondary">
     <th:block th:each="code:${bmList}">
       <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq fishingBoat.boatMaterial}" th:value="${code.itemValue}">
     </th:block>
@@ -61,37 +61,37 @@
   </div>
 </div>
 <div class="row border border-secondary border-top-0">
-  <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-center">범칙물</label>
-  <div class="col-sm-6">
+  <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-bottom border-secondary text-center">범칙물</label>
+  <div class="col-sm-6 border-end border-bottom border-secondary">
     <input type="text" class="form-control form-control-sm border-0" readonly
            th:value="|${fishingBoat.offenseType} ${fishingBoat.offenseWeight}kg|">
   </div>
-  <div class="col-sm-4 border-end border-secondary"></div>
+  <div class="col-sm-4 border-bottom border-secondary"></div>
   <label class="col-sm-2 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="|${fishingBoat.offenseQuantity}kg|">
   </div>
-  <label class="col-sm-2 col-form-label col-form-label-sm 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-center">범칙물 위판금액</label>
   <div class="col-sm-4">
     <input type="text" class="form-control form-control-sm border-0" readonly th:value="|${fishingBoat.offenseAmount}원|">
   </div>
 </div>
 <div class="row border border-secondary border-top-0">
-  <label class="col-sm-2 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">
+  <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-bottom border-secondary text-center">범칙물 폐기량</label>
+  <div class="col-sm-4 border-end border-bottom border-secondary">
     <input type="text" class="form-control form-control-sm border-0" readonly th:value="|${fishingBoat.offenseIllegalWasteQuantity}kg|">
   </div>
-  <label class="col-sm-2 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">
+  <label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-bottom border-secondary text-center">담보금 미납액</label>
+  <div class="col-sm-4 border-bottom border-secondary">
     <input type="text" class="form-control form-control-sm border-0" readonly th:value="|${fishingBoat.damboUnpaidAmount}원|">
   </div>
   <label class="col-sm-2 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="|${fishingBoat.damboPayment}원|">
   </div>
-  <label class="col-sm-2 col-form-label col-form-label-sm 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-center">담보금 납부일시</label>
   <div class="col-sm-4">
-    <input type="text" class="form-control form-control-sm border-0" readonly th:value="${fishingBoat.paymentPaymentDt}">
+    <input type="text" class="form-control form-control-sm border-0" readonly th:value="${#temporals.format(fishingBoat.paymentPaymentDt, 'yyyy-MM-dd HH:mm')}">
   </div>
 </div>
 <div class="row border border-secondary border-top-0">
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html
index d27596fa..bb6fb42d 100644
--- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html
+++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html
@@ -78,7 +78,7 @@
         <div class="mb-3 row">
           <label for="napoDt" 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 crackdownStatusInfo dateTimeSelector" id="napoDt" name="napoDt" placeholder="0000-00-00 00:00" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd')}">
+            <input type="text" class="form-control form-control-sm crackdownStatusInfo dateTimeSelector" id="napoDt" name="napoDt" placeholder="0000-00-00 00:00" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd')}" autocomplete="off">
           </div>
           <label for="napoSeaPointLon" class="col-sm-1 col-form-label col-form-label-sm text-center">나포장소</label>
           <div class="col-sm-5">
@@ -118,7 +118,7 @@
               <div class="mb-3 row">
                 <label for="birthdate" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
                 <div class="col-sm-4">
-                  <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate" placeholder="0000-00-00">
+                  <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate" placeholder="0000-00-00" autocomplete="off">
                 </div>
                 <label for="sailorContact" class="col-sm-2 col-form-label col-form-label-sm text-center">연락처</label>
                 <div class="col-sm-4">
@@ -182,7 +182,7 @@
               <div class="mb-3 row">
                 <label for="birthdate2" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
                 <div class="col-sm-4">
-                  <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate2" placeholder="0000-00-00">
+                  <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate2" placeholder="0000-00-00" autocomplete="off">
                 </div>
                 <label for="sailorContact2" class="col-sm-2 col-form-label col-form-label-sm text-center">연락처</label>
                 <div class="col-sm-4">
@@ -223,7 +223,7 @@
                   <div class="mb-3 row">
                     <label for="birthdate" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
                     <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate" placeholder="0000-00-00" th:value="${sailor.birthdate}">
+                      <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate" placeholder="0000-00-00" th:value="${sailor.birthdate}" autocomplete="off">
                     </div>
                     <label for="sailorContact" class="col-sm-2 col-form-label col-form-label-sm text-center">연락처</label>
                     <div class="col-sm-4">
@@ -289,7 +289,7 @@
                   <div class="mb-3 row">
                     <label for="birthdate2" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
                     <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate2" placeholder="0000-00-00" th:value="${sailor.birthdate}">
+                      <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate2" placeholder="0000-00-00" th:value="${sailor.birthdate}" autocomplete="off">
                     </div>
                     <label for="sailorContact2" class="col-sm-2 col-form-label col-form-label-sm text-center">연락처</label>
                     <div class="col-sm-4">
@@ -429,7 +429,7 @@
           </div>
           <label for="paymentPaymentDt" 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 fishingBoatInfo dateTimeSelector" id="paymentPaymentDt" name="fishingBoat.paymentPaymentDt" placeholder="0000-00-00 00:00" th:value="${crackdownStatus.fishingBoat.paymentPaymentDt}">
+            <input type="text" class="form-control form-control-sm fishingBoatInfo dateTimeSelector" id="paymentPaymentDt" name="fishingBoat.paymentPaymentDt" placeholder="0000-00-00 00:00" th:value="${crackdownStatus.fishingBoat.paymentPaymentDt}" autocomplete="off">
           </div>
         </div>
         <div class="mb-3 row">
@@ -463,7 +463,7 @@
             <th:block th:with="ptt=${crackdownStatus.processResult.pressurizedTimeTaken}">
               <div class="input-group w-auto">
                 <input type="number" class="form-control form-control-sm pressurizedTimeTaken processResultInfo" id="pressurizedTimeTakenDate" placeholder="일" th:value="${#strings.substringBefore(ptt, '일')}">
-                <input type="text" class="form-control form-control-sm pressurizedTimeTaken processResultInfo timeSelector" id="pressurizedTimeTakenTime" placeholder="00:00" th:value="${#strings.substringAfter(ptt, '일')}">
+                <input type="text" class="form-control form-control-sm pressurizedTimeTaken processResultInfo timeSelector" id="pressurizedTimeTakenTime" placeholder="00:00" autocomplete="off" th:value="${#strings.substringAfter(ptt, '일')}">
               </div>
               <input type="hidden" class="processResultInfo" name="processResult.pressurizedTimeTaken" id="pressurizedTimeTaken" th:value="${ptt}">
             </th:block>
@@ -473,7 +473,7 @@
             <th:block th:with="wrtt=${crackdownStatus.processResult.warrantReqTakeTime}">
             <div class="input-group w-auto">
               <input type="number" class="form-control form-control-sm warrantReqTake processResultInfo" id="warrantReqTakeDate" placeholder="일" th:value="${#strings.substringBefore(wrtt, '일')}">
-              <input type="text" class="form-control form-control-sm warrantReqTake processResultInfo timeSelector" id="warrantReqTakeTime" placeholder="00:00" th:value="${#strings.substringAfter(wrtt, '일')}">
+              <input type="text" class="form-control form-control-sm warrantReqTake processResultInfo timeSelector" id="warrantReqTakeTime" placeholder="00:00" autocomplete="off" th:value="${#strings.substringAfter(wrtt, '일')}">
             </div>
             <input type="hidden" class="processResultInfo" name="processResult.warrantReqTakeTime" id="warrantReqTake" th:value="${wrtt}">
           </div>
@@ -489,13 +489,13 @@
           </div>
           <label for="evictionDt" 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 processResultInfo dateSelector" id="evictionDt" name="processResult.evictionDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.evictionDt}">
+            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="evictionDt" name="processResult.evictionDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.evictionDt}" autocomplete="off">
           </div>
         </div>
         <div class="mb-3 row">
           <label for="directHandoverDt" 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 processResultInfo dateSelector" id="directHandoverDt" name="processResult.directHandoverDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.directHandoverDt}">
+            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="directHandoverDt" name="processResult.directHandoverDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.directHandoverDt}" autocomplete="off">
           </div>
           <label for="handoverSeaPointLon" class="col-sm-1 col-form-label col-form-label-sm text-center">인계 해점</label>
           <div class="col-sm-2">
@@ -564,21 +564,21 @@
         <div class="mb-3 row">
           <label for="consignmentStartDt" 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 processResultInfo dateSelector" id="consignmentStartDt" name="processResult.consignmentStartDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.consignmentStartDt}">
+            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="consignmentStartDt" name="processResult.consignmentStartDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.consignmentStartDt}" autocomplete="off">
           </div>
           <label for="consignmentEndDt" 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 processResultInfo dateSelector" id="consignmentEndDt" name="processResult.consignmentEndDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.consignmentEndDt}">
+            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="consignmentEndDt" name="processResult.consignmentEndDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.consignmentEndDt}" autocomplete="off">
           </div>
           <label for="confiscationDt" 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 processResultInfo dateSelector" id="confiscationDt" name="processResult.confiscationDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.confiscationDt}">
+            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="confiscationDt" name="processResult.confiscationDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.confiscationDt}" autocomplete="off">
           </div>
         </div>
         <div class="mb-3 row">
           <label for="boatDisposalDt" 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 processResultInfo dateSelector" id="boatDisposalDt" name="processResult.boatDisposalDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.boatDisposalDt}">
+            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="boatDisposalDt" name="processResult.boatDisposalDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.boatDisposalDt}" autocomplete="off">
           </div>
           <label for="boatDisposalType" class="col-sm-1 col-form-label col-form-label-sm text-center">폐선종류</label>
           <div class="col-sm-2">
@@ -591,7 +591,7 @@
           </div>
           <label for="returnDt" 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 processResultInfo dateSelector" id="returnDt" name="processResult.returnDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.returnDt}">
+            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="returnDt" name="processResult.returnDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.returnDt}" autocomplete="off">
           </div>
         </div>
         <div class="mb-3 row">
@@ -663,7 +663,7 @@
         <div class="mb-3 row">
           <label for="sailorAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
             선원구속
-            <button class="border-0 sailorInfo" id="sailorAddBtn">
+            <button type="button" class="border-0 sailorInfo" id="sailorAddBtn">
               <i class="bi bi-plus-square text-primary"></i>
             </button>
           </label>
@@ -699,7 +699,7 @@
           </div>
           <label for="exileDt" 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 processResultInfo dateSelector" id="exileDt" name="processResult.exileDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.exileDt}">
+            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="exileDt" name="processResult.exileDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.exileDt}" autocomplete="off">
           </div>
           <label for="flight" class="col-sm-1 col-form-label col-form-label-sm text-center">항공편</label>
           <div class="col-sm-2">
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html
index b1b71550..bdf8fc13 100644
--- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html
+++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html
@@ -401,7 +401,7 @@
     </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-3">
+        <div class="col-4">
           <table class="table table-hover">
             <thead>
             <tr>
@@ -414,7 +414,7 @@
             <tr class="versionInfoTr" th:each="fishingBoat:${crackdownStatus.fishingBoatVersionList}">
               <input type="hidden" class="fbKey" th:value="${fishingBoat.fbKey}">
               <input type="hidden" class="versionNo" th:value="${fishingBoat.versionNo}">
-              <td><input type="checkbox"></td>
+              <td><input type="checkbox" class="versionInfoChkbox"></td>
               <td>
                 <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                   <th:block th:if="${fishingBoat.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
@@ -430,7 +430,7 @@
             </tbody>
           </table>
         </div>
-        <div class="col-9 border-start" id="fishingBoardVersionInfoDiv">
+        <div class="col-8" id="fishingBoardVersionInfoDiv">
 
         </div>
       </div>