DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

불법조업 외국어선 통계 작업중.

master
강석 최 2023-08-04 18:18:28 +09:00
parent 0f2cb7a58a
commit 405b57d854
13 changed files with 56 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java
View File

@ -62,7 +62,7 @@ public class UnlawfulFishingParam extends BaseModel {
private String napoSeaPointDetail;
private String nll;
private String distance;
private String isDamboUnpaidAmount;
private String depositUnpaid;
private String isEvictionDt;
private String isReturnDt;
private String isConsignmentStartDt;

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

@ -46,15 +46,15 @@ public class FishingBoatBaseEntity extends BaseModel {
private Integer offenseQuantity=0;
@Column(name = "offense_amount")
private Integer offenseAmount=0;
@Column(name = "offense_illegal_waste_quantity")
private Integer offenseIllegalWasteQuantity=0;
@Column(name = "dambo_unpaid_amount")
private Double damboUnpaidAmount=0d;
@Column(name = "dambo_payment")
private Double damboPayment=0d;
@Column(name = "payment_payment_dt")
@Column(name = "offense_disposal")
private Integer offenseDisposal=0;
@Column(name = "deposit_unpaid")
private Double depositUnpaid=0d;
@Column(name = "deposit_payment")
private Double depositPayment=0d;
@Column(name = "deposit_payment_dt")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate paymentPaymentDt;
private LocalDate depositPaymentDt;
@Column(name = "confiscation_frame")
private String confiscationFrame;
@Column(name = "confiscation_width")

3
src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java
View File

@ -101,9 +101,6 @@ public class OrganConfigService {
childList = childList.stream()
.sorted(Comparator.comparing(OrganConfig::getOrderNum, Comparator.nullsLast(Comparator.naturalOrder())))
.collect(Collectors.toList());
OrganConfig total = new OrganConfig();
total.setOrganNm(middle.getOrganNm()+" 계");
childList.add(total);
middle.setChildList(childList);
}
middleOrganList = middleOrganList.stream()

12
src/main/resources/mybatisMapper/CrackdownStatusMapper.xml
View File

@ -28,10 +28,10 @@
and a.distance like '%'||#{distance}||'%'
</if>
<if test="isDamboUnpaidAmount == 'Y'">
and b.dambo_unpaid_amount > 0
and b.deposit_unpaid > 0
</if>
<if test="isDamboUnpaidAmount == 'N'">
and (b.dambo_unpaid_amount = 0 or b.dambo_unpaid_amount is null)
and (b.deposit_unpaid = 0 or b.deposit_unpaid is null)
</if>
<if test="isEvictionDt == 'Y'">
and b.eviction_dt is not null
@ -316,11 +316,11 @@
c.offense_weight ,
c.offense_quantity ,
c.offense_amount ,
c.offense_illegal_waste_quantity ,
c.offense_disposal ,
b.process_status ,
c.dambo_unpaid_amount ,
c.dambo_payment ,
c.payment_payment_dt ,
c.deposit_unpaid ,
c.deposit_payment ,
c.deposit_payment_dt ,
b.consignment_start_dt ,
b.consignment_end_dt ,
b.eviction_dt ,

4
src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml
View File

@ -156,10 +156,10 @@
<choose>
<when test='dateSelector == "paymentDt"'>
<if test='startDate != null and startDate != ""'>
and a.payment_payment_dt >= #{startDate}::date
and a.deposit_payment_dt >= #{startDate}::date
</if>
<if test='endDate != null and endDate != ""'>
and a.payment_payment_dt &lt;= #{endDate}::date+1
and a.deposit_payment_dt &lt;= #{endDate}::date+1
</if>
</when>
<when test='dateSelector == "wrtDt"'>

2
src/main/resources/static/js/faStatistics/unlawfulFishing/shipProcessInfo.js
View File

@ -30,7 +30,7 @@ $(document).on('change', '#directHandoverSelector', function (){
})
$(document).on('change', '#offenseSelector', function (){
childInputStateChange(Number(this.value), $("#offenseIllegalWasteQuantity"))
childInputStateChange(Number(this.value), $("#offenseDisposal"))
childInputStateChange(Number(this.value), $("#offenseQuantity"))
childInputStateChange(Number(this.value), $("#offenseAmount"))
})

18
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html
View File

@ -88,9 +88,9 @@
<input type="text" class="form-control w-30 form-control-sm offenseInput" id="offenseWeight" name="offenseWeight" placeholder="000kg" th:value="${shipInfo.offenseWeight>0?shipInfo.offenseWeight:''}" th:disabled="${shipInfo.offenseType eq null}">
</div>
</div>
<label for="offenseIllegalWasteQuantity" class="col-sm-1 col-form-label col-form-label-sm text-center">범칙물 폐기량</label>
<label for="offenseDisposal" 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 offenseInput" id="offenseIllegalWasteQuantity" name="offenseIllegalWasteQuantity" placeholder="000kg" th:value="${shipInfo.offenseIllegalWasteQuantity>0?shipInfo.offenseIllegalWasteQuantity:''}" th:disabled="${shipInfo.offenseType eq null}">
<input type="text" class="form-control form-control-sm offenseInput" id="offenseDisposal" name="offenseDisposal" placeholder="000kg" th:value="${shipInfo.offenseDisposal>0?shipInfo.offenseDisposal:''}" th:disabled="${shipInfo.offenseType eq null}">
</div>
<label for="offenseQuantity" class="col-sm-1 col-form-label col-form-label-sm text-center">범칙물 위판량</label>
<div class="col-sm-2">
@ -98,21 +98,21 @@
</div>
<label for="offenseAmount" 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 offenseInput" id="offenseAmount" name="offenseAmount" placeholder="단위: 만원" th:value="${shipInfo.offenseAmount>0?shipInfo.offenseAmount:''}" th:disabled="${shipInfo.offenseType eq null}">
<input type="text" class="form-control form-control-sm offenseInput" id="offenseAmount" name="offenseAmount" placeholder="단위: 원" th:value="${shipInfo.offenseAmount>0?shipInfo.offenseAmount:''}" th:disabled="${shipInfo.offenseType eq null}">
</div>
</div>
<div class="row mb-1">
<label for="damboUnpaidAmount" class="col-sm-1 col-form-label col-form-label-sm text-center">담보금 미납액</label>
<label for="depositUnpaid" 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="damboUnpaidAmount" name="damboUnpaidAmount" placeholder="단위: 만원" th:value="${shipInfo.damboUnpaidAmount>0?shipInfo.damboUnpaidAmount:''}">
<input type="text" class="form-control form-control-sm " id="depositUnpaid" name="depositUnpaid" placeholder="단위: 원" th:value="${shipInfo.depositUnpaid>0?shipInfo.depositUnpaid:''}">
</div>
<label for="damboPayment" class="col-sm-1 col-form-label col-form-label-sm text-center">담보금 납부액</label>
<label for="depositPayment" 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="damboPayment" name="damboPayment" placeholder="단위: 만원" th:value="${shipInfo.damboPayment>0?shipInfo.damboPayment:''}">
<input type="text" class="form-control form-control-sm " id="depositPayment" name="depositPayment" placeholder="단위: 원" th:value="${shipInfo.depositPayment>0?shipInfo.depositPayment:''}">
</div>
<label for="paymentPaymentDt" class="col-sm-1 col-form-label col-form-label-sm text-center">담보금 납부일</label>
<label for="depositPaymentDt" 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 dateSelector" id="paymentPaymentDt" name="paymentPaymentDt" placeholder="yyyy-mm-dd" th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}" autocomplete="off">
<input type="text" class="form-control form-control-sm dateSelector" id="depositPaymentDt" name="depositPaymentDt" placeholder="yyyy-mm-dd" th:value="${#temporals.format(shipInfo.depositPaymentDt, 'yyyy-MM-dd')}" autocomplete="off">
</div>
</div>
<div class="row mb-1">

10
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html
View File

@ -56,7 +56,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">범칙물 폐기량</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.offenseIllegalWasteQuantity>0}" th:text="|${shipInfo.offenseIllegalWasteQuantity}kg|"></th:block>
<th:block th:if="${shipInfo.offenseDisposal>0}" th:text="|${shipInfo.offenseDisposal}kg|"></th:block>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
@ -64,21 +64,21 @@
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.offenseAmount>0}" th:text="|${shipInfo.offenseAmount}만원|"></th:block>
<th:block th:if="${shipInfo.offenseAmount>0}" th:text="|${#numbers.formatInteger(shipInfo.offenseAmount,1,'COMMA')}원|"></th:block>
</label>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboUnpaidAmount>0}" th:text="|${shipInfo.damboUnpaidAmount}만원|"></th:block>
<th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></th:block>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboPayment>0}" th:text="|${shipInfo.damboPayment}만원|"></th:block>
<th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></th:block>
</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')}">
<input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.depositPaymentDt, 'yyyy-MM-dd')}">
</div>
</div>
<div class="row border border-secondary border-top-0">

10
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html
View File

@ -87,7 +87,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">범칙물 폐기량</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.offenseIllegalWasteQuantity>0}" th:text="|${shipInfo.offenseIllegalWasteQuantity}kg|"></th:block>
<th:block th:if="${shipInfo.offenseDisposal>0}" th:text="|${shipInfo.offenseDisposal}kg|"></th:block>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
@ -95,21 +95,21 @@
</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-secondary border-end text-center fs-11">범칙물 위판금액</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-secondary text-start">
<th:block th:if="${shipInfo.offenseAmount>0}" th:text="|${shipInfo.offenseAmount}만원|"></th:block>
<th:block th:if="${shipInfo.offenseAmount>0}" th:text="|${#numbers.formatInteger(shipInfo.offenseAmount,1,'COMMA')}원|"></th:block>
</label>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboUnpaidAmount>0}" th:text="|${shipInfo.damboUnpaidAmount}만원|"></th:block>
<th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></th:block>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboPayment>0}" th:text="|${shipInfo.damboPayment}만원|"></th:block>
<th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></th:block>
</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="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}">
<input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.depositPaymentDt, 'yyyy-MM-dd')}">
</div>
</div>
<div class="row border border-secondary border-top-0">

10
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html
View File

@ -142,7 +142,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">범칙물 폐기량</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.offenseIllegalWasteQuantity>0}" th:text="|${shipInfo.offenseIllegalWasteQuantity}kg|"></th:block>
<th:block th:if="${shipInfo.offenseDisposal>0}" th:text="|${shipInfo.offenseDisposal}kg|"></th:block>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
@ -150,21 +150,21 @@
</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-secondary border-end text-center fs-11">범칙물 위판금액</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-secondary text-start">
<th:block th:if="${shipInfo.offenseAmount>0}" th:text="|${shipInfo.offenseAmount}만원|"></th:block>
<th:block th:if="${shipInfo.offenseAmount>0}" th:text="|${#numbers.formatInteger(shipInfo.offenseAmount,1,'COMMA')}원|"></th:block>
</label>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboUnpaidAmount>0}" th:text="|${shipInfo.damboUnpaidAmount}만원|"></th:block>
<th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></th:block>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboPayment>0}" th:text="|${shipInfo.damboPayment}만원|"></th:block>
<th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></th:block>
</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')}">
<input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.depositPaymentDt, 'yyyy-MM-dd')}">
</div>
</div>
<div class="row border border-secondary border-top-0">

10
src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html
View File

@ -185,7 +185,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">범칙물 폐기량</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.offenseIllegalWasteQuantity>0}" th:text="|${shipInfo.offenseIllegalWasteQuantity}kg|"></th:block>
<th:block th:if="${shipInfo.offenseDisposal>0}" th:text="|${shipInfo.offenseDisposal}kg|"></th:block>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
@ -193,21 +193,21 @@
</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-secondary border-end text-center fs-11">범칙물 위판금액</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-secondary text-start">
<th:block th:if="${shipInfo.offenseAmount>0}" th:text="|${shipInfo.offenseAmount}만원|"></th:block>
<th:block th:if="${shipInfo.offenseAmount>0}" th:text="|${#numbers.formatInteger(shipInfo.offenseAmount,1,'COMMA')}원|"></th:block>
</label>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboUnpaidAmount>0}" th:text="|${shipInfo.damboUnpaidAmount}만원|"></th:block>
<th:block th:if="${shipInfo.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></th:block>
</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>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboPayment>0}" th:text="|${shipInfo.damboPayment}만원|"></th:block>
<th:block th:if="${shipInfo.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></th:block>
</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')}">
<input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.depositPaymentDt, 'yyyy-MM-dd')}">
</div>
</div>
<div class="row border border-secondary border-top-0">

23
src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html
View File

@ -16,7 +16,7 @@
</th:block>
<div layout:fragment="content">
<main>
<input type="hidden" id="menuKey" value="${menuKey}">
<input type="hidden" id="menuKey" th:value="${menuKey}">
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<div class="row justify-content-between">
@ -69,7 +69,7 @@
<th rowspan="2">담보금<br>(납부/부과)</th>
<th rowspan="2">몰수 / 폐선</th>
<th rowspan="2">공무집행방해<br>(건/척)</th>
<th rowspan="2">위탁관리</th>
<th rowspan="2">비고</th>
</tr>
<tr class="table-secondary">
<th>소계</th>
@ -87,22 +87,6 @@
</th:block>
</colgroup>
<thead class="align-middle text-center">
<tr class="table-secondary">
<th>연도</th>
<th:block th:each="num : ${#numbers.sequence(1,12)}">
<th th:text="${#strings.concat(num, '월')}"></th>
</th:block>
</tr>
</thead>
</th:block>
<th:block th:if="${searchParams.type eq 'type3'}">
<colgroup>
<col style="width: 6.5%">
<th:block th:each="num : ${#numbers.sequence(1,17)}">
<col style="width: 5.5%">
</th:block>
</colgroup>
<thead class="align-middle text-center">
<tr class="table-secondary">
<th class="backslash" rowspan="2"><div>경찰서</div>연도</th>
<th:block th:each="parent:${organConfigList}">
@ -118,6 +102,9 @@
</tr>
</thead>
</th:block>
<th:block th:if="${searchParams.type eq 'type3'}">
</th:block>
</table>
</div>
</div>

8
src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html
View File

@ -229,7 +229,7 @@
</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>
<label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
<th:block th:if="${fishingBoat.offenseIllegalWasteQuantity>0}" th:text="|${fishingBoat.offenseIllegalWasteQuantity}kg|"></th:block>
<th:block th:if="${fishingBoat.offenseDisposal>0}" th:text="|${fishingBoat.offenseDisposal}kg|"></th:block>
</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>
<label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
@ -243,15 +243,15 @@
<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>
<label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
<th:block th:if="${fishingBoat.damboUnpaidAmount>0}" th:text="|${fishingBoat.damboUnpaidAmount}만원|"></th:block>
<th:block th:if="${fishingBoat.depositUnpaid>0}" th:text="|${fishingBoat.depositUnpaid}만원|"></th:block>
</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>
<label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
<th:block th:if="${fishingBoat.damboPayment>0}" th:text="|${fishingBoat.damboPayment}만원|"></th:block>
<th:block th:if="${fishingBoat.depositPayment>0}" th:text="|${fishingBoat.depositPayment}만원|"></th:block>
</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 fs-11">담보금 납부일</label>
<div class="col-sm-2">
<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="${fishingBoat.depositPaymentDt}">
</div>
</div>
<div class="row border border-secondary border-top-0">