From a4f7b5a2138569d4220906dba552ae0dd4ac74d2 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: Mon, 7 Aug 2023 18:14:29 +0900
Subject: [PATCH] =?UTF-8?q?=EB=82=98=ED=8F=AC=EC=9D=BC=EC=8B=9C,=20?=
 =?UTF-8?q?=EC=9E=A5=EC=86=8C=20=ED=98=91=EC=9D=98=20=ED=95=84=EC=9A=94.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fishingBoat/FishingBoatBaseEntity.java    | 14 +++++++++++
 .../crackdownInfo/cdiEditModal.html           |  4 ----
 .../illegalShipInfo/isiEditModal.html         | 24 +++++++++++++++----
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java
index cb0cc169..5dc60389 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java
@@ -87,4 +87,18 @@ public class FishingBoatBaseEntity extends BaseModel {
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
   private LocalDateTime wrtDt;
 
+  /*나포일시*/
+  @Column(name = "napo_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime napoDt;
+  /*나포장소 위도*/
+  @Column(name = "napo_sea_point_lon")
+  private String napoSeaPointLon;
+  /*나포장소 경도*/
+  @Column(name = "napo_sea_point_lat")
+  private String napoSeaPointLat;
+  /*나포장소 상세*/
+  @Column(name = "napo_sea_point_detail")
+  private String napoSeaPointDetail;
+
 }
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html
index d5b25c0a..106c7c85 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html
@@ -20,10 +20,6 @@
           <label for="caseNum" 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 " id="caseNum" name="caseNum" th:value="${crackdownInfo.caseNum}">
-            <!--<div class="input-group">
-              <input type="text" class="form-control form-control-sm " id="caseNum" name="caseNum" th:value="${crackdownInfo.caseNum}">
-              <input type="button" class="btn btn-sm btn-outline-primary  w-auto" id="caseNumBtn" value="불러오기">
-            </div>-->
           </div>
           <label for="violationSelector" class="col-sm-2 col-form-label col-form-label-sm text-center">위반사항</label>
           <div class="col-sm-4">
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html
index 80cdd8fa..f0b01be0 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html
@@ -26,15 +26,12 @@
     </div>
     <div class="row mb-1">
       <label for="boatNameCn" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <div class="input-group w-auto">
           <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="${shipInfo.boatNameCn}">
         </div>
       </div>
-      <div class="col-sm-1"></div>
-    </div>
-    <div class="row mb-1">
       <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}">
@@ -75,7 +72,24 @@
         </div>
       </div>
     </div>
-
+    <div class="row mb-1">
+      <label for="napoDate" 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" name="napoDt" id="napoDt" th:value="${#temporals.format(shipInfo.napoDt, 'yyyy-MM-dd HH:mm')}">
+          <input type="text" class="form-control form-control-sm  dateSelector" id="napoDate" placeholder="yyyy-mm-dd" th:value="${#temporals.format(shipInfo.napoDt, 'yyyy-MM-dd')}" autocomplete="off">
+          <input type="text" class="form-control form-control-sm timeInputer" id="napoTime" placeholder="hh:mm" th:value="${#temporals.format(shipInfo.napoDt, 'HH:mm')}" autocomplete="off">
+        </div>
+      </div>
+      <label for="napoSeaPointLon" 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">
+          <input type="text" class="form-control form-control-sm w-25 " id="napoSeaPointLon" name="napoSeaPointLon" placeholder="00 . 00 . 00N" th:value="${shipInfo.napoSeaPointLon}">
+          <input type="text" class="form-control form-control-sm w-25 " id="napoSeaPointLat" name="napoSeaPointLat" placeholder="000-00.00E" th:value="${shipInfo.napoSeaPointLat}">
+          <input type="text" class="form-control form-control-sm w-50 " id="napoSeaPointDetail" name="napoSeaPointDetail" placeholder="00도 00방 00해리, 어업협정선 내측 00해리" th:value="${shipInfo.napoSeaPointDetail}">
+        </div>
+      </div>
+    </div>
     <div class="row mb-1">
       <label for="offenseType" class="col-sm-1 col-form-label col-form-label-sm text-center">범칙물</label>
       <div class="col-sm-2">