불법조업 외국어선 요청사항 반영

- mmsi, 허가번호 삭제.
 - 컬럼명 변경.
 - 담보금 납부일시 양식 변경.

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

@@ -7,6 +7,7 @@ import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Getter
@@ -52,8 +53,8 @@ public class FishingBoatBaseEntity extends BaseModel {
   @Column(name = "dambo_payment")
   private Double damboPayment=0d;
   @Column(name = "payment_payment_dt")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDateTime paymentPaymentDt;
+  private LocalDate paymentPaymentDt;
   @Column(name = "confiscation_frame")
   private String confiscationFrame;
   @Column(name = "confiscation_width")

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

@@ -29,9 +29,6 @@ $(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"))
 })

src/main/resources/templates/common/modal/crackdownStatusModal.html

@@ -107,7 +107,7 @@
                     <th rowspan="3">일시</th>
                     <th rowspan="3">해점</th>
                     <th rowspan="3">인계함정</th>
-                    <th rowspan="3">중측인수함정</th>
+                    <th rowspan="3">중국측 인수함정</th>
                     <th rowspan="2">계</th>
                     <th rowspan="2">선장</th>
                     <th rowspan="2">향해장</th>

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

@@ -207,7 +207,7 @@
                         <input class="form-control form-control-sm" name="handoverBoat" id="handoverBoat" placeholder="인계함정" th:value="${searchParams.handoverBoat}">
                       </div>
                       <div class="col-2">
-                        <input class="form-control form-control-sm" name="middleTakeoverBoat" id="middleTakeoverBoat" placeholder="중측 인수함정" th:value="${searchParams.middleTakeoverBoat}">
+                        <input class="form-control form-control-sm" name="middleTakeoverBoat" id="middleTakeoverBoat" placeholder="중국측 인수함정" th:value="${searchParams.middleTakeoverBoat}">
                       </div>
                     </div>
                     <div class="row justify-content-start pb-1 subSearchParam" style="display: none">
@@ -450,7 +450,7 @@
                       <th rowspan="3">일시</th>
                       <th rowspan="3">해점</th>
                       <th rowspan="3">인계함정</th>
-                      <th rowspan="3">중측인수함정</th>
+                      <th rowspan="3">중국측 인수함정</th>
                       <th rowspan="2">계</th>
                       <th rowspan="2">선장</th>
                       <th rowspan="2">항해장</th>

src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html

@@ -380,7 +380,7 @@
       <div class="col-sm-2">
         <input class="form-control form-control-sm" name="handoverBoat" th:value="${crackdownStatus.processResult.handoverBoat}">
       </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center">중측</br>인수함정</label>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">중국측</br>인수함정</label>
       <div class="col-sm-2">
         <input class="form-control form-control-sm" name="middleTakeoverBoat" th:value="${crackdownStatus.processResult.middleTakeoverBoat}">
       </div>

src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusViewModal.html

@@ -383,7 +383,7 @@
           <div class="col-sm-2">
             <input class=" form-control form-control-sm" name="handoverBoat" th:value="${crackdownStatus.processResult.handoverBoat}" readonly>
           </div>
-          <label class="col-sm-1 col-form-label col-form-label-sm text-center">중측</br>인수함정</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">중국측</br>인수함정</label>
           <div class="col-sm-2">
             <input class=" form-control form-control-sm" name="middleTakeoverBoat" th:value="${crackdownStatus.processResult.middleTakeoverBoat}" readonly>
           </div>

src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html

@@ -747,7 +747,7 @@
             <div class="col-sm-2">
               <input type="text" class="form-control form-control-sm " id="handoverBoat" name="processResult.handoverBoat" th:value="${crackdownStatus.processResult.handoverBoat}" th:disabled="${!directHandoverFlag}">
             </div>
-            <label for="middleTakeoverBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">중측 인수함정</label>
+            <label for="middleTakeoverBoat" 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="middleTakeoverBoat" name="processResult.middleTakeoverBoat" th:value="${crackdownStatus.processResult.middleTakeoverBoat}" th:disabled="${!directHandoverFlag}">
             </div>

src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html

@@ -473,7 +473,7 @@
         <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>
+        <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}">
         </div>

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

@@ -97,19 +97,21 @@
                           </select>
                         </div>
                       </div>
-                      <div class="row justify-content-end">
+                      <!--<div class="row justify-content-end">
                         <div class="col-2">
                           <input type="text" class="form-control form-control-sm" placeholder="죄명" name="crimeName" th:value="${searchParams.crimeName}">
                         </div>
-                        <div class="col-2"></div>
+                        <div class="col-2">
+                          <input type="text" class="form-control form-control-sm" name="" placeholder="개발중">
+                        </div>
                         <div class="col-4">
                           <div class="input-group w-auto input-daterange" id="dateSelectorDiv">
                             <input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
                             <input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
                           </div>
                         </div>
-                      </div>
+                      </div>-->
-                      <!--<div class="row justify-content-end">
+                      <div class="row justify-content-end">
                         <div class="col-2">
                           <input type="text" class="form-control form-control-sm" placeholder="죄명" name="crimeName" th:value="${searchParams.crimeName}">
                         </div>
@@ -145,7 +147,7 @@
                             <input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
                           </div>
                         </div>
-                      </div>-->
+                      </div>
                     </div>
                     <div class="col-1 d-grid gap-2">
                       <input type="submit" class="btn btn-primary" id="searchBtn" value="검색">

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

@@ -94,10 +94,6 @@
       </div>
     </div>
     <div class="row mb-1">
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center">MMSI.NO</label>
-      <div class="col-sm-2">
-        <input class="form-control form-control-sm" name="mmsi" th:value="${crackdownInfo.mmsi}">
-      </div>
       <label for="invasionType" class="col-sm-1 col-form-label col-form-label-sm text-center">침범유형</label>
       <div class="col-sm-2">
         <select class="form-select form-select-sm" name="invasionType" id="invasionType">

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

@@ -43,10 +43,6 @@
   </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="${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>
   <div class="col-sm-2 border-end border-secondary">
     <th:block th:each="code:${session.commonCode.get('IST')}">

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

@@ -50,9 +50,6 @@
                   <div class="col-2">
                     <input type="text" class="form-control form-control-sm" placeholder="사건번호">
                   </div>
-                  <div class="col-2">
-                    <input type="text" class="form-control form-control-sm" placeholder="MMSI.NO">
-                  </div>
                   <div class="col-2">
                     <input type="text" class="form-control form-control-sm" placeholder="나포장소">
                   </div>
@@ -85,7 +82,6 @@
                 <tr class="table-secondary">
                   <th></th>
                   <th>사건번호</th>
-                  <th>MMSI.NO</th>
                   <th>나포일시</th>
                   <th>나포장소</th>
                   <th>사건담당경찰서</th>
@@ -104,7 +100,6 @@
                   <tr class="cdiTr">
                     <td><input type="checkbox" class="cdiCheckbox" th:data-cdskey="${cdi.cdsKey}" th:data-casenum="${cdi.caseNum}"></td>
                     <td th:text="${cdi.caseNum}"></td>
-                    <td th:text="${cdi.mmsi}"></td>
                     <td th:text="${#temporals.format(cdi.napoDt, 'yyyy-MM-dd HH:mm')}"></td>
                     <td>
                       <div th:if="${!#strings.isEmpty(cdi.napoSeaPointLon) and !#strings.isEmpty(cdi.napoSeaPointLon)}" th:text="${#strings.concat(cdi.napoSeaPointLon, ' ~ ', cdi.napoSeaPointLat)}"></div>

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

@@ -78,10 +78,6 @@
         </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">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 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')}">

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

@@ -65,12 +65,12 @@
                       </div>
                     </div>
                     <div class="row justify-content-end pb-1">
+                      <!--<div class="col-2">
+                        <input type="text" class="form-control form-control-sm" name="" placeholder="개발중">
+                      </div>-->
                       <div class="col-2">
                         <input type="text" class="form-control form-control-sm" name="caseNum" placeholder="사건번호" th:value="${searchParams.caseNum}">
                       </div>
-                      <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" name="mmsi" placeholder="MMSI.NO" th:value="${searchParams.mmsi}">
-                      </div>
                       <div class="col-2">
                         <input type="text" class="form-control form-control-sm" name="napoPoint" placeholder="나포장소" th:value="${searchParams.napoPoint}">
                       </div>
@@ -103,7 +103,6 @@
                     <tr class="table-secondary">
                       <th>순번</th>
                       <th>사건번호</th>
-                      <th>MMSI.NO</th>
                       <th>나포일시</th>
                       <th>나포장소</th>
                       <th>사건담당경찰서</th>
@@ -122,7 +121,6 @@
                       <tr class="cdiTr" th:data-cdskey="${cdi.cdsKey}">
                         <td th:text="${searchParams.contentCnt-(20*(searchParams.pageIndex-1))-cnt.index}"></td>
                         <td th:text="${cdi.caseNum}"></td>
-                        <td th:text="${cdi.mmsi}"></td>
                         <td th:text="${#temporals.format(cdi.napoDt, 'yyyy-MM-dd HH:mm')}"></td>
                         <td>
                           <div th:if="${!#strings.isEmpty(cdi.napoSeaPointLon) and !#strings.isEmpty(cdi.napoSeaPointLon)}" th:text="${#strings.concat(cdi.napoSeaPointLon, ' ~ ', cdi.napoSeaPointLat)}"></div>

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

@@ -38,9 +38,6 @@
                       <div class="col-2">
                         <input type="text" class="form-control form-control-sm" name="caseNum" placeholder="사건번호" th:value="${searchParams.caseNum}">
                       </div>
-                      <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" name="permitNum" placeholder="허가번호" th:value="${searchParams.permitNum}">
-                      </div>
                       <div class="col-2">
                         <input type="text" class="form-control form-control-sm" name="boatName" placeholder="선명" th:value="${searchParams.boatName}">
                       </div>
@@ -97,7 +94,6 @@
                       <th>순번</th>
                       <th>사건번호</th>
                       <th>선명</th>
-                      <th>허가번호</th>
                       <th>국적</th>
                       <th>승선원</th>
                       <th>톤수</th>
@@ -114,7 +110,6 @@
                         <td th:text="${searchParams.contentCnt-(20*(searchParams.pageIndex-1))-cnt.index}"></td>
                         <td th:text="${shipInfo.caseNum}"></td>
                         <td th:text="${shipInfo.boatNameKr}"></td>
-                        <td th:text="${shipInfo.permitNum}"></td>
                         <td th:text="${shipInfo.nationality}"></td>
                         <td th:text="${shipInfo.sailorCnt}"></td>
                         <td th:text="${shipInfo.tonCnt}"></td>

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

@@ -35,10 +35,6 @@
       <div class="col-sm-1"></div>
     </div>
     <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="${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="${shipInfo.nationality}">
@@ -114,13 +110,9 @@
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm " id="damboPayment" name="damboPayment" placeholder="단위: 만원" th:value="${shipInfo.damboPayment>0?shipInfo.damboPayment:''}">
       </div>
-      <label for="paymentDate" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">담보금 납부일시</label>
+      <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="hidden" id="paymentPaymentDt" name="paymentPaymentDt" th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd hh:mm')}">
+        <input type="text" class="form-control form-control-sm  dateSelector" id="paymentPaymentDt" name="paymentPaymentDt" placeholder="yyyy-mm-dd" th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}" autocomplete="off">
-        <div class="input-group">
-          <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="paymentTime"  placeholder="hh:mm" th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'HH:mm')}" autocomplete="off">
-        </div>
       </div>
     </div>
     <div class="row mb-1">

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

@@ -14,10 +14,6 @@
   </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}">
@@ -82,7 +78,7 @@
   </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')}">
+    <input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}">
   </div>
 </div>
 <div class="row border border-secondary border-top-0">

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

@@ -18,9 +18,6 @@
                     <div class="col-2">
                       <input type="text" class="form-control form-control-sm" name="caseNum" placeholder="사건번호" th:value="${searchParams.caseNum}">
                     </div>
-                    <div class="col-2">
-                      <input type="text" class="form-control form-control-sm" name="permitNum" placeholder="허가번호" th:value="${searchParams.permitNum}">
-                    </div>
                     <div class="col-2">
                       <input type="text" class="form-control form-control-sm" name="boatName" placeholder="선명" th:value="${searchParams.boatName}">
                     </div>
@@ -77,7 +74,6 @@
                     <th></th>
                     <th>사건번호</th>
                     <th>선명</th>
-                    <th>허가번호</th>
                     <th>국적</th>
                     <th>승선원</th>
                     <th>톤수</th>
@@ -93,7 +89,6 @@
                       <td><input type="checkbox" class="isiCheckbox" th:data-fbkey="${shipInfo.fbKey}" th:data-boatnamekr="${shipInfo.boatNameKr}"> </td>
                       <td th:text="${shipInfo.caseNum}"></td>
                       <td th:text="${shipInfo.boatNameKr}"></td>
-                      <td th:text="${shipInfo.permitNum}"></td>
                       <td th:text="${shipInfo.nationality}"></td>
                       <td th:text="${shipInfo.sailorCnt}"></td>
                       <td th:text="${shipInfo.tonCnt}"></td>

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

@@ -45,10 +45,6 @@
         </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}">
@@ -113,7 +109,7 @@
         </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')}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}">
         </div>
       </div>
       <div class="row border border-secondary border-top-0">

src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html

@@ -100,10 +100,6 @@
         </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}">
@@ -168,7 +164,7 @@
         </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')}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}">
         </div>
       </div>
       <div class="row border border-secondary border-top-0">

src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html

@@ -138,7 +138,7 @@
         <div class="col-sm-2">
           <input type="text" class="form-control form-control-sm " id="handoverBoat" name="handoverBoat" th:value="${shipProcessInfo.handoverBoat}" th:disabled="${!directHandoverFlag}">
         </div>
-        <label for="middleTakeoverBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">중측 인수함정</label>
+        <label for="middleTakeoverBoat" 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="middleTakeoverBoat" name="middleTakeoverBoat" th:value="${shipProcessInfo.middleTakeoverBoat}" th:disabled="${!directHandoverFlag}">
         </div>

src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiHistoryDiv.html

@@ -67,7 +67,7 @@
   <div class="col-sm-2 border-end border-secondary">
     <input type="text" class="form-control form-control border-0" readonly th:value="${processInfo.handoverBoat}">
   </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-13">중측<br>인수함정</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-13">중국측<br>인수함정</label>
   <div class="col-sm-2">
     <input type="text" class="form-control form-control border-0" readonly th:value="${processInfo.middleTakeoverBoat}">
   </div>

src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html

@@ -99,7 +99,7 @@
         <div class="col-sm-2 border-end border-secondary">
           <input type="text" class="form-control form-control border-0" readonly th:value="${processInfo.handoverBoat}">
         </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>
+        <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">
           <input type="text" class="form-control form-control border-0" readonly th:value="${processInfo.middleTakeoverBoat}">
         </div>
@@ -143,10 +143,6 @@
         </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}">
@@ -211,7 +207,7 @@
         </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')}">
+          <input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}">
         </div>
       </div>
       <div class="row border border-secondary border-top-0">

src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html

@@ -187,10 +187,6 @@
           </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="${fishingBoat.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>
           <div class="col-sm-2 border-end border-secondary">
             <input type="text" class="form-control form-control-sm border-0" readonly th:value="${fishingBoat.nationality}">
@@ -344,7 +340,7 @@
           <div class="col-sm-2 border-end border-secondary">
             <input type="text" class="form-control form-control-sm border-0" readonly th:value="${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>
+          <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="${processResult.middleTakeoverBoat}">
           </div>