From 65f2ce3a575216b5cef341619d0416f8d49c8d10 Mon Sep 17 00:00:00 2001
From: "DESKTOP-QGC5RJO\\DBNT" <yrseo@dbnt.co.kr>
Date: Fri, 27 Jan 2023 14:52:01 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EC=97=AC=EA=B0=9D=EC=84=A0?=
 =?UTF-8?q?=20=ED=98=84=ED=99=A9=20=ED=95=B4=EB=A6=AC/km=20=EC=86=8C?=
 =?UTF-8?q?=EC=88=AB=EC=A0=90=20=EC=82=AD=EC=A0=9C,=20=EC=84=A0=EC=9B=90?=
 =?UTF-8?q?=EC=84=B8=EB=B6=80=ED=98=84=ED=99=A9=20=EC=88=9C=EB=B2=88=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java    | 4 ++--
 src/main/resources/templates/faStatistics/sailor/sailor.html  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java
index 25dba98a..f9461c02 100644
--- a/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java
+++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java
@@ -40,9 +40,9 @@ public class ShipInfo extends BaseModel implements Serializable{
   @Column(name = "end_point")
   private String endPoint;
   @Column(name = "distance_nm")
-  private Double distanceNm;
+  private Integer distanceNm;
   @Column(name = "distance_km")
-  private Double distanceKm;
+  private Integer distanceKm;
   @Column(name = "owner_nm")
   private String ownerNm;
   @Column(name = "ship_nm")
diff --git a/src/main/resources/templates/faStatistics/sailor/sailor.html b/src/main/resources/templates/faStatistics/sailor/sailor.html
index 46f8150c..18a0c06f 100644
--- a/src/main/resources/templates/faStatistics/sailor/sailor.html
+++ b/src/main/resources/templates/faStatistics/sailor/sailor.html
@@ -145,6 +145,7 @@
                     <thead class="align-middle">
                     <tr class="table-secondary pSticky" >
                       <!--<th rowspan="2">연번</th>-->
+                      <th rowspan="2">순번</th>
                       <th rowspan="2">선박명</th>
                       <th rowspan="2">나포일시</th>
                       <th rowspan="2">단속경찰서</th>
@@ -223,8 +224,9 @@
                     </tr>
                     </thead>
                     <tbody class="table-group-divider align-middle">
-                    <th:block th:each="sailor:${sailorList}">
+                    <th:block th:each="sailor,cnt:${sailorList}">
                       <tr class="tr" th:data-key="${sailor.sailorKey}">
+                        <td th:text="${cnt.count}"></td>
                         <!--<td th:text="${sailor.sailorKey}"></td>-->
                         <td th:text="${sailor.fishingBoat.boatNameKr}"></td>
                         <td th:text="${#temporals.format(sailor.crackdownStatus.napoDt, 'yyyy-MM-dd HH:mm')}"></td>