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

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

This reverts commit 6a1aa0b7c9.
master
최강석 2023-08-08 14:56:01 +09:00
parent 3d9db966f1
commit 02b6cf7537
14 changed files with 84 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java
View File

@ -398,9 +398,10 @@ public class UnlawfulFishingController {
case "type1":
break;
case "type2":
mav.addObject("organConfigList", organConfigService.selectOrganListToUnlawfulFishingStatistics());
break;
case "type3":
mav.addObject("organConfigList", organConfigService.selectOrganListToUnlawfulFishingStatistics());
break;
}

3
src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java
View File

@ -84,4 +84,7 @@ public class SailorBaseEntity extends BaseModel {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private LocalDateTime wrtDt;
@Column(name="detention_yn")
private String detentionYn;
}

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

@ -272,6 +272,7 @@
ci.case_num ,
iss.sailor_name_kr ,
iss.birthdate ,
iss.detention_yn ,
iss.position ,
iss.career ,
iss.similar_criminal_history ,

1
src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js
View File

@ -82,6 +82,7 @@ $(document).on('click', '.saveAllInfoBtn', function (){
sailorNameKr: sailorDiv.find(".sailorNameKr").val(),
sailorNameCn: sailorDiv.find(".sailorNameCn").val(),
birthdate: sailorDiv.find(".birthdate").val(),
detentionYn: sailorDiv.find(".detentionYn").val(),
residence: sailorDiv.find(".residence").val(),
education: sailorDiv.find(".education").val(),
position: sailorDiv.find(".position").val(),

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

@ -98,17 +98,17 @@
</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="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="depositUnpaid" name="depositUnpaid" placeholder="단위: 원" th:value="${shipInfo.depositUnpaid>0?shipInfo.depositUnpaid:''}">
<input type="text" class="form-control form-control-sm " id="depositUnpaid" name="depositUnpaid" placeholder="단위: 만원" th:value="${shipInfo.depositUnpaid>0?shipInfo.depositUnpaid:''}">
</div>
<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="depositPayment" name="depositPayment" placeholder="단위: 원" th:value="${shipInfo.depositPayment>0?shipInfo.depositPayment:''}">
<input type="text" class="form-control form-control-sm " id="depositPayment" name="depositPayment" placeholder="단위: 만원" th:value="${shipInfo.depositPayment>0?shipInfo.depositPayment:''}">
</div>
<label for="depositPaymentDt" class="col-sm-1 col-form-label col-form-label-sm text-center">담보금 납부일</label>
<div class="col-sm-2">

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

@ -70,11 +70,11 @@
<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.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></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.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></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">

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

@ -101,11 +101,11 @@
<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.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></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.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></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">

5
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html
View File

@ -123,6 +123,7 @@
<th>사건번호</th>
<th>어선명</th>
<th>선원명</th>
<th>구속여부</th>
<th>생년월일</th>
<th>선박직책</th>
<th>승선경력</th>
@ -140,6 +141,10 @@
<td th:text="${sailor.caseNum}"></td>
<td th:text="${sailor.boatNameKr}"></td>
<td th:text="${sailor.sailorNameKr}"></td>
<td>
<th:block th:text="${sailor.detentionYn eq 'Y'?'구속':''}"></th:block>
<th:block th:text="${sailor.detentionYn eq 'N'?'불구속':''}"></th:block>
</td>
<td th:text="${sailor.birthdate}"></td>
<td>
<th:block th:each="code:${session.commonCode.get('POS')}">

32
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html
View File

@ -45,6 +45,14 @@
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">구속여부</label>
<div class="col-sm-2">
<select class="form-select form-select-sm detentionYn">
<option value="">선택</option>
<option value="Y">구속</option>
<option value="N">불구속</option>
</select>
</div>
<label class="col-sm-2 col-form-label col-form-label-sm text-center">거주지</label>
<div class="col-sm-2">
<select class="form-select form-select-sm residence">
@ -63,6 +71,8 @@
</th:block>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">선박 내 직책</label>
<div class="col-sm-2">
<select class="form-select form-select-sm position">
@ -72,8 +82,6 @@
</th:block>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">승선경력</label>
<div class="col-sm-2">
<select class="form-select form-select-sm career">
@ -94,6 +102,8 @@
<option value="0">없음</option>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">이종 범죄경력</label>
<div class="col-sm-2">
<select class="form-select form-select-sm heterogeneousCriminalHistory">
@ -105,8 +115,6 @@
<option value="0">없음</option>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">임금</label>
<div class="col-sm-2">
<input class="form-control form-control-sm monthlyWages" placeholder="(0.000위안/월)">
@ -169,6 +177,14 @@
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">구속여부</label>
<div class="col-sm-2">
<select class="form-select form-select-sm detentionYn">
<option value="">선택</option>
<option value="Y">구속</option>
<option value="N">불구속</option>
</select>
</div>
<label class="col-sm-2 col-form-label col-form-label-sm text-center">거주지</label>
<div class="col-sm-2">
<select class="form-select form-select-sm residence">
@ -187,6 +203,8 @@
</th:block>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">선박 내 직책</label>
<div class="col-sm-2">
<select class="form-select form-select-sm position">
@ -196,8 +214,6 @@
</th:block>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">승선경력</label>
<div class="col-sm-2">
<select class="form-select form-select-sm career">
@ -218,6 +234,8 @@
<option value="0">없음</option>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">이종 범죄경력</label>
<div class="col-sm-2">
<select class="form-select form-select-sm heterogeneousCriminalHistory">
@ -229,8 +247,6 @@
<option value="0">없음</option>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">임금</label>
<div class="col-sm-2">
<input class="form-control form-control-sm monthlyWages" placeholder="(0.000위안/월)">

16
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html
View File

@ -40,6 +40,14 @@
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">구속여부</label>
<div class="col-sm-2">
<select class="form-select form-select-sm detentionYn">
<option value="">선택</option>
<option value="Y" th:selected="${illegalShipSailor.detentionYn eq 'Y'}">구속</option>
<option value="N" th:selected="${illegalShipSailor.detentionYn eq 'N'}">불구속</option>
</select>
</div>
<label class="col-sm-2 col-form-label col-form-label-sm text-center">거주지</label>
<div class="col-sm-2">
<select class="form-select form-select-sm" name="residence">
@ -60,6 +68,8 @@
</th:block>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">선박 내 직책</label>
<div class="col-sm-2">
<select class="form-select form-select-sm" name="position">
@ -70,8 +80,6 @@
</th:block>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">승선경력</label>
<div class="col-sm-2">
<select class="form-select form-select-sm" name="career">
@ -93,6 +101,8 @@
<option value="0" th:selected="${illegalShipSailor.similarCriminalHistory == 0}">없음</option>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">이종 범죄경력</label>
<div class="col-sm-2">
<select class="form-select form-select-sm" name="heterogeneousCriminalHistory">
@ -104,8 +114,6 @@
<option value="0" th:selected="${illegalShipSailor.heterogeneousCriminalHistory == 0}">없음</option>
</select>
</div>
</div>
<div class="row mb-1">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">임금</label>
<div class="col-sm-2">
<input class="form-control form-control-sm" name="monthlyWages" placeholder="(0.000위안/월)" th:value="${illegalShipSailor.monthlyWages}">

17
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html
View File

@ -10,14 +10,19 @@
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="${illegalShipSailor.sailorNameCn}"></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:text="${illegalShipSailor.birthdate}"></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-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 text-start">
<th:block th:text="${illegalShipSailor.detentionYn eq 'Y'?'구속':''}"></th:block>
<th:block th:text="${illegalShipSailor.detentionYn eq 'N'?'불구속':''}"></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 border-end border-secondary py-2 text-start">
<th:block th:each="code:${session.commonCode.get('RSC')}">
<th:block th:if="${code.itemCd eq illegalShipSailor.residence}" th:text="${code.itemValue}"></th:block>
</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:each="code:${session.commonCode.get('SED')}">
@ -36,15 +41,15 @@
<th:block th:if="${code.itemCd eq illegalShipSailor.career}" th:text="${code.itemValue}"></th:block>
</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-12">동종 범죄경력</label>
<label class="col-sm-2 col-form-label col-form-label py-2 text-start" th:text="|${illegalShipSailor.similarCriminalHistory}건|"></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 fs-12">동종 범죄경력</label>
<label class="col-sm-2 col-form-label col-form-label py-2 text-start" th:text="|${illegalShipSailor.similarCriminalHistory}건|"></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-12">이종 범죄경력</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="|${illegalShipSailor.heterogeneousCriminalHistory}건|"></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:text="|${illegalShipSailor.monthlyWages}건|"></label>
<label class="col-sm-2 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">검거이력<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">검거이력<br/>(나포이력, 선원 포함)</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-secondary text-start" th:text="|${illegalShipSailor.arrestHistory}건|"></label>
</div>
<div class="row border border-secondary border-top-0">

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

@ -42,14 +42,19 @@
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="${illegalShipSailor.sailorNameCn}"></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:text="${illegalShipSailor.birthdate}"></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-1 col-form-label col-form-label fw-bold bg-label py-2 text-center">구속여부</label>
<label class="col-sm-2 col-form-label col-form-label py-2 text-start">
<th:block th:text="${illegalShipSailor.detentionYn eq 'Y'?'구속':''}"></th:block>
<th:block th:text="${illegalShipSailor.detentionYn eq 'N'?'불구속':''}"></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:each="code:${session.commonCode.get('RSC')}">
<th:block th:if="${code.itemCd eq illegalShipSailor.residence}" th:text="${code.itemValue}"></th:block>
</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:each="code:${session.commonCode.get('SED')}">
@ -63,20 +68,20 @@
</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">
<label class="col-sm-2 col-form-label col-form-label py-2 border-secondary text-start">
<th:block th:each="code:${session.commonCode.get('BE')}">
<th:block th:if="${code.itemCd eq illegalShipSailor.career}" th:text="${code.itemValue}"></th:block>
</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-12">동종 범죄경력</label>
<label class="col-sm-2 col-form-label col-form-label py-2 text-start" th:text="|${illegalShipSailor.similarCriminalHistory}건|"></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 fs-12">동종 범죄경력</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="|${illegalShipSailor.similarCriminalHistory}건|"></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-12">이종 범죄경력</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start" th:text="|${illegalShipSailor.heterogeneousCriminalHistory}건|"></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:text="|${illegalShipSailor.monthlyWages}건|"></label>
<label class="col-sm-2 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">검거이력<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">검거이력<br/>(나포이력, 선원 포함)</label>
<label class="col-sm-2 col-form-label col-form-label py-2 border-secondary text-start" th:text="|${illegalShipSailor.arrestHistory}건|"></label>
</div>
<div class="row border border-secondary border-top-0">
@ -156,11 +161,11 @@
<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.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></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.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></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">

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

@ -199,11 +199,11 @@
<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.depositUnpaid>0}" th:text="|${#numbers.formatInteger(shipInfo.depositUnpaid,1,'COMMA')}원|"></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.depositPayment>0}" th:text="|${#numbers.formatInteger(shipInfo.depositPayment,1,'COMMA')}원|"></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">

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

@ -7,11 +7,7 @@
</th:block>
<th:block layout:fragment="css">
<style>
.backslash {
background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg"><line x1="0" y1="0" x2="100%" y2="100%" stroke="gray" /></svg>');
}
.backslash { text-align: left; }
.backslash div { text-align: right; }
</style>
</th:block>
<div layout:fragment="content">
@ -88,7 +84,7 @@
</colgroup>
<thead class="align-middle text-center">
<tr class="table-secondary">
<th class="backslash" rowspan="2"><div>경찰서</div>연도</th>
<th rowspan="2">구분</th>
<th:block th:each="parent:${organConfigList}">
<th th:colspan="${#lists.size(parent.childList)}" th:text="${parent.organNm}"></th>
</th:block>