국제여객선 현황 해리/km 소숫점 삭제, 선원세부현황 순번 추가
parent
08623c9833
commit
65f2ce3a57
|
|
@ -40,9 +40,9 @@ public class ShipInfo extends BaseModel implements Serializable{
|
||||||
@Column(name = "end_point")
|
@Column(name = "end_point")
|
||||||
private String endPoint;
|
private String endPoint;
|
||||||
@Column(name = "distance_nm")
|
@Column(name = "distance_nm")
|
||||||
private Double distanceNm;
|
private Integer distanceNm;
|
||||||
@Column(name = "distance_km")
|
@Column(name = "distance_km")
|
||||||
private Double distanceKm;
|
private Integer distanceKm;
|
||||||
@Column(name = "owner_nm")
|
@Column(name = "owner_nm")
|
||||||
private String ownerNm;
|
private String ownerNm;
|
||||||
@Column(name = "ship_nm")
|
@Column(name = "ship_nm")
|
||||||
|
|
|
||||||
|
|
@ -145,6 +145,7 @@
|
||||||
<thead class="align-middle">
|
<thead class="align-middle">
|
||||||
<tr class="table-secondary pSticky" >
|
<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>
|
||||||
<th rowspan="2">나포일시</th>
|
<th rowspan="2">나포일시</th>
|
||||||
<th rowspan="2">단속경찰서</th>
|
<th rowspan="2">단속경찰서</th>
|
||||||
|
|
@ -223,8 +224,9 @@
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="table-group-divider align-middle">
|
<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}">
|
<tr class="tr" th:data-key="${sailor.sailorKey}">
|
||||||
|
<td th:text="${cnt.count}"></td>
|
||||||
<!--<td th:text="${sailor.sailorKey}"></td>-->
|
<!--<td th:text="${sailor.sailorKey}"></td>-->
|
||||||
<td th:text="${sailor.fishingBoat.boatNameKr}"></td>
|
<td th:text="${sailor.fishingBoat.boatNameKr}"></td>
|
||||||
<td th:text="${#temporals.format(sailor.crackdownStatus.napoDt, 'yyyy-MM-dd HH:mm')}"></td>
|
<td th:text="${#temporals.format(sailor.crackdownStatus.napoDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue